Commit
9b521d8c2d079b71369ddb178e77a06ac3d608fc
Exists in
master
and in
90 other branches
3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes
Merge branch 'lock_gitlab_setup' into 'master'
Lock gitlab setup
This fixes an error whenever trying to write the setup.done lock file, since the git user cannot write in the previous directory
See merge request !15
|
| @@ -18,8 +18,8 @@ end |
| @@ -18,8 +18,8 @@ end |
|
18
| execute 'gitlab:setup' do |
18
| execute 'gitlab:setup' do |
|
19
| user 'git' |
19
| user 'git' |
|
20
| cwd '/usr/lib/gitlab' |
20
| cwd '/usr/lib/gitlab' |
|
21
| - command 'yes yes | bundle exec rake db:setup RAILS_ENV=production && touch /etc/gitlab/setup.done' |
| |
|
22
| - not_if { File.exists?('/etc/gitlab/setup.done') } |
21
| + command 'yes yes | bundle exec rake db:setup RAILS_ENV=production && touch /var/lib/gitlab/setup.done' |
|
| |
22
| + not_if { File.exists?('/var/lib/gitlab/setup.done') } |
|
23
| |
23
| |
|
24
| action :nothing |
24
| action :nothing |
|
25
| notifies :restart, 'service[gitlab]' |
25
| notifies :restart, 'service[gitlab]' |
