Download as
Browse Code »

Commit af884be961ab1a87c37896988cf745eafa1d46ec

Authored by Athos
2 parents bdd5e59d 7d856238
Exists in master and in 36 other branches add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_fix_automatic_group_creation_bug, gitlab-8.x, gov-user-refactoring, gov-user-refactoring-rails4, gov-user-to-organization, high_contrast, high_contrast_style, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, mezuro_spb, packaging_colab_plugins, performance, refactor_software_communities, refactor_software_communities_rails4, refactor_software_for_sisp, refactor_software_info_to_software, register_page, remove-unused-images, removing_super_archives_email, restore, signals_user_noosfero, software_as_organization, spb_minimal_env, stable-4.1, stable-4.2, stable-4.x, stable-5.0, stable-5.1, stable-devel, temp_soft_comm_refactoring, theme_header, thread_page

Merge branch 'fixing_private_token' into 'master' 

Fixing private token

Fix bug to create gitlab token

Move code of create-admin-token-colab to after code of colab-admin migrate
Use a lambda to run comand that takes the private token

See merge request !30
Showing 3 changed files with 13 additions and 21 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @af884be
... ... @@ -62,13 +62,6 @@ template '/tmp/admin-gitlab.json' do
62 62 )
63 63 end
64 64  
65   -execute 'create-admin-token-colab' do
66   - command "colab-admin loaddata admin-gitlab.json"
67   -
68   - cwd '/tmp'
69   - user 'root'
70   -end
71   -
72 65 execute 'create-admin-token-gitlab' do
73 66 user = "admin-gitlab"
74 67 email = "admin-gitlab@example.com"
... ... @@ -76,11 +69,13 @@ execute 'create-admin-token-gitlab' do
76 69  
77 70 command "RAILS_ENV=production bundle exec rails runner \"User.create(name: \'#{user}\', username: \'#{user}\', email: \'#{email}\', password: \'#{password}\', admin: \'true\')\""
78 71  
79   - user_exist = Dir.chdir '/usr/lib/gitlab' do
80   - `RAILS_ENV=production bundle exec rails runner \"puts User.find_by_email(\'admin-gitlab@example.com\').nil?\"`.strip
  72 + user_exist = lambda do
  73 + Dir.chdir '/usr/lib/gitlab' do
  74 + `RAILS_ENV=production bundle exec rails runner \"puts User.find_by_email(\'admin-gitlab@example.com\').nil?\"`.strip
  75 + end
81 76 end
82 77  
83   - not_if {user_exist == "false"}
  78 + not_if {user_exist.call == "false"}
84 79  
85 80 cwd '/usr/lib/gitlab'
86 81 user 'git'
... ... @@ -117,12 +112,6 @@ directory '/var/lib/colab-assets/spb/' do
117 112 mode 0755
118 113 end
119 114  
120   -cookbook_file '/var/lib/colab-assets/spb/logo.svg' do
121   - owner 'root'
122   - group 'root'
123   - mode 0644
124   -end
125   -
126 115 cookbook_file '/var/lib/colab-assets/spb/fav.ico' do
127 116 owner 'root'
128 117 group 'root'
... ... @@ -143,3 +132,10 @@ service 'colab' do
143 132 action [:enable, :start]
144 133 supports :restart => true
145 134 end
  135 +
  136 +execute 'create-admin-token-colab' do
  137 + command "colab-admin loaddata admin-gitlab.json"
  138 +
  139 + cwd '/tmp'
  140 + user 'root'
  141 +end
... ...
cookbooks/colab/templates/colab.conf.erb
  Diff comments   View file @af884be
... ... @@ -10,10 +10,6 @@ server {
10 10 access_log /var/log/nginx/colab.access.log;
11 11 error_log /var/log/nginx/colab.error.log;
12 12  
13   - location ~ ^/static/img/logo\.[^.]+\.svg$ {
14   - alias /var/lib/colab-assets/spb/logo.svg;
15   - }
16   -
17 13 location ~ ^/static/img/fav\.[^.]+\.ico$ {
18 14 alias /var/lib/colab-assets/spb/fav.ico;
19 15 }
... ...
cookbooks/gitlab/recipes/default.rb
  Diff comments   View file @af884be
... ... @@ -12,7 +12,7 @@ template '/etc/gitlab/database.yml' do
12 12 group 'root'
13 13 mode 0644
14 14  
15   - notifies :run, 'execute[gitlab:setup]'
  15 + notifies :run, 'execute[gitlab:setup]', :immediately
16 16 end
17 17  
18 18 execute 'gitlab:setup' do
... ...