Commit c3288e9c16a89dfedd734d41f505a53146187bf2

Authored by Luciano Prestes
1 parent 413d098a

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

Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Showing 1 changed file with 12 additions and 10 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
... ... @@ -62,13 +62,6 @@ template &#39;/tmp/admin-gitlab.json&#39; 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 &#39;create-admin-token-gitlab&#39; 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'
... ... @@ -143,3 +138,10 @@ service &#39;colab&#39; do
143 138 action [:enable, :start]
144 139 supports :restart => true
145 140 end
  141 +
  142 +execute 'create-admin-token-colab' do
  143 + command "colab-admin loaddata admin-gitlab.json"
  144 +
  145 + cwd '/tmp'
  146 + user 'root'
  147 +end
... ...