From 2dbb627d3ed9d5438e5577bff2ea13a72301c497 Mon Sep 17 00:00:00 2001 From: Paulo Tada Date: Mon, 14 Sep 2015 17:04:39 -0300 Subject: [PATCH] Changing call setting.py to custom_settings.py --- cookbooks/colab/recipes/default.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb index c084481..b729390 100644 --- a/cookbooks/colab/recipes/default.rb +++ b/cookbooks/colab/recipes/default.rb @@ -34,6 +34,13 @@ directory '/var/lock/colab' 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.d/04-custom_settings.py]' +end + template '/etc/sysconfig/colab' do owner 'root' group 'root' @@ -48,7 +55,7 @@ template '/etc/colab/settings.d/00-database.py' do notifies :restart, 'service[colab]' end -template '/etc/colab/settings.d/04-settings.py' do +template '/etc/colab/settings.d/04-custom_settings.py' do owner 'root' group 'colab' mode 0640 @@ -118,6 +125,15 @@ template '/etc/colab/plugins.d/gitlab.py' do owner 'root' group 'colab' mode 0640 + 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 template '/etc/colab/plugins.d/noosfero.py' do -- libgit2 0.21.2