Commit 2dbb627d3ed9d5438e5577bff2ea13a72301c497
Committed by
Sergio Oliveira
1 parent
2603f337
Exists in
master
and in
79 other branches
Changing call setting.py to custom_settings.py
Showing
1 changed file
with
17 additions
and
1 deletions
Show diff stats
cookbooks/colab/recipes/default.rb
@@ -34,6 +34,13 @@ directory '/var/lock/colab' do | @@ -34,6 +34,13 @@ directory '/var/lock/colab' do | ||
34 | mode 0755 | 34 | mode 0755 |
35 | end | 35 | end |
36 | 36 | ||
37 | +execute 'secret-key' do | ||
38 | + f = '/etc/colab/secret.key' | ||
39 | + command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}" | ||
40 | + not_if { File.exists?(f) } | ||
41 | + notifies :create, 'template[/etc/colab/settings.d/04-custom_settings.py]' | ||
42 | +end | ||
43 | + | ||
37 | template '/etc/sysconfig/colab' do | 44 | template '/etc/sysconfig/colab' do |
38 | owner 'root' | 45 | owner 'root' |
39 | group 'root' | 46 | group 'root' |
@@ -48,7 +55,7 @@ template '/etc/colab/settings.d/00-database.py' do | @@ -48,7 +55,7 @@ template '/etc/colab/settings.d/00-database.py' do | ||
48 | notifies :restart, 'service[colab]' | 55 | notifies :restart, 'service[colab]' |
49 | end | 56 | end |
50 | 57 | ||
51 | -template '/etc/colab/settings.d/04-settings.py' do | 58 | +template '/etc/colab/settings.d/04-custom_settings.py' do |
52 | owner 'root' | 59 | owner 'root' |
53 | group 'colab' | 60 | group 'colab' |
54 | mode 0640 | 61 | mode 0640 |
@@ -118,6 +125,15 @@ template '/etc/colab/plugins.d/gitlab.py' do | @@ -118,6 +125,15 @@ template '/etc/colab/plugins.d/gitlab.py' do | ||
118 | owner 'root' | 125 | owner 'root' |
119 | group 'colab' | 126 | group 'colab' |
120 | mode 0640 | 127 | mode 0640 |
128 | + get_private_token = lambda do | ||
129 | + Dir.chdir '/usr/lib/gitlab' do | ||
130 | + `sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-gitlab\').private_token\"`.strip | ||
131 | + end | ||
132 | + end | ||
133 | + | ||
134 | + variables( | ||
135 | + :get_private_token => get_private_token | ||
136 | + ) | ||
121 | end | 137 | end |
122 | 138 | ||
123 | template '/etc/colab/plugins.d/noosfero.py' do | 139 | template '/etc/colab/plugins.d/noosfero.py' do |