Download as
Browse Code »

Commit 99bf5a7e6afa76385bf2d444ce9d724a63d4d608

Authored by Antonio Terceiro
2 parents 0ee700f9 ce85436c
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

Merge branch 'gitlab_ssh_dir' 

See merge request !1
Showing 2 changed files with 6 additions and 15 deletions   Show diff stats
specs/gitlab/gitlab-shell.spec
  Diff comments   View file @99bf5a7
1 1 Name: gitlab-shell
2 2 Version: 2.4.0
3   -Release: 2%{?dist}
  3 +Release: 3%{?dist}
4 4 Summary: Software Development Platform
5 5  
6 6 Group: Development/Tools
... ... @@ -30,7 +30,7 @@ http_settings:
30 30 # ca_path: /etc/pki/tls/certs
31 31 self_signed_cert: false
32 32  
33   -repos_path: "/var/lib/gitlab/repositories/"
  33 +repos_path: "/var/lib/gitlab-shell/repositories/"
34 34 auth_file: "/var/lib/gitlab-shell/.ssh/authorized_keys"
35 35  
36 36 redis:
... ... @@ -59,19 +59,16 @@ cp -r . %{buildroot}/usr/lib/gitlab-shell
59 59 %post
60 60 groupadd git || true
61 61 if ! id git; then
62   - adduser --system --home-dir /usr/lib/gitlab --no-create-home --gid git git
  62 + adduser --system --home-dir /usr/lib/gitlab --gid git git
63 63 fi
64 64  
65 65 mkdir -p /var/log/gitlab-shell
66 66 mkdir -p /var/lib/gitlab-shell/.ssh
67   -
68   -ln -s /var/lib/gitlab-shell/.ssh /usr/lib/gitlab/.ssh
  67 +mkdir -p /var/lib/gitlab-shell/repositories
69 68  
70 69 chown -R git:git /var/log/gitlab-shell
71 70 chown -R git:git /var/lib/gitlab-shell
72 71  
73   -ln -s /var/lib/gitlab/.gitlab_shell_secret /usr/lib/gitlab-shell/.gitlab_shell_secret
74   -
75 72 sudo -u git -H /usr/lib/gitlab-shell/bin/install
76 73  
77 74 %files
... ...
specs/gitlab/gitlab.spec
  Diff comments   View file @99bf5a7
1 1 Name: gitlab
2 2 Version: 7.6.2
3   -Release: 8%{?dist}
  3 +Release: 9%{?dist}
4 4 Summary: Software Development Platform
5 5 Group: Development/Tools
6 6 License: Expat
... ... @@ -53,7 +53,7 @@ production: &base
53 53 path: /var/lib/gitlab/backups
54 54 gitlab_shell:
55 55 path: /usr/lib/gitlab-shell
56   - repos_path: /var/lib/gitlab/repositories/
  56 + repos_path: /var/lib/gitlab-shell/repositories/
57 57 hooks_path: /usr/lib/gitlab-shell/hooks/
58 58 # Git over HTTP
59 59 upload_pack: true
... ... @@ -95,16 +95,11 @@ for configfile in gitlab.yml unicorn.rb database.yml; do
95 95 done
96 96 ln -s /var/log/gitlab %{buildroot}/usr/lib/gitlab/log
97 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 98 ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret
100 99 ln -s /var/lib/gitlab-assets %{buildroot}/usr/lib/gitlab/public/assets
101 100 ln -s /var/lib/gitlab-uploads %{buildroot}/usr/lib/gitlab/public/uploads
102 101  
103 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 103 if [ -x /usr/bin/postgres ]; then
109 104 service postgresql initdb || true
110 105 service postgresql start
... ... @@ -113,7 +108,6 @@ fi
113 108 mkdir -p /var/log/gitlab
114 109 chown -R git:git /var/log/gitlab
115 110 mkdir -p /var/lib/gitlab/backups
116   -mkdir -p /var/lib/gitlab/repositories
117 111 mkdir -p /var/lib/gitlab/satellites
118 112 mkdir -p /var/lib/gitlab/tmp
119 113 mkdir -p /var/lib/gitlab-uploads
... ...