Download as
Browse Code »

Commit 5b537710da737ca15d587e5a199c604e9879c219

Authored by Antonio Terceiro
1 parent 4e4b1d2b
Exists in master and in 65 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Move roles to root directory

Showing 13 changed files with 39 additions and 39 deletions   Show diff stats
1 root = File.expand_path(File.dirname(__FILE__)) 1 root = File.expand_path(File.dirname(__FILE__))
2 file_cache_path root + '/cache' 2 file_cache_path root + '/cache'
3 cookbook_path root + '/cookbooks' 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,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,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,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,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,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,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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -0,0 +1,6 @@
  1 +name 'database_server'
  2 +description 'Social networking server'
  3 +run_list *[
  4 + 'recipe[basics::nginx]',
  5 + 'recipe[noosfero]'
  6 +]