Merge branch 'update_noosfero_unicorn'

Rodrigo Siqueira de Melo
2 parents 6e083ed5 9a94c93c
Showing 5 changed files with 24 additions and 22 deletions Show diff stats
cookbooks/noosfero/files/unicorn.rb
cookbooks/noosfero/recipes/default.rb
cookbooks/noosfero/templates/nginx.conf.erb
cookbooks/noosfero/templates/thin.yml.erb
test/noosfero_test.sh
@@ -0,0 +1,3 @@
+listen "127.0.0.1:9000"
+
+worker_processes `nproc`.to_i
@@ -40,11 +40,11 @@ plugins = [
   'people_block',
   'recent_content',
   'remote_user',
-  'software_communities', # from noosfero-spb
+  'organization_ratings',
   'statistics',
   'sub_organizations',
   'video',
-  'spb_migrations',
+  'community_block',
 ]
  
 execute 'plugins:enable' do
@@ -64,6 +64,22 @@ execute &#39;plugins:activate&#39; do
   only_if 'bundle exec rake -P | grep enable_all'
 end
  
+
+plugins_spb = [
+  'software_communities',
+  'gov_user',
+  'spb_migrations',
+]
+
+#FIXME: We did it, because we have to enable each plugin and migrate it separately.
+plugins_spb.each do |plugin|
+  execute ('plugins_spb:activate:' + plugin) do
+    command '/usr/lib/noosfero/script/noosfero-plugin enable ' + plugin +
+            ' && RAILS_ENV=production SCHEMA=/dev/null bundle exec ' +
+            'rake db:migrate'
+  end
+end
+
 execute 'theme:enable' do
   command 'psql -h database -U noosfero --no-align --tuples-only -q -c "update environments set theme=\'noosfero-spb-theme\' where id=1;"'
 end
@@ -73,7 +89,7 @@ execute &#39;software:create_licenses&#39; do
   command 'sudo -u noosfero bundle exec rake software:create_licenses RAILS_ENV=production'
 end
  
-template '/etc/noosfero/thin.yml' do
+template '/etc/noosfero/unicorn.rb' do
   owner 'root'; group 'root'; mode 0644
   notifies :restart, 'service[noosfero]'
 end
 # MANAGED WITH CHEF; DO NOT CHANGE BY HAND
  
 upstream noosfero {
-<% (1..(`nproc`.strip.to_i)).each do |p| %>
-  server 127.0.0.1:<%= 9000 + p - 1 %> fail_timeout=10s;
-<% end %>
+  server 127.0.0.1:9000 fail_timeout=10s;
 }
  
 server {
@@ -1,15 +0,0 @@
----
-chdir: /usr/lib/noosfero
-environment: production
-address: 127.0.0.1
-port: 9000
-timeout: 30
-log: log/thin.log
-pid: tmp/pids/thin.pid
-max_conns: 1024
-max_persistent_conns: 512
-require: []
-wait: 30
-daemonize: true
-servers: <%= `nproc`.strip %>
-prefix: /social
@@ -5,7 +5,7 @@ test_database_connectivity() {
 }
  
 test_noosfero_running() {
-  assertTrue 'Noosfero running' 'run_on social pgrep -u noosfero -f thin'
+  assertTrue 'Noosfero running' 'run_on social pgrep -u noosfero -f unicorn'
 }
  
 test_noosfero_on_subdir() {
...	...	@@ -0,0 +1,3 @@
	1	+listen "127.0.0.1:9000"
	2	+
	3	+worker_processes `nproc`.to_i
...	...
...	...	@@ -40,11 +40,11 @@ plugins = [
40	40	'people_block',
41	41	'recent_content',
42	42	'remote_user',
43		- 'software_communities', # from noosfero-spb
	43	+ 'organization_ratings',
44	44	'statistics',
45	45	'sub_organizations',
46	46	'video',
47		- 'spb_migrations',
	47	+ 'community_block',
48	48	]
49	49
50	50	execute 'plugins:enable' do
...	...	@@ -64,6 +64,22 @@ execute 'plugins:activate' do
64	64	only_if 'bundle exec rake -P \| grep enable_all'
65	65	end
66	66
	67	+
	68	+plugins_spb = [
	69	+ 'software_communities',
	70	+ 'gov_user',
	71	+ 'spb_migrations',
	72	+]
	73	+
	74	+#FIXME: We did it, because we have to enable each plugin and migrate it separately.
	75	+plugins_spb.each do \|plugin\|
	76	+ execute ('plugins_spb:activate:' + plugin) do
	77	+ command '/usr/lib/noosfero/script/noosfero-plugin enable ' + plugin +
	78	+ ' && RAILS_ENV=production SCHEMA=/dev/null bundle exec ' +
	79	+ 'rake db:migrate'
	80	+ end
	81	+end
	82	+
67	83	execute 'theme:enable' do
68	84	command 'psql -h database -U noosfero --no-align --tuples-only -q -c "update environments set theme=\'noosfero-spb-theme\' where id=1;"'
69	85	end
...	...	@@ -73,7 +89,7 @@ execute 'software:create_licenses' do
73	89	command 'sudo -u noosfero bundle exec rake software:create_licenses RAILS_ENV=production'
74	90	end
75	91
76		-template '/etc/noosfero/thin.yml' do
	92	+template '/etc/noosfero/unicorn.rb' do
77	93	owner 'root'; group 'root'; mode 0644
78	94	notifies :restart, 'service[noosfero]'
79	95	end
...	...
1	1	# MANAGED WITH CHEF; DO NOT CHANGE BY HAND
2	2
3	3	upstream noosfero {
4		-<% (1..(`nproc`.strip.to_i)).each do \|p\| %>
5		- server 127.0.0.1:<%= 9000 + p - 1 %> fail_timeout=10s;
6		-<% end %>
	4	+ server 127.0.0.1:9000 fail_timeout=10s;
7	5	}
8	6
9	7	server {
...	...
...	...	@@ -1,15 +0,0 @@
1		----
2		-chdir: /usr/lib/noosfero
3		-environment: production
4		-address: 127.0.0.1
5		-port: 9000
6		-timeout: 30
7		-log: log/thin.log
8		-pid: tmp/pids/thin.pid
9		-max_conns: 1024
10		-max_persistent_conns: 512
11		-require: []
12		-wait: 30
13		-daemonize: true
14		-servers: <%= `nproc`.strip %>
15		-prefix: /social
...	...	@@ -5,7 +5,7 @@ test_database_connectivity() {
5	5	}
6	6
7	7	test_noosfero_running() {
8		- assertTrue 'Noosfero running' 'run_on social pgrep -u noosfero -f thin'
	8	+ assertTrue 'Noosfero running' 'run_on social pgrep -u noosfero -f unicorn'
9	9	}
10	10
11	11	test_noosfero_on_subdir() {
...	...