Merge branch 'noosfero_private_token' into 'master'

Noosfero private token See merge request !43

Merge branch 'noosfero_private_token' into 'master'
Noosfero private token See merge request !43
Thiago Ribeiro
2 parents 8877960e 0897a8cc
Showing 3 changed files with 51 additions and 15 deletions Show diff stats
cookbooks/colab/recipes/default.rb
cookbooks/colab/templates/01-apps.yaml.erb
cookbooks/noosfero/recipes/default.rb
@@ -96,20 +96,52 @@ execute &#39;create-admin-token-gitlab&#39; do
   user 'git'
 end
+execute 'create-admin-token-noosfero' do
+  user = "admin-noosfero"
+  email = "admin-noosfero@example.com"
+  password = SecureRandom.random_number.to_s
+
+  command "bundle exec rails c production <<EOF
+            user = User.create(login: \'#{user}\', email: \'#{email}\', password: \'#{password}\', password_confirmation: \'#{password}\')
+            user.activate
+            user.generate_private_token_if_not_exist
+            Environment.default.add_admin user.person
+            exit
+          "
+
+  user_exist = lambda do
+    Dir.chdir '/usr/lib/noosfero' do
+      `RAILS_ENV=production bundle exec rails runner \"puts User.find_by_identifier(\'admin-noosdero\').nil?\"`.strip
+    end
+  end
+
+  not_if {user_exist.call == "false"}
+
+  cwd '/usr/lib/noosfero'
+  user 'noosfero'
+end
+
 template '/etc/colab/settings.d/01-apps.yaml' do
   owner  'root'
   group  'colab'
   mode   0640
   notifies :restart, 'service[colab]'
-  get_private_token =  lambda do
+  get_gitlab_private_token =  lambda do
     Dir.chdir '/usr/lib/gitlab' do
       `sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-gitlab\').private_token\"`.strip
     end
   end
+  get_noosfero_private_token =  lambda do
+    Dir.chdir '/usr/lib/noosfero' do
+      `sudo -u noosfero RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-noosfero\').private_token\"`.strip
+    end
+  end
+
   variables(
-    :get_private_token => get_private_token
+    :get_gitlab_private_token => get_gitlab_private_token,
+    :get_noosfero_private_token => get_noosfero_private_token
   )
 end
@@ -2,6 +2,7 @@
 PROXIED_APPS:
   gitlab:
     upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/'
-    private_token: '<%= @get_private_token.call %>'
+    private_token: '<%= @get_gitlab_private_token.call %>'
   noosfero:
     upstream: 'http://<%= node['peers']['social'] %>:80/social/'
+    private_token: '<%= @get_noosfero_private_token.call %>'
@@ -57,14 +57,6 @@ execute &#39;noosfero:migrate&#39; do
   user 'noosfero'
 end
-execute 'plugins:activate' do
-  command "RAILS_ENV=production bundle exec rake noosfero:plugins:enable_all"
-  cwd '/usr/lib/noosfero'
-  user 'noosfero'
-  only_if 'bundle exec rake -P | grep enable_all'
-end
-
-
 plugins_spb = [
   'software_communities',
   'gov_user',
@@ -74,10 +66,21 @@ plugins_spb = [
 #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'
+    command '/usr/lib/noosfero/script/noosfero-plugins enable ' + plugin
   end
+
+  execute ('plugins_spb:migrate:' + plugin) do
+    command 'RAILS_ENV=production SCHEMA=/dev/null bundle exec rake db:migrate'
+    cwd '/usr/lib/noosfero'
+    user 'noosfero'
+  end
+end
+
+execute 'plugins:activate' do
+  command "RAILS_ENV=production bundle exec rake noosfero:plugins:enable_all"
+  cwd '/usr/lib/noosfero'
+  user 'noosfero'
+  only_if 'bundle exec rake -P | grep enable_all'
 end
 execute 'theme:enable' do
@@ -89,7 +92,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/unicorn.rb' do
+cookbook_file '/etc/noosfero/unicorn.rb' do
   owner 'root'; group 'root'; mode 0644
   notifies :restart, 'service[noosfero]'
 end
	@@ -96,20 +96,52 @@ execute 'create-admin-token-gitlab' do		@@ -96,20 +96,52 @@ execute 'create-admin-token-gitlab' do
96	user 'git'	96	user 'git'
97	end	97	end
98		98
		99	+execute 'create-admin-token-noosfero' do
		100	+ user = "admin-noosfero"
		101	+ email = "admin-noosfero@example.com"
		102	+ password = SecureRandom.random_number.to_s
		103	+
		104	+ command "bundle exec rails c production <<EOF
		105	+ user = User.create(login: \'#{user}\', email: \'#{email}\', password: \'#{password}\', password_confirmation: \'#{password}\')
		106	+ user.activate
		107	+ user.generate_private_token_if_not_exist
		108	+ Environment.default.add_admin user.person
		109	+ exit
		110	+ "
		111	+
		112	+ user_exist = lambda do
		113	+ Dir.chdir '/usr/lib/noosfero' do
		114	+ `RAILS_ENV=production bundle exec rails runner \"puts User.find_by_identifier(\'admin-noosdero\').nil?\"`.strip
		115	+ end
		116	+ end
		117	+
		118	+ not_if {user_exist.call == "false"}
		119	+
		120	+ cwd '/usr/lib/noosfero'
		121	+ user 'noosfero'
		122	+end
		123	+
99	template '/etc/colab/settings.d/01-apps.yaml' do	124	template '/etc/colab/settings.d/01-apps.yaml' do
100	owner 'root'	125	owner 'root'
101	group 'colab'	126	group 'colab'
102	mode 0640	127	mode 0640
103	notifies :restart, 'service[colab]'	128	notifies :restart, 'service[colab]'
104		129
105	- get_private_token = lambda do	130	+ get_gitlab_private_token = lambda do
106	Dir.chdir '/usr/lib/gitlab' do	131	Dir.chdir '/usr/lib/gitlab' do
107	`sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-gitlab\').private_token\"`.strip	132	`sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-gitlab\').private_token\"`.strip
108	end	133	end
109	end	134	end
110		135
		136	+ get_noosfero_private_token = lambda do
		137	+ Dir.chdir '/usr/lib/noosfero' do
		138	+ `sudo -u noosfero RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-noosfero\').private_token\"`.strip
		139	+ end
		140	+ end
		141	+
111	variables(	142	variables(
112	- :get_private_token => get_private_token	143	+ :get_gitlab_private_token => get_gitlab_private_token,
		144	+ :get_noosfero_private_token => get_noosfero_private_token
113	)	145	)
114	end	146	end
115		147