Commit ce85436c73bb1f25027b3cc71d51a0afd8b38168
1 parent
4f94bd02
Exists in
master
and in
7 other branches
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
| 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 | ... | ... |