diff options
Diffstat (limited to 'gitlab-server')
3 files changed, 8 insertions, 8 deletions
diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service index 811b3fc0..151f9677 100644 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service +++ b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-ci-unicorn.service @@ -17,8 +17,8 @@ SyslogIdentifier=gitlab-ci-unicorn PIDFile=/home/gitlab_ci/gitlab-ci/tmp/pids/unicorn.pid ExecStart=/usr/bin/bundle exec "unicorn_rails -c /home/gitlab_ci/gitlab-ci/config/unicorn.rb -E production" -ExecStop=/usr/bin/kill -QUIT $MAINPID -ExecReload=/usr/bin/kill -USR2 $MAINPID +ExecStop=/bin/kill -s QUIT $MAINPID +ExecReload=/bin/kill -s USR2 $MAINPID [Install] WantedBy=gitlab.target diff --git a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service index 71e3d84d..a901d323 100644 --- a/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service +++ b/gitlab-server/usr/share/gitlab-install/systemd-units/gitlab-unicorn.service @@ -17,8 +17,8 @@ SyslogIdentifier=gitlab-unicorn PIDFile=/home/git/gitlab/tmp/pids/unicorn.pid ExecStart=/usr/bin/bundle exec "unicorn_rails -c /home/git/gitlab/config/unicorn.rb -E production" -ExecStop=/usr/bin/kill -QUIT $MAINPID -ExecReload=/usr/bin/kill -USR2 $MAINPID +ExecStop=/bin/kill -s QUIT $MAINPID +ExecReload=/bin/kill -s USR2 $MAINPID [Install] WantedBy=gitlab.target diff --git a/gitlab-server/usr/share/gitlab-setup b/gitlab-server/usr/share/gitlab-setup index e1084a1b..e60dfcdf 100755 --- a/gitlab-server/usr/share/gitlab-setup +++ b/gitlab-server/usr/share/gitlab-setup @@ -21,7 +21,7 @@ set -e gem install bundler # create required users -adduser -D --gecos 'GitLab' -s /bin/sh git +if [ `grep -c '^git:' /etc/passwd` -ne 1 ] ; then adduser -D --gecos 'GitLab' -s /bin/sh git ; fi adduser -D -s /bin/sh postgres adduser -D --gecos 'GitLab CI' -s /bin/sh gitlab_ci @@ -49,13 +49,13 @@ su -c "git config --global user.email 'gitlab@localhost'" - git su -c "git config --global core.autocrlf input" - git # install gitlab shell -su -c "git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.9.3 ~/gitlab-shell" - git +su -c "cp -r /usr/share/gitlab-shell gitlab-shell" - git cd /home/git/gitlab-shell cp /usr/share/gitlab-install/gitlab-shell/config.yml ./config.yml su -c "~/gitlab-shell/bin/install" - git # install gitlab -su -c "git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-8-stable ~/gitlab" - git +su -c "cp -r /usr/share/gitlab-ce gitlab" - git cd /home/git/gitlab su -c "cp config/database.yml.postgresql config/database.yml" git su -c "cp -r /usr/share/gitlab-install/gitlab/config/* config/" git @@ -76,7 +76,7 @@ su -c "git config --global user.email 'gitlab_ci@localhost'" - gitlab_ci su -c "git config --global core.autocrlf input" - gitlab_ci # install gitlab ci -su -c "git clone https://gitlab.com/gitlab-org/gitlab-ci.git -b 5-0-stable" - gitlab_ci +su -c "cp -r /usr/share/gitlab-ci gitlab-ci" - gitlab_ci cd /home/gitlab_ci/gitlab-ci su -c "cp config/database.yml.postgresql config/database.yml" gitlab_ci su -c "cp -r /usr/share/gitlab-install/gitlab-ci/config/* config/" gitlab_ci |