Download as
Browse Code »

Commit e5f1b5a791e90c753a12e682d9202392c7540487

Authored by Paulo Tada
Committed by Sergio Oliveira
1 parent 6d98bb76
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Removing useless commands on colab default recipe 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Paulo Tada <paulohtfs@gmail.com>
Showing 1 changed file with 2 additions and 30 deletions   Show diff stats
cookbooks/colab/recipes/default.rb
  Diff comments   View file @e5f1b5a
... ... @@ -11,12 +11,6 @@ if node[&#39;platform&#39;] == &#39;centos&#39;
11 11 end
12 12 end
13 13  
14   -# FIXME should not be needed; colab should depend on the right version of
15   -# colab-deps
16   -package 'colab-deps' do
17   - action :upgrade
18   -end
19   -
20 14 package 'colab' do
21 15 action :upgrade
22 16 notifies :restart, 'service[colab]'
... ... @@ -40,13 +34,6 @@ directory &#39;/var/lock/colab&#39; do
40 34 mode 0755
41 35 end
42 36  
43   -execute 'secret-key' do
44   - f = '/etc/colab/secret.key'
45   - command "openssl rand -hex 32 -out #{f} && chown root:colab #{f} && chmod 0640 #{f}"
46   - not_if { File.exists?(f) }
47   - notifies :create, 'template[/etc/colab/settings.yaml]'
48   -end
49   -
50 37 template '/etc/sysconfig/colab' do
51 38 owner 'root'
52 39 group 'root'
... ... @@ -61,6 +48,7 @@ template &#39;/etc/colab/settings.d/00-database.py&#39; do
61 48 notifies :restart, 'service[colab]'
62 49 end
63 50  
  51 +# Creating a gitlab admin user
64 52 template '/tmp/admin-gitlab.json' do
65 53  
66 54 password = SecureRandom.random_number.to_s
... ... @@ -89,23 +77,6 @@ execute &#39;create-admin-token-gitlab&#39; do
89 77 user 'git'
90 78 end
91 79  
92   -template '/etc/colab/settings.d/01-apps.yaml' do
93   - owner 'root'
94   - group 'colab'
95   - mode 0640
96   - notifies :restart, 'service[colab]'
97   -
98   - get_private_token = lambda do
99   - Dir.chdir '/usr/lib/gitlab' do
100   - `sudo -u git RAILS_ENV=production bundle exec rails runner \"puts User.find_by_name(\'admin-gitlab\').private_token\"`.strip
101   - end
102   - end
103   -
104   - variables(
105   - :get_private_token => get_private_token
106   - )
107   -end
108   -
109 80 # Adding settings.d files
110 81 template '/etc/colab/settings.d/02-logging.py' do
111 82 owner 'root'
... ... @@ -160,6 +131,7 @@ service &#39;colab&#39; do
160 131 action :restart
161 132 end
162 133  
  134 +# Static files
163 135 directory '/var/lib/colab-assets/spb/' do
164 136 owner 'root'
165 137 group 'root'
... ...