Download as
Browse Code »

Commit ce85436c73bb1f25027b3cc71d51a0afd8b38168

Authored by Alexandre Barbosa
1 parent 4f94bd02
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

Remove git user creation and move repositories dir 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Showing 1 changed file with 2 additions and 8 deletions   Show diff stats
specs/gitlab/gitlab.spec
  Diff comments   View file @ce85436
1 Name: gitlab 1 Name: gitlab
2 Version: 7.6.2 2 Version: 7.6.2
3 -Release: 8%{?dist} 3 +Release: 9%{?dist}
4 Summary: Software Development Platform 4 Summary: Software Development Platform
5 Group: Development/Tools 5 Group: Development/Tools
6 License: Expat 6 License: Expat
@@ -53,7 +53,7 @@ production: &amp;base @@ -53,7 +53,7 @@ production: &amp;base
53 path: /var/lib/gitlab/backups 53 path: /var/lib/gitlab/backups
54 gitlab_shell: 54 gitlab_shell:
55 path: /usr/lib/gitlab-shell 55 path: /usr/lib/gitlab-shell
56 - repos_path: /var/lib/gitlab/repositories/ 56 + repos_path: /var/lib/gitlab-shell/repositories/
57 hooks_path: /usr/lib/gitlab-shell/hooks/ 57 hooks_path: /usr/lib/gitlab-shell/hooks/
58 # Git over HTTP 58 # Git over HTTP
59 upload_pack: true 59 upload_pack: true
@@ -95,16 +95,11 @@ for configfile in gitlab.yml unicorn.rb database.yml; do @@ -95,16 +95,11 @@ for configfile in gitlab.yml unicorn.rb database.yml; do
95 done 95 done
96 ln -s /var/log/gitlab %{buildroot}/usr/lib/gitlab/log 96 ln -s /var/log/gitlab %{buildroot}/usr/lib/gitlab/log
97 ln -s /var/lib/gitlab/tmp %{buildroot}/usr/lib/gitlab/tmp 97 ln -s /var/lib/gitlab/tmp %{buildroot}/usr/lib/gitlab/tmp
98 -ln -s /var/lib/gitlab/.gitlab_shell_secret %{buildroot}/usr/lib/gitlab/.gitlab_shell_secret  
99 ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret 98 ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret
100 ln -s /var/lib/gitlab-assets %{buildroot}/usr/lib/gitlab/public/assets 99 ln -s /var/lib/gitlab-assets %{buildroot}/usr/lib/gitlab/public/assets
101 ln -s /var/lib/gitlab-uploads %{buildroot}/usr/lib/gitlab/public/uploads 100 ln -s /var/lib/gitlab-uploads %{buildroot}/usr/lib/gitlab/public/uploads
102 101
103 %post 102 %post
104 -groupadd git || true  
105 -if ! id git; then  
106 - adduser --system --home-dir /usr/lib/gitlab --no-create-home --gid git git  
107 -fi  
108 if [ -x /usr/bin/postgres ]; then 103 if [ -x /usr/bin/postgres ]; then
109 service postgresql initdb || true 104 service postgresql initdb || true
110 service postgresql start 105 service postgresql start
@@ -113,7 +108,6 @@ fi @@ -113,7 +108,6 @@ fi
113 mkdir -p /var/log/gitlab 108 mkdir -p /var/log/gitlab
114 chown -R git:git /var/log/gitlab 109 chown -R git:git /var/log/gitlab
115 mkdir -p /var/lib/gitlab/backups 110 mkdir -p /var/lib/gitlab/backups
116 -mkdir -p /var/lib/gitlab/repositories  
117 mkdir -p /var/lib/gitlab/satellites 111 mkdir -p /var/lib/gitlab/satellites
118 mkdir -p /var/lib/gitlab/tmp 112 mkdir -p /var/lib/gitlab/tmp
119 mkdir -p /var/lib/gitlab-uploads 113 mkdir -p /var/lib/gitlab-uploads