Move roles to root directory

Antonio Terceiro
1 parent 4e4b1d2b
Showing 13 changed files with 39 additions and 39 deletions Show diff stats
config.rb
config/roles/database_server.rb
config/roles/email_server.rb
config/roles/integration_server.rb
config/roles/reverse_proxy_server.rb
config/roles/server.rb
config/roles/social_server.rb
roles/database_server.rb
roles/email_server.rb
roles/integration_server.rb
roles/reverse_proxy_server.rb
roles/server.rb
roles/social_server.rb
 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'
@@ -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]',
-]
@@ -1,3 +0,0 @@
-name 'email_server'
-description 'E-mail server'
-run_list 'recipe[email::relay]'
@@ -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]',
-]
@@ -1,3 +0,0 @@
-name 'database_server'
-description 'Reverse proxy server'
-run_list 'recipe[basics::nginx]', 'recipe[reverse_proxy]', 'recipe[reverse_proxy::mailman]'
@@ -1,3 +0,0 @@
-name 'server'
-description 'Common configuration for all servers'
-run_list 'recipe[basics]', 'recipe[email::client]'
@@ -1,6 +0,0 @@
-name 'database_server'
-description 'Social networking server'
-run_list *[
-  'recipe[basics::nginx]',
-  'recipe[noosfero]'
-]
@@ -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]',
+]
@@ -0,0 +1,3 @@
+name 'email_server'
+description 'E-mail server'
+run_list 'recipe[email::relay]'
@@ -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]',
+]
@@ -0,0 +1,3 @@
+name 'database_server'
+description 'Reverse proxy server'
+run_list 'recipe[basics::nginx]', 'recipe[reverse_proxy]', 'recipe[reverse_proxy::mailman]'
@@ -0,0 +1,3 @@
+name 'server'
+description 'Common configuration for all servers'
+run_list 'recipe[basics]', 'recipe[email::client]'
@@ -0,0 +1,6 @@
+name 'database_server'
+description 'Social networking server'
+run_list *[
+  'recipe[basics::nginx]',
+  'recipe[noosfero]'
+]
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'
	@@ -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	-]
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	-name 'email_server'
2	-description 'E-mail server'
3	-run_list 'recipe[email::relay]'
	@@ -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	-]
	@@ -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]'
	@@ -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	-]
@@ -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	+]
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+name 'email_server'
	2	+description 'E-mail server'
	3	+run_list 'recipe[email::relay]'
@@ -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	+]
@@ -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]'