From 5b537710da737ca15d587e5a199c604e9879c219 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 12 Mar 2015 16:39:34 -0300 Subject: [PATCH] Move roles to root directory --- config.rb | 2 +- config/roles/database_server.rb | 9 --------- config/roles/email_server.rb | 3 --- config/roles/integration_server.rb | 14 -------------- config/roles/reverse_proxy_server.rb | 3 --- config/roles/server.rb | 3 --- config/roles/social_server.rb | 6 ------ roles/database_server.rb | 9 +++++++++ roles/email_server.rb | 3 +++ roles/integration_server.rb | 14 ++++++++++++++ roles/reverse_proxy_server.rb | 3 +++ roles/server.rb | 3 +++ roles/social_server.rb | 6 ++++++ 13 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 config/roles/database_server.rb delete mode 100644 config/roles/email_server.rb delete mode 100644 config/roles/integration_server.rb delete mode 100644 config/roles/reverse_proxy_server.rb delete mode 100644 config/roles/server.rb delete mode 100644 config/roles/social_server.rb create mode 100644 roles/database_server.rb create mode 100644 roles/email_server.rb create mode 100644 roles/integration_server.rb create mode 100644 roles/reverse_proxy_server.rb create mode 100644 roles/server.rb create mode 100644 roles/social_server.rb diff --git a/config.rb b/config.rb index 1d1a97c..2fe7cd1 100644 --- a/config.rb +++ b/config.rb @@ -1,4 +1,4 @@ root = File.expand_path(File.dirname(__FILE__)) file_cache_path root + '/cache' cookbook_path root + '/cookbooks' -role_path root + '/config/roles' +role_path root + '/roles' diff --git a/config/roles/database_server.rb b/config/roles/database_server.rb deleted file mode 100644 index 1e7118d..0000000 --- a/config/roles/database_server.rb +++ /dev/null @@ -1,9 +0,0 @@ -name 'database_server' -description 'Database server' -run_list *[ - 'recipe[postgresql]', - 'recipe[redis]', - 'recipe[postgresql::colab]', - 'recipe[postgresql::gitlab]', - 'recipe[postgresql::noosfero]', -] diff --git a/config/roles/email_server.rb b/config/roles/email_server.rb deleted file mode 100644 index 9f3ca46..0000000 --- a/config/roles/email_server.rb +++ /dev/null @@ -1,3 +0,0 @@ -name 'email_server' -description 'E-mail server' -run_list 'recipe[email::relay]' diff --git a/config/roles/integration_server.rb b/config/roles/integration_server.rb deleted file mode 100644 index f263121..0000000 --- a/config/roles/integration_server.rb +++ /dev/null @@ -1,14 +0,0 @@ -name "integration_server" -description "Server that runs COLAB (user authentication, visual integration and gamification), mailman (mailing lists), and Gitlab (git repositories)" - -# TODO colab and mailman-api should be able to run in separate hosts at some -# point in the future -run_list *[ - 'recipe[basics::nginx]', - 'recipe[mailman-api]', - 'recipe[mailman]', - 'recipe[mailman::webui]', - 'recipe[colab]', - 'recipe[colab::nginx]', - 'recipe[gitlab]', -] diff --git a/config/roles/reverse_proxy_server.rb b/config/roles/reverse_proxy_server.rb deleted file mode 100644 index 48f8bf6..0000000 --- a/config/roles/reverse_proxy_server.rb +++ /dev/null @@ -1,3 +0,0 @@ -name 'database_server' -description 'Reverse proxy server' -run_list 'recipe[basics::nginx]', 'recipe[reverse_proxy]', 'recipe[reverse_proxy::mailman]' diff --git a/config/roles/server.rb b/config/roles/server.rb deleted file mode 100644 index 42fcec6..0000000 --- a/config/roles/server.rb +++ /dev/null @@ -1,3 +0,0 @@ -name 'server' -description 'Common configuration for all servers' -run_list 'recipe[basics]', 'recipe[email::client]' diff --git a/config/roles/social_server.rb b/config/roles/social_server.rb deleted file mode 100644 index ed9e3a0..0000000 --- a/config/roles/social_server.rb +++ /dev/null @@ -1,6 +0,0 @@ -name 'database_server' -description 'Social networking server' -run_list *[ - 'recipe[basics::nginx]', - 'recipe[noosfero]' -] diff --git a/roles/database_server.rb b/roles/database_server.rb new file mode 100644 index 0000000..1e7118d --- /dev/null +++ b/roles/database_server.rb @@ -0,0 +1,9 @@ +name 'database_server' +description 'Database server' +run_list *[ + 'recipe[postgresql]', + 'recipe[redis]', + 'recipe[postgresql::colab]', + 'recipe[postgresql::gitlab]', + 'recipe[postgresql::noosfero]', +] diff --git a/roles/email_server.rb b/roles/email_server.rb new file mode 100644 index 0000000..9f3ca46 --- /dev/null +++ b/roles/email_server.rb @@ -0,0 +1,3 @@ +name 'email_server' +description 'E-mail server' +run_list 'recipe[email::relay]' diff --git a/roles/integration_server.rb b/roles/integration_server.rb new file mode 100644 index 0000000..f263121 --- /dev/null +++ b/roles/integration_server.rb @@ -0,0 +1,14 @@ +name "integration_server" +description "Server that runs COLAB (user authentication, visual integration and gamification), mailman (mailing lists), and Gitlab (git repositories)" + +# TODO colab and mailman-api should be able to run in separate hosts at some +# point in the future +run_list *[ + 'recipe[basics::nginx]', + 'recipe[mailman-api]', + 'recipe[mailman]', + 'recipe[mailman::webui]', + 'recipe[colab]', + 'recipe[colab::nginx]', + 'recipe[gitlab]', +] diff --git a/roles/reverse_proxy_server.rb b/roles/reverse_proxy_server.rb new file mode 100644 index 0000000..48f8bf6 --- /dev/null +++ b/roles/reverse_proxy_server.rb @@ -0,0 +1,3 @@ +name 'database_server' +description 'Reverse proxy server' +run_list 'recipe[basics::nginx]', 'recipe[reverse_proxy]', 'recipe[reverse_proxy::mailman]' diff --git a/roles/server.rb b/roles/server.rb new file mode 100644 index 0000000..42fcec6 --- /dev/null +++ b/roles/server.rb @@ -0,0 +1,3 @@ +name 'server' +description 'Common configuration for all servers' +run_list 'recipe[basics]', 'recipe[email::client]' diff --git a/roles/social_server.rb b/roles/social_server.rb new file mode 100644 index 0000000..ed9e3a0 --- /dev/null +++ b/roles/social_server.rb @@ -0,0 +1,6 @@ +name 'database_server' +description 'Social networking server' +run_list *[ + 'recipe[basics::nginx]', + 'recipe[noosfero]' +] -- libgit2 0.21.2