diff options
author | Edvinas Valatka | 2017-02-19 02:21:46 +0200 |
---|---|---|
committer | Edvinas Valatka | 2017-02-19 02:23:35 +0200 |
commit | 848671ad2996dc6ec366ed388c5937acfcc026c3 (patch) | |
tree | dbd7e6802566da4454ffb2a3e3f617de65c3e4ba | |
parent | a6127c2cd61428a50017ce14c3879d537a433e97 (diff) | |
download | aur-848671ad2996dc6ec366ed388c5937acfcc026c3.tar.gz |
Migrate configuration file
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | gogs.install | 29 |
3 files changed, 23 insertions, 15 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Feb 18 19:19:53 UTC 2017 +# Sun Feb 19 00:22:48 UTC 2017 pkgbase = gogs-dev-git pkgdesc = Self Hosted Git Service in the Go Programming Language. This is the current git version from branch develop. - pkgver = 0.9.158.0218+3+5d766bc4 + pkgver = 0.9.158.0218+5+c6990032 pkgrel = 1 url = http://gogs.io/ install = gogs.install @@ -27,7 +27,6 @@ pkgbase = gogs-dev-git replaces = gogs-git-dev options = !buildflags options = !strip - backup = etc/gogs/app.ini source = git+https://github.com/gogits/gogs.git#branch=develop source = git+https://github.com/jteeuwen/go-bindata.git source = gogs.service @@ -8,7 +8,7 @@ _pkgname=gogs _team=github.com/gogits _gogsdir="src/${_team}/${_pkgname}" pkgname=${_pkgname}-dev-git -pkgver=0.9.158.0218+3+5d766bc4 +pkgver=0.9.158.0218+5+c6990032 pkgrel=1 pkgdesc="Self Hosted Git Service in the Go Programming Language. This is the current git version from branch ${_branch}." arch=('i686' 'x86_64' 'armv6h' 'armv7h') @@ -27,7 +27,6 @@ optdepends=( "openssh: GIT over SSH support" ) makedepends=('go' 'git' 'nodejs-less') -backup=("etc/${_pkgname}/app.ini") install=${_pkgname}.install source=( @@ -94,7 +93,6 @@ package() { install -Dm0644 -t "$pkgdir/usr/lib/systemd/system" "$srcdir/${_pkgname}.service" install -Dm0644 "$srcdir/${_pkgname}.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/${_pkgname}.conf" - install -Dm064 -t "$pkgdir/etc/${_pkgname}" ./conf/app.ini } diff --git a/gogs.install b/gogs.install index c7819d81c41d..87993db60236 100644 --- a/gogs.install +++ b/gogs.install @@ -31,12 +31,13 @@ pre_install() { if [ ${_OldHome} != "/srv/gogs" ]; then echo echo "Setting gogs home directory to /srv/gogs" - _disable_if_enabled + usermod -c 'Gogs service user' -g gogs -d /srv/gogs -L -s /bin/bash gogs + echo echo "You must migrate from ${_OldHome}" echo "before starting or re-enabling service" echo + _disable_if_enabled fi - usermod -c 'Gogs service user' -g gogs -d /srv/gogs -L -s /bin/bash gogs fi } @@ -52,15 +53,23 @@ pre_upgrade() { post_upgrade() { post_install - if ! [[ -f /etc/gogs/app.ini.pacnew ]] ; then - _start_if_enabled - else + + local _CustConf=/srv/gogs/custom/conf/app.ini + local _OldConf=/etc/gogs/app.ini + + if [[ -f ${_OldConf}.pacsave ]] && [[ ! -f ${_CustConf} ]] ; then + install -Dm0750 -d -o gogs -g gogs /srv/gogs + install -Dm0750 -d -o gogs -g gogs /srv/gogs/custom + install -Dm0750 -d -o gogs -g gogs /srv/gogs/custom/conf + install -Dm0640 -T -o gogs -g gogs ${_OldConf}.pacsave ${_CustConf} echo - _disable_if_enabled - echo "/etc/gogs/app.ini{,.pacnew} needs merge" - echo "before starting or re-enabling service" + echo "${_OldConf} moved to" + echo "${_CustConf}." + echo "You may need to manually delete" + echo "an old config dir /etc/gogs" echo fi + _start_if_enabled } pre_remove() { @@ -76,5 +85,7 @@ post_remove() { groupdel gogs fi systemctl daemon-reload - echo "You will need to delete the directory /srv/gogs manually" + echo + echo "You may need to manually delete an old workdir /srv/gogs" + echo } |