From 4dc334c2fec4dc713d99d08c2db6cef6e5dbec3a Mon Sep 17 00:00:00 2001 From: Dmitriy Bogdanov Date: Wed, 19 Oct 2016 17:35:20 +0400 Subject: [PATCH] Move "data" and "var" directories to /var/lib/wallabag/ --- .SRCINFO | 2 ++ PKGBUILD | 12 ++++++++++-- wallabag.install | 27 ++++++++++++++++++--------- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 71f7c1f..8ced9bc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -16,6 +16,8 @@ pkgbase = wallabag options = !strip backup = etc/webapps/wallabag/parameters.yml backup = usr/share/webapps/wallabag/parameters.yml + backup = var/lib/wallabag/data/db/wallabag.sqlite + backup = usr/share/webapps/wallabag/data/db/wallabag.sqlite source = wallabag.tar.xz::http://wllbg.org/latest-v2-package sha256sums = f3acfde5a945bcd0a65f2549fc2f577bc6fc633ba901df27e7dc88c07feb2406 diff --git a/PKGBUILD b/PKGBUILD index e5ebb92..deca386 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,7 +23,9 @@ options=(!strip) source=("${pkgname}.tar.xz::http://wllbg.org/latest-v2-package") sha256sums=('f3acfde5a945bcd0a65f2549fc2f577bc6fc633ba901df27e7dc88c07feb2406') backup=("etc/webapps/${pkgname}/parameters.yml" - "usr/share/webapps/${pkgname}/parameters.yml") + "usr/share/webapps/${pkgname}/parameters.yml" + "var/lib/${pkgname}/data/db/wallabag.sqlite" + "usr/share/webapps/${pkgname}/data/db/wallabag.sqlite") package() { cd "${pkgdir}" @@ -37,5 +39,11 @@ package() { chown -R http:http ${pkgdir}/etc/webapps/${pkgname} ln -s /etc/webapps/${pkgname}/parameters.yml "${WALLABAG_CONF_DIR}"/ - chown -R http:http "${pkgdir}/usr/share/webapps/wallabag" + _VAR_DIR="${pkgdir}/var/lib/${pkgname}/" + install -d "$_VAR_DIR" + mv "${pkgdir}/usr/share/webapps/${pkgname}/"{data,var} "$_VAR_DIR" + ln -s "/var/lib/${pkgname}/"{data,var} "${pkgdir}/usr/share/webapps/${pkgname}/" + chown -R http:http "$_VAR_DIR" + + chown -R http:http "${pkgdir}/usr/share/webapps/${pkgname}" } diff --git a/wallabag.install b/wallabag.install index 55b211b..bbb2880 100644 --- a/wallabag.install +++ b/wallabag.install @@ -1,10 +1,10 @@ post_install() { - echo "" - echo "==> Installed in : /usr/share/webapps/wallabag" - echo "" - echo "==> Config is at /etc/webapps/wallabag/config/parameters.yml" - echo "" + echo "" + echo "==> Installed in : /usr/share/webapps/wallabag" + echo "" + echo "==> Config is at /etc/webapps/wallabag/config/parameters.yml" + echo "" echo -n "Change the configuration to fit to your current setup, and then " echo "init wallabag by launching:" echo "php /usr/share/webapps/wallabag/bin/console wallabag:install --env=prod" @@ -15,15 +15,24 @@ post_install() { pre_upgrade() { - # save old untracked config and make it tracked - if [[ -f /usr/share/webapps/wallabag/app/config/parameters.yml && \ + # save old untracked config and make it tracked + if [[ -f /usr/share/webapps/wallabag/app/config/parameters.yml && \ ! -h /usr/share/webapps/wallabag/app/config/parameters.yml ]]; then install -Dm644 \ /usr/share/webapps/wallabag/app/config/parameters.yml \ -t /etc/webapps/wallabag/ - fi + fi + # also move `data` and `var` to /var/lib/wallabag/ + if [[ -d /usr/share/webapps/wallabag/data && \ + ! -h /usr/share/webapps/wallabag/data && \ + -d /usr/share/webapps/wallabag/var && \ + ! -h /usr/share/webapps/wallabag/var ]]; then + install -d /var/lib/wallabag/ + chown http:http /var/lib/wallabag/ + mv /usr/share/webapps/wallabag/{data,var} /var/lib/wallabag/ + fi } post_upgrade() { - rm -rf /usr/share/webapps/wallabag/var/cache/* + rm -rf /var/lib/wallabag/var/cache/* }