From 1cf7f36aa176552f3861b7d2439dbfe835a3ee22 Mon Sep 17 00:00:00 2001
From: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Date: Fri, 5 Jun 2015 17:43:08 -0300
Subject: [PATCH] Get private token of colab-admin and put on gitlab plugin configuration

---
 cookbooks/colab/recipes/default.rb         | 37 +++++++++++++++++++++++++++++--------
 cookbooks/colab/templates/01-apps.yaml.erb |  1 +
 cookbooks/gitlab/recipes/default.rb        | 16 ----------------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb
index cf6f29f..dcb1c4c 100644
--- a/cookbooks/colab/recipes/default.rb
+++ b/cookbooks/colab/recipes/default.rb
@@ -53,11 +53,40 @@ template '/etc/colab/settings.d/00-database.yaml' do
   notifies :restart, 'service[colab]'
 end
 
+execute 'create token-admin' do
+  user = "admin-gitlab"
+  email = "admin-gitlab@admin.com"
+  password = SecureRandom.random_number.to_s
+
+  command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" | colab-admin shell"
+end
+
+execute 'admin-token' do
+  user = "admin-gitlab"
+  email = "admin-gitlab@admin.com"
+  password = SecureRandom.random_number.to_s
+
+  command "sudo -u git RAILS_ENV=production bundle exec rails runner \"User.create(name: \'#{name}\', username: \'#{name}\', email: \'#{email}\', password: \'#{password}\', admin: \'true\')\""
+
+  cwd '/usr/lib/gitlab'
+  user 'root'
+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_email(\'admin-gitlab@admin.com\').private_token\"`.strip
+    end
+  end
+
+  variables(
+    :get_private_token => get_private_token
+  )
 end
 
 template '/etc/colab/settings.d/02-logging.yaml' do
@@ -100,11 +129,3 @@ service 'colab' do
   action [:enable, :start]
   supports :restart => true
 end
-
-execute 'create token-admin' do
-  user = "admin-gitlab"
-  email = "admin-gitlab@admin.com"
-  password = SecureRandom.random_number.to_s
-
-  command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" | colab-admin shell"
-end
diff --git a/cookbooks/colab/templates/01-apps.yaml.erb b/cookbooks/colab/templates/01-apps.yaml.erb
index 3fd7338..9c3538a 100644
--- a/cookbooks/colab/templates/01-apps.yaml.erb
+++ b/cookbooks/colab/templates/01-apps.yaml.erb
@@ -2,5 +2,6 @@
 PROXIED_APPS:
   gitlab:
     upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/'
+    private_token: '<%= @get_private_token.call %>'
   noosfero:
     upstream: 'http://<%= node['peers']['social'] %>:80/social/'
diff --git a/cookbooks/gitlab/recipes/default.rb b/cookbooks/gitlab/recipes/default.rb
index 4dabb5f..a29df74 100644
--- a/cookbooks/gitlab/recipes/default.rb
+++ b/cookbooks/gitlab/recipes/default.rb
@@ -95,19 +95,3 @@ execute 'selinux-gitlab' do
   command 'selinux-install-module /etc/selinux/local/gitlab.te'
   action :nothing
 end
-
-execute 'admin-token' do
-  user = "admin-gitlab"
-  email = "admin-gitlab@admin.com"
-  password = SecureRandom.random_number.to_s
-
-  command "bundle exec rails c production << EOF
-          user = User.create(name: \'#{name}\', username: \'#{name}\', email: \'#{email}\', password: \'#{password}\')
-          user.admin = true
-          user.save
-          exit
-          EOF"
-
-  cwd '/usr/lib/gitlab'
-  user 'git'
-end
--
libgit2 0.21.2