Download as
Browse Code »

Commit 5b537710da737ca15d587e5a199c604e9879c219

Authored by Antonio Terceiro
1 parent 4e4b1d2b
Exists in master and in 36 other branches add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_fix_automatic_group_creation_bug, gitlab-8.x, gov-user-refactoring, gov-user-refactoring-rails4, gov-user-to-organization, high_contrast, high_contrast_style, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, mezuro_spb, packaging_colab_plugins, performance, refactor_software_communities, refactor_software_communities_rails4, refactor_software_for_sisp, refactor_software_info_to_software, register_page, remove-unused-images, removing_super_archives_email, restore, signals_user_noosfero, software_as_organization, spb_minimal_env, stable-4.1, stable-4.2, stable-4.x, stable-5.0, stable-5.1, stable-devel, temp_soft_comm_refactoring, theme_header, thread_page

Move roles to root directory

Showing 13 changed files with 39 additions and 39 deletions   Show diff stats
config.rb
  Diff comments   View file @5b53771
1 1 root = File.expand_path(File.dirname(__FILE__))
2 2 file_cache_path root + '/cache'
3 3 cookbook_path root + '/cookbooks'
4   -role_path root + '/config/roles'
  4 +role_path root + '/roles'
... ...
config/roles/database_server.rb
View file @4e4b1d2
... ... @@ -1,9 +0,0 @@
1   -name 'database_server'
2   -description 'Database server'
3   -run_list *[
4   - 'recipe[postgresql]',
5   - 'recipe[redis]',
6   - 'recipe[postgresql::colab]',
7   - 'recipe[postgresql::gitlab]',
8   - 'recipe[postgresql::noosfero]',
9   -]
config/roles/email_server.rb
View file @4e4b1d2
... ... @@ -1,3 +0,0 @@
1   -name 'email_server'
2   -description 'E-mail server'
3   -run_list 'recipe[email::relay]'
config/roles/integration_server.rb
View file @4e4b1d2
... ... @@ -1,14 +0,0 @@
1   -name "integration_server"
2   -description "Server that runs COLAB (user authentication, visual integration and gamification), mailman (mailing lists), and Gitlab (git repositories)"
3   -
4   -# TODO colab and mailman-api should be able to run in separate hosts at some
5   -# point in the future
6   -run_list *[
7   - 'recipe[basics::nginx]',
8   - 'recipe[mailman-api]',
9   - 'recipe[mailman]',
10   - 'recipe[mailman::webui]',
11   - 'recipe[colab]',
12   - 'recipe[colab::nginx]',
13   - 'recipe[gitlab]',
14   -]
config/roles/reverse_proxy_server.rb
View file @4e4b1d2
... ... @@ -1,3 +0,0 @@
1   -name 'database_server'
2   -description 'Reverse proxy server'
3   -run_list 'recipe[basics::nginx]', 'recipe[reverse_proxy]', 'recipe[reverse_proxy::mailman]'
config/roles/server.rb
View file @4e4b1d2
... ... @@ -1,3 +0,0 @@
1   -name 'server'
2   -description 'Common configuration for all servers'
3   -run_list 'recipe[basics]', 'recipe[email::client]'
config/roles/social_server.rb
View file @4e4b1d2
... ... @@ -1,6 +0,0 @@
1   -name 'database_server'
2   -description 'Social networking server'
3   -run_list *[
4   - 'recipe[basics::nginx]',
5   - 'recipe[noosfero]'
6   -]
roles/database_server.rb 0 → 100644
  Diff comments   View file @5b53771
... ... @@ -0,0 +1,9 @@
  1 +name 'database_server'
  2 +description 'Database server'
  3 +run_list *[
  4 + 'recipe[postgresql]',
  5 + 'recipe[redis]',
  6 + 'recipe[postgresql::colab]',
  7 + 'recipe[postgresql::gitlab]',
  8 + 'recipe[postgresql::noosfero]',
  9 +]
... ...
roles/email_server.rb 0 → 100644
  Diff comments   View file @5b53771
... ... @@ -0,0 +1,3 @@
  1 +name 'email_server'
  2 +description 'E-mail server'
  3 +run_list 'recipe[email::relay]'
... ...
roles/integration_server.rb 0 → 100644
  Diff comments   View file @5b53771
... ... @@ -0,0 +1,14 @@
  1 +name "integration_server"
  2 +description "Server that runs COLAB (user authentication, visual integration and gamification), mailman (mailing lists), and Gitlab (git repositories)"
  3 +
  4 +# TODO colab and mailman-api should be able to run in separate hosts at some
  5 +# point in the future
  6 +run_list *[
  7 + 'recipe[basics::nginx]',
  8 + 'recipe[mailman-api]',
  9 + 'recipe[mailman]',
  10 + 'recipe[mailman::webui]',
  11 + 'recipe[colab]',
  12 + 'recipe[colab::nginx]',
  13 + 'recipe[gitlab]',
  14 +]
... ...
roles/reverse_proxy_server.rb 0 → 100644
  Diff comments   View file @5b53771
... ... @@ -0,0 +1,3 @@
  1 +name 'database_server'
  2 +description 'Reverse proxy server'
  3 +run_list 'recipe[basics::nginx]', 'recipe[reverse_proxy]', 'recipe[reverse_proxy::mailman]'
... ...
roles/server.rb 0 → 100644
  Diff comments   View file @5b53771
... ... @@ -0,0 +1,3 @@
  1 +name 'server'
  2 +description 'Common configuration for all servers'
  3 +run_list 'recipe[basics]', 'recipe[email::client]'
... ...
roles/social_server.rb 0 → 100644
  Diff comments   View file @5b53771
... ... @@ -0,0 +1,6 @@
  1 +name 'database_server'
  2 +description 'Social networking server'
  3 +run_list *[
  4 + 'recipe[basics::nginx]',
  5 + 'recipe[noosfero]'
  6 +]
... ...