Date: Tuesday, May 3, 2016 @ 15:39:56 Author: svenstaro Revision: 173568
upgpkg: gitlab-shell 2.7.2-5 Move all config to /etc Modified: gitlab-shell/trunk/PKGBUILD ----------+ PKGBUILD | 71 +++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 32 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-03 13:04:44 UTC (rev 173567) +++ PKGBUILD 2016-05-03 13:39:56 UTC (rev 173568) @@ -8,7 +8,7 @@ pkgname=gitlab-shell pkgver=2.7.2 -pkgrel=4 +pkgrel=5 pkgdesc="Self hosted Git management software. Replacement for gitolite" arch=('any') url="https://gitlab.com/gitlab-org/gitlab-shell/" @@ -17,8 +17,10 @@ options=('!strip') install=gitlab-shell.install backup=("etc/webapps/${pkgname}/config.yml" - "etc/webapps/${pkgname}/secret" - "usr/share/webapps/${pkgname}/.gitlab_shell_secret") + "etc/webapps/${pkgname}/secret" + "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') @@ -29,46 +31,51 @@ _etcdir="/etc/webapps/${pkgname}" prepare() { - cd "${srcdir}/${_srcdir}"-* + cd "${srcdir}/${_srcdir}"-* - sed -e "s|/home/git|${_homedir}|" \ - -e "s|# log_file: .*|log_file: \"${_logdir}/gitlab-shell.log\"|" \ - config.yml.example > config.yml + sed -e "s|/home/git|${_homedir}|" \ + -e "s|# log_file: .*|log_file: \"${_logdir}/gitlab-shell.log\"|" \ + config.yml.example > config.yml } package() { - cd "${srcdir}/${_srcdir}"-* + cd "${srcdir}/${_srcdir}"-* - install -dm750 -o 105 -g 105 "${pkgdir}${_datadir}" - install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}" - install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}/satellites" - install -dm700 -o 105 -g 105 "${pkgdir}${_homedir}/.ssh" - install -dm750 -o 105 -g 105 "${pkgdir}${_etcdir}" - install -dm770 -o root -g 105 "${pkgdir}${_logdir}" + install -dm750 -o 105 -g 105 "${pkgdir}${_datadir}" + install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}" + install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}/satellites" + install -dm700 -o 105 -g 105 "${pkgdir}${_homedir}/.ssh" + install -dm750 -o 105 -g 105 "${pkgdir}${_etcdir}" + install -dm770 -o root -g 105 "${pkgdir}${_logdir}" - echo "[user]" > "${pkgdir}${_homedir}"/.gitconfig - echo " name = GitLab" >> "${pkgdir}${_homedir}"/.gitconfig - echo " email = git@localhost" >> "${pkgdir}${_homedir}"/.gitconfig + # .gitconfig + echo "[user]" > "${pkgdir}${_etcdir}"/.gitconfig + echo " name = GitLab" >> "${pkgdir}${_etcdir}"/.gitconfig + echo " email = git@localhost" >> "${pkgdir}${_etcdir}"/.gitconfig + ln -fs "${_etcdir}/gitconfig" "${pkgdir}${_homedir}/.gitconfig" - touch "${pkgdir}${_homedir}/.ssh/authorized_keys" - chmod 600 "${pkgdir}${_homedir}/.ssh/authorized_keys" + # .ssh/authorized_keys + touch "${pkgdir}${_homedir}/.ssh/authorized_keys" + chmod 600 "${pkgdir}${_homedir}/.ssh/authorized_keys" + ln -fs "${_etcdir}/authorized_keys" "${pkgdir}${_homedir}/.ssh/authorized_keys" - touch "${pkgdir}${_etcdir}/secret" - chmod 640 "${pkgdir}${_etcdir}/secret" - chown root:105 "${pkgdir}${_etcdir}/secret" + # .gitlab_shell_secret + touch "${pkgdir}${_etcdir}/secret" + chmod 640 "${pkgdir}${_etcdir}/secret" + chown root:105 "${pkgdir}${_etcdir}/secret" + ln -fs "${_etcdir}/secret" "${pkgdir}${_datadir}/.gitlab_shell_secret" - ln -fs "${_etcdir}/secret" "${pkgdir}${_datadir}/.gitlab_shell_secret" + # config.yml + mv config.yml "${pkgdir}${_etcdir}" + ln -fs "${_etcdir}/config.yml" "${pkgdir}${_datadir}/config.yml" - mv config.yml "${pkgdir}${_etcdir}" - ln -fs "${_etcdir}/config.yml" "${pkgdir}${_datadir}/config.yml" + cp -r VERSION bin hooks lib spec support "${pkgdir}${_datadir}" + ln -fs "${_datadir}" "${pkgdir}/${_homedir}/" - cp -r VERSION bin hooks lib spec support "${pkgdir}${_datadir}" - ln -fs "${_datadir}" "${pkgdir}/${_homedir}/" + install -dm2770 "${pkgdir}${_homedir}/repositories" - install -dm2770 "${pkgdir}${_homedir}/repositories" - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md" } -# vim:set ts=4 sw=4 et: +# vim:set ts=2 sw=2 et: