Commit af884be961ab1a87c37896988cf745eafa1d46ec
Exists in
master
and in
64 other branches
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
| @@ -62,13 +62,6 @@ template '/tmp/admin-gitlab.json' do | @@ -62,13 +62,6 @@ template '/tmp/admin-gitlab.json' do | ||
| 62 | ) | 62 | ) |
| 63 | end | 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 | execute 'create-admin-token-gitlab' do | 65 | execute 'create-admin-token-gitlab' do |
| 73 | user = "admin-gitlab" | 66 | user = "admin-gitlab" |
| 74 | email = "admin-gitlab@example.com" | 67 | email = "admin-gitlab@example.com" |
| @@ -76,11 +69,13 @@ execute 'create-admin-token-gitlab' do | @@ -76,11 +69,13 @@ execute 'create-admin-token-gitlab' do | ||
| 76 | 69 | ||
| 77 | command "RAILS_ENV=production bundle exec rails runner \"User.create(name: \'#{user}\', username: \'#{user}\', email: \'#{email}\', password: \'#{password}\', admin: \'true\')\"" | 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 | end | 76 | end |
| 82 | 77 | ||
| 83 | - not_if {user_exist == "false"} | 78 | + not_if {user_exist.call == "false"} |
| 84 | 79 | ||
| 85 | cwd '/usr/lib/gitlab' | 80 | cwd '/usr/lib/gitlab' |
| 86 | user 'git' | 81 | user 'git' |
| @@ -117,12 +112,6 @@ directory '/var/lib/colab-assets/spb/' do | @@ -117,12 +112,6 @@ directory '/var/lib/colab-assets/spb/' do | ||
| 117 | mode 0755 | 112 | mode 0755 |
| 118 | end | 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 | cookbook_file '/var/lib/colab-assets/spb/fav.ico' do | 115 | cookbook_file '/var/lib/colab-assets/spb/fav.ico' do |
| 127 | owner 'root' | 116 | owner 'root' |
| 128 | group 'root' | 117 | group 'root' |
| @@ -143,3 +132,10 @@ service 'colab' do | @@ -143,3 +132,10 @@ service 'colab' do | ||
| 143 | action [:enable, :start] | 132 | action [:enable, :start] |
| 144 | supports :restart => true | 133 | supports :restart => true |
| 145 | end | 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
| @@ -10,10 +10,6 @@ server { | @@ -10,10 +10,6 @@ server { | ||
| 10 | access_log /var/log/nginx/colab.access.log; | 10 | access_log /var/log/nginx/colab.access.log; |
| 11 | error_log /var/log/nginx/colab.error.log; | 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 | location ~ ^/static/img/fav\.[^.]+\.ico$ { | 13 | location ~ ^/static/img/fav\.[^.]+\.ico$ { |
| 18 | alias /var/lib/colab-assets/spb/fav.ico; | 14 | alias /var/lib/colab-assets/spb/fav.ico; |
| 19 | } | 15 | } |
cookbooks/gitlab/recipes/default.rb
| @@ -12,7 +12,7 @@ template '/etc/gitlab/database.yml' do | @@ -12,7 +12,7 @@ template '/etc/gitlab/database.yml' do | ||
| 12 | group 'root' | 12 | group 'root' |
| 13 | mode 0644 | 13 | mode 0644 |
| 14 | 14 | ||
| 15 | - notifies :run, 'execute[gitlab:setup]' | 15 | + notifies :run, 'execute[gitlab:setup]', :immediately |
| 16 | end | 16 | end |
| 17 | 17 | ||
| 18 | execute 'gitlab:setup' do | 18 | execute 'gitlab:setup' do |