Download as
Browse Code »

Commit 211bba44edd194cc92b358d703e3daef4301a85b

Authored by Alexandre Barbosa
1 parent d6368936
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, 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, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, 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, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Git configuration and satellites directory permissions 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Showing 1 changed file with 9 additions and 5 deletions   Show diff stats
@@ -16,7 +16,7 @@ GitLab @@ -16,7 +16,7 @@ GitLab
16 16
17 %prep 17 %prep
18 %setup -q 18 %setup -q
19 -%patch0 -p 1 19 +#%patch0 -p 1
20 20
21 %build 21 %build
22 cat > config/gitlab.yml <<EOF 22 cat > config/gitlab.yml <<EOF
@@ -109,14 +109,18 @@ mkdir -p /var/lib/gitlab/backups @@ -109,14 +109,18 @@ mkdir -p /var/lib/gitlab/backups
109 mkdir -p /var/lib/gitlab/repositories 109 mkdir -p /var/lib/gitlab/repositories
110 mkdir -p /var/lib/gitlab/satellites 110 mkdir -p /var/lib/gitlab/satellites
111 mkdir -p /var/lib/gitlab/tmp 111 mkdir -p /var/lib/gitlab/tmp
  112 +touch /var/lib/gitlab/.gitconfig
  113 +ln -s /var/lib/gitlab/.gitconfig /usr/lib/gitlab/.gitconfig
112 chown -R git:git /var/lib/gitlab 114 chown -R git:git /var/lib/gitlab
  115 +chmod u+rwx,g=rx,o-rwx /var/lib/gitlab/satellites
  116 +
113 if [ /usr/bin/redis-server ]; then 117 if [ /usr/bin/redis-server ]; then
114 service redis start 118 service redis start
115 fi 119 fi
116 120
117 -git config --global user.name "GitLab"  
118 -git config --global user.email "example@example.com"  
119 -git config --global core.autocrlf input 121 +sudo -u git -H "/usr/bin/git" config --global user.name "GitLab"
  122 +sudo -u git -H "/usr/bin/git" config --global user.email "example@example.com"
  123 +sudo -u git -H "/usr/bin/git" config --global core.autocrlf "input"
120 124
121 mkdir -p /var/lib/gitlab-assets 125 mkdir -p /var/lib/gitlab-assets
122 126
@@ -128,12 +132,12 @@ cp /usr/lib/gitlab/lib/support/init.d/gitlab /etc/init.d/gitlab @@ -128,12 +132,12 @@ cp /usr/lib/gitlab/lib/support/init.d/gitlab /etc/init.d/gitlab
128 cp /usr/lib/gitlab/lib/support/init.d/gitlab.default.example /etc/default/gitlab 132 cp /usr/lib/gitlab/lib/support/init.d/gitlab.default.example /etc/default/gitlab
129 cp /usr/lib/gitlab/lib/support/logrotate/gitlab /etc/logrotate.d/gitlab 133 cp /usr/lib/gitlab/lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
130 134
131 -sed -i 's/app_root="\/home\/\$app_user\/gitlab"/app_root="\/usr\/lib\/gitlab"/' /etc/init.d/gitlab  
132 sed -i 's/app_root="\/home\/\$app_user\/gitlab"/app_root="\/usr\/lib\/gitlab"/' /etc/default/gitlab 135 sed -i 's/app_root="\/home\/\$app_user\/gitlab"/app_root="\/usr\/lib\/gitlab"/' /etc/default/gitlab
133 sed -i 's/\/home\/\git/\/usr\/lib/' /etc/logrotate.d/gitlab 136 sed -i 's/\/home\/\git/\/usr\/lib/' /etc/logrotate.d/gitlab
134 137
135 %postun 138 %postun
136 #TODO Remove 139 #TODO Remove
  140 +service gitlab stop
137 sudo -u postgres psql -d template1 << EOF 141 sudo -u postgres psql -d template1 << EOF
138 DROP DATABASE gitlabhq_production; 142 DROP DATABASE gitlabhq_production;
139 DROP USER git; 143 DROP USER git;