From e5f1b5a791e90c753a12e682d9202392c7540487 Mon Sep 17 00:00:00 2001 From: Paulo Tada Date: Mon, 7 Sep 2015 11:58:20 -0300 Subject: [PATCH] Removing useless commands on colab default recipe --- cookbooks/colab/recipes/default.rb | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb index d4ac7c5..cd7f7e7 100644 --- a/cookbooks/colab/recipes/default.rb +++ b/cookbooks/colab/recipes/default.rb @@ -11,12 +11,6 @@ if node['platform'] == 'centos' 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 '/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.yaml]' -end - template '/etc/sysconfig/colab' do owner 'root' group 'root' @@ -61,6 +48,7 @@ template '/etc/colab/settings.d/00-database.py' 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 'create-admin-token-gitlab' 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 'colab' do action :restart end +# Static files directory '/var/lib/colab-assets/spb/' do owner 'root' group 'root' -- libgit2 0.21.2