Date: Wednesday, May 4, 2016 @ 03:18:39 Author: svenstaro Revision: 173626
upgpkg: gitlab-shell 2.7.2-7 Switch back to gitlab user Added: gitlab-shell/trunk/gitlab-shell.gitconfig Modified: gitlab-shell/trunk/PKGBUILD ------------------------+ PKGBUILD | 15 ++++++++------- gitlab-shell.gitconfig | 3 +++ 2 files changed, 11 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-04 00:51:40 UTC (rev 173625) +++ PKGBUILD 2016-05-04 01:18:39 UTC (rev 173626) @@ -8,7 +8,7 @@ pkgname=gitlab-shell pkgver=2.7.2 -pkgrel=6 +pkgrel=7 pkgdesc="Self hosted Git management software. Replacement for gitolite" arch=('any') url="https://gitlab.com/gitlab-org/gitlab-shell/" @@ -21,8 +21,10 @@ "etc/webapps/${pkgname}/gitconfig" "etc/webapps/${pkgname}/authorized_keys" "etc/webapps/${pkgname}/") -source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=v${pkgver}") -md5sums=('1835e858d9285ac9941eec320e2ecac6') +source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=v${pkgver}" + "gitlab-shell.gitconfig") +md5sums=('1835e858d9285ac9941eec320e2ecac6' + '6b917256b13a1685e9a3cc73e68152d0') _homedir='/var/lib/gitlab' _datadir="/usr/share/webapps/${pkgname}" @@ -33,7 +35,8 @@ prepare() { cd "${srcdir}/${_srcdir}"-* - sed -e "s|/home/git|${_homedir}|" \ + sed -e "s|user: git|user: gitlab|" \ + -e "s|/home/git|${_homedir}|" \ -e "s|# log_file: .*|log_file: \"${_logdir}/gitlab-shell.log\"|" \ config.yml.example > config.yml } @@ -49,9 +52,7 @@ install -dm770 -o root -g 105 "${pkgdir}${_logdir}" # .gitconfig - echo "[user]" > "${pkgdir}${_etcdir}"/.gitconfig - echo " name = GitLab" >> "${pkgdir}${_etcdir}"/.gitconfig - echo " email = git@localhost" >> "${pkgdir}${_etcdir}"/.gitconfig + install -Dm644 -o 105 -g 105 "${srcdir}/gitlab-shell.gitconfig" "${pkgdir}${_etcdir}/.gitconfig" ln -fs "${_etcdir}/gitconfig" "${pkgdir}${_homedir}/.gitconfig" # .ssh/authorized_keys Added: gitlab-shell.gitconfig =================================================================== --- gitlab-shell.gitconfig (rev 0) +++ gitlab-shell.gitconfig 2016-05-04 01:18:39 UTC (rev 173626) @@ -0,0 +1,3 @@ +[user] + name = GitLab + email = gitlab@localhost