diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb index 2b6f5a8..86ee1ca 100644 --- a/cookbooks/colab/recipes/default.rb +++ b/cookbooks/colab/recipes/default.rb @@ -96,52 +96,20 @@ execute 'create-admin-token-gitlab' do user 'git' end -execute 'create-admin-token-noosfero' do - user = "admin-noosfero" - email = "admin-noosfero@example.com" - password = SecureRandom.random_number.to_s - - command "bundle exec rails c production < get_gitlab_private_token, - :get_noosfero_private_token => get_noosfero_private_token + :get_private_token => get_private_token ) end diff --git a/cookbooks/colab/templates/01-apps.yaml.erb b/cookbooks/colab/templates/01-apps.yaml.erb index b1c88bd..9c3538a 100644 --- a/cookbooks/colab/templates/01-apps.yaml.erb +++ b/cookbooks/colab/templates/01-apps.yaml.erb @@ -2,7 +2,6 @@ PROXIED_APPS: gitlab: upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/' - private_token: '<%= @get_gitlab_private_token.call %>' + private_token: '<%= @get_private_token.call %>' noosfero: upstream: 'http://<%= node['peers']['social'] %>:80/social/' - private_token: '<%= @get_noosfero_private_token.call %>' -- libgit2 0.21.2