Redefined colab settings order

Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>

Redefined colab settings order
Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Sergio Oliveira
1 parent 40d68fe6
Showing 9 changed files with 58 additions and 58 deletions Show diff stats
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/00-custom_settings.py.erb
cookbooks/colab/templates/00-database.py.erb
cookbooks/colab/templates/01-database.py.erb
cookbooks/colab/templates/04-custom_settings.py.erb
cookbooks/colab/templates/04-memcached.py.erb
cookbooks/colab/templates/05-redis.py.erb
cookbooks/colab/templates/memcached.py.erb
cookbooks/colab/templates/redis.py.erb
@@ -38,7 +38,7 @@ execute &#39;secret-key&#39; do
   f = '/etc/colab/secret.key'
   command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}"
   not_if { File.exists?(f) }
-  notifies :create, 'template[/etc/colab/settings.d/04-custom_settings.py]'
+  notifies :create, 'template[/etc/colab/settings.d/00-custom_settings.py]'
 end
 template '/etc/sysconfig/colab' do
@@ -48,14 +48,14 @@ template &#39;/etc/sysconfig/colab&#39; do
   notifies :restart, 'service[colab]'
 end
-template '/etc/colab/settings.d/00-database.py' do
+template '/etc/colab/settings.d/00-custom_settings.py' do
   owner  'root'
   group  'colab'
   mode   0640
   notifies :restart, 'service[colab]'
 end
-template '/etc/colab/settings.d/04-custom_settings.py' do
+template '/etc/colab/settings.d/01-database.py' do
   owner  'root'
   group  'colab'
   mode   0640
@@ -104,13 +104,13 @@ template &#39;/etc/colab/settings.d/03-sentry.py&#39; do
   mode   0640
 end
-template '/etc/colab/settings.d/memcached.py' do
+template '/etc/colab/settings.d/04-memcached.py' do
   owner 'root'
   group 'colab'
   mode 0640
 end
-template '/etc/colab/settings.d/redis.py' do
+template '/etc/colab/settings.d/05-redis.py' do
   owner 'root'
   group 'colab'
   mode 0640
@@ -0,0 +1,37 @@
+## Set to false in production
+DEBUG = False
+TEMPLATE_DEBUG = False
+
+## System admins
+ADMINS = [
+<%- node['config']['admins'].each do |admin| %>
+  ("<%= admin[0] %>", "<%= admin[1] %>"),
+<% end %>
+]
+
+MANAGERS = ADMINS
+
+# general Django settings
+DEFAULT_FROM_EMAIL = '<%= node['config']['colab_from_address'] %>'
+
+# colab-specific
+COLAB_FROM_ADDRESS = '<%= node['config']['colab_from_address'] %>'
+SERVER_EMAIL = '<%= node['config']['server_email'] %>'
+
+EMAIL_HOST = "localhost"
+EMAIL_PORT =  25
+EMAIL_SUBJECT_PREFIX = "<%= node['config']['email_subject_prefix'] %>"
+
+SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
+
+SITE_URL = "<%= node['config']['site_url'] %>"
+
+ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
+
+## Disable indexing
+ROBOTS_NOINDEX = False
+
+## Set URL of Colab home
+COLAB_HOME_URL = '/social'
+
+GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
@@ -1,8 +0,0 @@
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'HOST': "<%= node['peers']['database'] %>",
-        'NAME': 'colab',
-        'USER': 'colab'
-    }
-}
@@ -0,0 +1,8 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'HOST': "<%= node['peers']['database'] %>",
+        'NAME': 'colab',
+        'USER': 'colab'
+    }
+}
@@ -1,37 +0,0 @@
-## Set to false in production
-DEBUG = False
-TEMPLATE_DEBUG = False
-
-## System admins
-ADMINS = [
-<%- node['config']['admins'].each do |admin| %>
-  ("<%= admin[0] %>", "<%= admin[1] %>"),
-<% end %>
-]
-
-MANAGERS = ADMINS
-
-# general Django settings
-DEFAULT_FROM_EMAIL = '<%= node['config']['colab_from_address'] %>'
-
-# colab-specific
-COLAB_FROM_ADDRESS = '<%= node['config']['colab_from_address'] %>'
-SERVER_EMAIL = '<%= node['config']['server_email'] %>'
-
-EMAIL_HOST = "localhost"
-EMAIL_PORT =  25
-EMAIL_SUBJECT_PREFIX = "<%= node['config']['email_subject_prefix'] %>"
-
-SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
-
-SITE_URL = "<%= node['config']['site_url'] %>"
-
-ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
-
-## Disable indexing
-ROBOTS_NOINDEX = False
-
-## Set URL of Colab home
-COLAB_HOME_URL = '/social'
-
-GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
@@ -0,0 +1,6 @@
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211',
+    }
+}
@@ -0,0 +1,2 @@
+BROKER_URL = 'redis://<%= node['peers']['database'] %>:6379/0'
+CELERY_RESULT_BACKEND = 'redis://<%= node['peers']['database'] %>:6379/0'
@@ -1,6 +0,0 @@
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '127.0.0.1:11211',
-    }
-}
@@ -1,2 +0,0 @@
-BROKER_URL = 'redis://<%= node['peers']['database'] %>:6379/0'
-CELERY_RESULT_BACKEND = 'redis://<%= node['peers']['database'] %>:6379/0'
	@@ -38,7 +38,7 @@ execute 'secret-key' do		@@ -38,7 +38,7 @@ execute 'secret-key' do
38	f = '/etc/colab/secret.key'	38	f = '/etc/colab/secret.key'
39	command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}"	39	command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}"
40	not_if { File.exists?(f) }	40	not_if { File.exists?(f) }
41	- notifies :create, 'template[/etc/colab/settings.d/04-custom_settings.py]'	41	+ notifies :create, 'template[/etc/colab/settings.d/00-custom_settings.py]'
42	end	42	end
43		43
44	template '/etc/sysconfig/colab' do	44	template '/etc/sysconfig/colab' do
	@@ -48,14 +48,14 @@ template '/etc/sysconfig/colab' do		@@ -48,14 +48,14 @@ template '/etc/sysconfig/colab' do
48	notifies :restart, 'service[colab]'	48	notifies :restart, 'service[colab]'
49	end	49	end
50		50
51	-template '/etc/colab/settings.d/00-database.py' do	51	+template '/etc/colab/settings.d/00-custom_settings.py' do
52	owner 'root'	52	owner 'root'
53	group 'colab'	53	group 'colab'
54	mode 0640	54	mode 0640
55	notifies :restart, 'service[colab]'	55	notifies :restart, 'service[colab]'
56	end	56	end
57		57
58	-template '/etc/colab/settings.d/04-custom_settings.py' do	58	+template '/etc/colab/settings.d/01-database.py' do
59	owner 'root'	59	owner 'root'
60	group 'colab'	60	group 'colab'
61	mode 0640	61	mode 0640
	@@ -104,13 +104,13 @@ template '/etc/colab/settings.d/03-sentry.py' do		@@ -104,13 +104,13 @@ template '/etc/colab/settings.d/03-sentry.py' do
104	mode 0640	104	mode 0640
105	end	105	end
106		106
107	-template '/etc/colab/settings.d/memcached.py' do	107	+template '/etc/colab/settings.d/04-memcached.py' do
108	owner 'root'	108	owner 'root'
109	group 'colab'	109	group 'colab'
110	mode 0640	110	mode 0640
111	end	111	end
112		112
113	-template '/etc/colab/settings.d/redis.py' do	113	+template '/etc/colab/settings.d/05-redis.py' do
114	owner 'root'	114	owner 'root'
115	group 'colab'	115	group 'colab'
116	mode 0640	116	mode 0640
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+## Set to false in production
	2	+DEBUG = False
	3	+TEMPLATE_DEBUG = False
	4	+
	5	+## System admins
	6	+ADMINS = [
	7	+<%- node['config']['admins'].each do \|admin\| %>
	8	+ ("<%= admin[0] %>", "<%= admin[1] %>"),
	9	+<% end %>
	10	+]
	11	+
	12	+MANAGERS = ADMINS
	13	+
	14	+# general Django settings
	15	+DEFAULT_FROM_EMAIL = '<%= node['config']['colab_from_address'] %>'
	16	+
	17	+# colab-specific
	18	+COLAB_FROM_ADDRESS = '<%= node['config']['colab_from_address'] %>'
	19	+SERVER_EMAIL = '<%= node['config']['server_email'] %>'
	20	+
	21	+EMAIL_HOST = "localhost"
	22	+EMAIL_PORT = 25
	23	+EMAIL_SUBJECT_PREFIX = "<%= node['config']['email_subject_prefix'] %>"
	24	+
	25	+SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
	26	+
	27	+SITE_URL = "<%= node['config']['site_url'] %>"
	28	+
	29	+ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
	30	+
	31	+## Disable indexing
	32	+ROBOTS_NOINDEX = False
	33	+
	34	+## Set URL of Colab home
	35	+COLAB_HOME_URL = '/social'
	36	+
	37	+GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
	@@ -1,8 +0,0 @@	@@ -1,8 +0,0 @@
1	-DATABASES = {
2	- 'default': {
3	- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
4	- 'HOST': "<%= node['peers']['database'] %>",
5	- 'NAME': 'colab',
6	- 'USER': 'colab'
7	- }
8	-}
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+DATABASES = {
	2	+ 'default': {
	3	+ 'ENGINE': 'django.db.backends.postgresql_psycopg2',
	4	+ 'HOST': "<%= node['peers']['database'] %>",
	5	+ 'NAME': 'colab',
	6	+ 'USER': 'colab'
	7	+ }
	8	+}
	@@ -1,37 +0,0 @@	@@ -1,37 +0,0 @@
1	-## Set to false in production
2	-DEBUG = False
3	-TEMPLATE_DEBUG = False
4	-
5	-## System admins
6	-ADMINS = [
7	-<%- node['config']['admins'].each do \|admin\| %>
8	- ("<%= admin[0] %>", "<%= admin[1] %>"),
9	-<% end %>
10	-]
11	-
12	-MANAGERS = ADMINS
13	-
14	-# general Django settings
15	-DEFAULT_FROM_EMAIL = '<%= node['config']['colab_from_address'] %>'
16	-
17	-# colab-specific
18	-COLAB_FROM_ADDRESS = '<%= node['config']['colab_from_address'] %>'
19	-SERVER_EMAIL = '<%= node['config']['server_email'] %>'
20	-
21	-EMAIL_HOST = "localhost"
22	-EMAIL_PORT = 25
23	-EMAIL_SUBJECT_PREFIX = "<%= node['config']['email_subject_prefix'] %>"
24	-
25	-SECRET_KEY = "<%= File.read('/etc/colab/secret.key').strip %>"
26	-
27	-SITE_URL = "<%= node['config']['site_url'] %>"
28	-
29	-ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>"]
30	-
31	-## Disable indexing
32	-ROBOTS_NOINDEX = False
33	-
34	-## Set URL of Colab home
35	-COLAB_HOME_URL = '/social'
36	-
37	-GOOGLE_ANALYTICS_TRACKING_ID = "<%= node['config']['google_analytics_id'] %>"
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+CACHES = {
	2	+ 'default': {
	3	+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
	4	+ 'LOCATION': '127.0.0.1:11211',
	5	+ }
	6	+}
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+BROKER_URL = 'redis://<%= node['peers']['database'] %>:6379/0'
	2	+CELERY_RESULT_BACKEND = 'redis://<%= node['peers']['database'] %>:6379/0'
	@@ -1,6 +0,0 @@	@@ -1,6 +0,0 @@
1	-CACHES = {
2	- 'default': {
3	- 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
4	- 'LOCATION': '127.0.0.1:11211',
5	- }
6	-}
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-BROKER_URL = 'redis://<%= node['peers']['database'] %>:6379/0'
2	-CELERY_RESULT_BACKEND = 'redis://<%= node['peers']['database'] %>:6379/0'