Removing useless commands on colab default recipe

Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Paulo Tada <paulohtfs@gmail.com>

Removing useless commands on colab default recipe
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Paulo Tada <paulohtfs@gmail.com>
Paulo Tada · Sergio Oliveira
1 parent 6d98bb76
Showing 1 changed file with 2 additions and 30 deletions Show diff stats
cookbooks/colab/recipes/default.rb
@@ -11,12 +11,6 @@ if node[&#39;platform&#39;] == &#39;centos&#39;
   end
 end
  
-# FIXME should not be needed; colab should depend on the right version of
-# colab-deps
-package 'colab-deps' do
-  action :upgrade
-end
-
 package 'colab' do
   action :upgrade
   notifies :restart, 'service[colab]'
@@ -40,13 +34,6 @@ directory &#39;/var/lock/colab&#39; do
   mode 0755
 end
  
-execute 'secret-key' 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.yaml]'
-end
-
 template '/etc/sysconfig/colab' do
   owner 'root'
   group 'root'
@@ -61,6 +48,7 @@ template &#39;/etc/colab/settings.d/00-database.py&#39; do
   notifies :restart, 'service[colab]'
 end
  
+# Creating a gitlab admin user
 template '/tmp/admin-gitlab.json' do
  
   password = SecureRandom.random_number.to_s
@@ -89,23 +77,6 @@ execute &#39;create-admin-token-gitlab&#39; do
   user 'git'
 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
-    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
-
-  variables(
-    :get_private_token => get_private_token
-  )
-end
-
 # Adding settings.d files
 template '/etc/colab/settings.d/02-logging.py' do
   owner  'root'
@@ -160,6 +131,7 @@ service &#39;colab&#39; do
   action :restart
 end
  
+# Static files
 directory '/var/lib/colab-assets/spb/' do
   owner  'root'
   group  'root'
...	...	@@ -11,12 +11,6 @@ if node['platform'] == 'centos'
11	11	end
12	12	end
13	13
14		-# FIXME should not be needed; colab should depend on the right version of
15		-# colab-deps
16		-package 'colab-deps' do
17		- action :upgrade
18		-end
19		-
20	14	package 'colab' do
21	15	action :upgrade
22	16	notifies :restart, 'service[colab]'
...	...	@@ -40,13 +34,6 @@ directory '/var/lock/colab' do
40	34	mode 0755
41	35	end
42	36
43		-execute 'secret-key' do
44		- f = '/etc/colab/secret.key'
45		- command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}"
46		- not_if { File.exists?(f) }
47		- notifies :create, 'template[/etc/colab/settings.yaml]'
48		-end
49		-
50	37	template '/etc/sysconfig/colab' do
51	38	owner 'root'
52	39	group 'root'
...	...	@@ -61,6 +48,7 @@ template '/etc/colab/settings.d/00-database.py' do
61	48	notifies :restart, 'service[colab]'
62	49	end
63	50
	51	+# Creating a gitlab admin user
64	52	template '/tmp/admin-gitlab.json' do
65	53
66	54	password = SecureRandom.random_number.to_s
...	...	@@ -89,23 +77,6 @@ execute 'create-admin-token-gitlab' do
89	77	user 'git'
90	78	end
91	79
92		-template '/etc/colab/settings.d/01-apps.yaml' do
93		- owner 'root'
94		- group 'colab'
95		- mode 0640
96		- notifies :restart, 'service[colab]'
97		-
98		- get_private_token = lambda do
99		- Dir.chdir '/usr/lib/gitlab' do
100		- `sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-gitlab\').private_token\"`.strip
101		- end
102		- end
103		-
104		- variables(
105		- :get_private_token => get_private_token
106		- )
107		-end
108		-
109	80	# Adding settings.d files
110	81	template '/etc/colab/settings.d/02-logging.py' do
111	82	owner 'root'
...	...	@@ -160,6 +131,7 @@ service 'colab' do
160	131	action :restart
161	132	end
162	133
	134	+# Static files
163	135	directory '/var/lib/colab-assets/spb/' do
164	136	owner 'root'
165	137	group 'root'
...	...