diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 37 | ||||
-rw-r--r-- | sysuser.conf | 4 | ||||
-rw-r--r-- | tmpfiles.conf | 10 |
4 files changed, 27 insertions, 30 deletions
@@ -1,6 +1,6 @@ pkgbase = movim-git pkgdesc = Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol. - pkgver = r7210.4498c2be8 + pkgver = r7291.d5631dc9b pkgrel = 1 url = https://movim.eu install = movim.install @@ -26,10 +26,12 @@ pkgbase = movim-git source = movim.env source = movim.service source = sysuser.conf + source = tmpfiles.conf sha256sums = SKIP sha256sums = 5dfff91dd4a54f3d3713530e204370a96d37898b670a61123d8cad42f92da306 sha256sums = 813d580300ee5bb7f1f9603db2404f5af67fd02f49017708d4adb919d4422045 - sha256sums = a0aae072d9ee93d270fec602a3fe65bfc63e0de8814f3af6ddebb8ed223391fc + sha256sums = c8b569f1eafb97d8d03bbaabb9b4d6ed3415f922a05a52bd865942676368f4c5 + sha256sums = 6831e92783367f58061d816ebaae1752c0ea6da7083e40ce0ff220404c3274a1 pkgname = movim-git @@ -3,7 +3,7 @@ _pkgbase='movim' pkgname=movim-git -pkgver=r7210.4498c2be8 +pkgver=r7291.d5631dc9b pkgrel=1 pkgdesc="Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol." arch=('any') @@ -24,7 +24,8 @@ makedepends=('git' 'composer') source=("$_pkgbase::git+https://github.com/movim/movim" movim.env movim.service - sysuser.conf) + sysuser.conf + tmpfiles.conf) install=movim.install backup=("etc/webapps/$_pkgbase/db.inc.php" "etc/default/movim") @@ -43,15 +44,14 @@ build() { package() { cd "$srcdir/$_pkgbase" - install -m755 -d "$pkgdir/usr/share/webapps/$_pkgbase" + # Systemd files + install -m755 -d "$pkgdir/etc/default" + install -Dm640 "$srcdir/movim.env" "$pkgdir/etc/default/$_pkgbase" + install -Dm644 "$srcdir/movim.service" "$pkgdir/usr/lib/systemd/system/movim.service" + install -Dm644 "$srcdir/sysuser.conf" "$pkgdir/usr/lib/sysusers.d/movim.conf" + install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/movim.conf" - # Cache - install -m750 -d "$pkgdir/var/cache/webapps/$_pkgbase/cache"\ - "$pkgdir/var/cache/webapps/$_pkgbase/users" - chown -R movim:movim "$pkgdir/var/cache/webapps/$_pkgbase" - chmod -R u+rwX,g+rwX,o-rwx "$pkgdir/var/cache/webapps/$_pkgbase" - ln -s "/var/cache/webapps/$_pkgbase/cache" "$pkgdir/usr/share/webapps/$_pkgbase" - ln -s "/var/cache/webapps/$_pkgbase/users" "$pkgdir/usr/share/webapps/$_pkgbase" + install -m755 -d "$pkgdir/usr/share/webapps/$_pkgbase" cp -r app database lib locales src theme vendor \ "$pkgdir/usr/share/webapps/$_pkgbase" @@ -62,23 +62,10 @@ package() { # Configuration file install -m750 -d "$pkgdir/etc/webapps/$_pkgbase" install -Dm640 config/db.example.inc.php "$pkgdir/etc/webapps/$_pkgbase/db.inc.php" - chown movim -R "$pkgdir/etc/webapps/$_pkgbase" - chmod -R u+rX,g+rX,o-rwx,u-w,g-w "$pkgdir/etc/webapps/$_pkgbase" - ln -s "/etc/webapps/$_pkgbase" "$pkgdir/usr/share/webapps/$_pkgbase/config" - - # Log files - install -m770 -d "$pkgdir/var/log/webapps/$_pkgbase" - chown -R movim:movim "$pkgdir/var/log/webapps/$_pkgbase" - ln -s "/var/log/webapps/$_pkgbase" "$pkgdir/usr/share/webapps/$_pkgbase/log" - - # Systemd files - install -m755 -d "$pkgdir/etc/default" - install -Dm640 "$srcdir/movim.env" "$pkgdir/etc/default/$_pkgbase" - install -Dm644 "$srcdir/movim.service" "$pkgdir/usr/lib/systemd/system/movim.service" - install -Dm644 "$srcdir/sysuser.conf" "$pkgdir/usr/lib/sysusers.d/movim.conf" } sha256sums=('SKIP' '5dfff91dd4a54f3d3713530e204370a96d37898b670a61123d8cad42f92da306' '813d580300ee5bb7f1f9603db2404f5af67fd02f49017708d4adb919d4422045' - 'a0aae072d9ee93d270fec602a3fe65bfc63e0de8814f3af6ddebb8ed223391fc') + 'c8b569f1eafb97d8d03bbaabb9b4d6ed3415f922a05a52bd865942676368f4c5' + '6831e92783367f58061d816ebaae1752c0ea6da7083e40ce0ff220404c3274a1') diff --git a/sysuser.conf b/sysuser.conf index 79e35a774f9e..ffe03b0eb436 100644 --- a/sysuser.conf +++ b/sysuser.conf @@ -1,3 +1 @@ -g jabber 17 - - -u movim - "Movim XMPP Client" /usr/share/webapp/movim -m movim jabber +u movim - "Movim XMPP Client" /var/lib/webapps/movim diff --git a/tmpfiles.conf b/tmpfiles.conf new file mode 100644 index 000000000000..189fb48f1a0e --- /dev/null +++ b/tmpfiles.conf @@ -0,0 +1,10 @@ +d /etc/webapps/movim 0750 root movim - - +f /etc/webapps/movim/db.inc.php 0640 root movim - - +L /usr/share/webapps/movim/config - - - - /etc/webapps/movim +d %C/webapps/movim/cache 0750 movim root - - +d %C/webapps/movim/users 0750 movim root - - +L /usr/share/webapps/movim/users - - - - %C/webapps/movim/users +L /usr/share/webapps/movim/cache - - - - %C/webapps/movim/cache +d %L/webapps/movim 0750 movim root - - +L /usr/share/webapps/movim/log - - - - %L/webapps/movim +d %S/webapps/movim 0750 movim root - - |