[arch-commits] Commit in x2goserver/trunk (4 files)

[Andreas Radke]

    Date: Monday, December 18, 2017 @ 09:56:16
  Author: andyrtr
Revision: 313288

upgpkg: x2goserver 4.0.1.22-2

use systemd sysusers.d/tmpfiles.d

Added:
  x2goserver/trunk/sysusers.d
  x2goserver/trunk/tmpfiles.d
Modified:
  x2goserver/trunk/PKGBUILD
  x2goserver/trunk/x2goserver.install

--------------------+
 PKGBUILD           |   22 ++++++++++------------
 sysusers.d         |    2 ++
 tmpfiles.d         |    2 ++
 x2goserver.install |   11 -----------
 4 files changed, 14 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-18 09:45:44 UTC (rev 313287)
+++ PKGBUILD	2017-12-18 09:56:16 UTC (rev 313288)
@@ -8,7 +8,7 @@
 
 pkgname=x2goserver
 pkgver=4.0.1.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology"
 arch=('x86_64')
 url="http://www.x2go.org/"
@@ -69,9 +69,13 @@
 install=x2goserver.install
 backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
 # no https due to invalid certificate
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+       tmpfiles.d
+       sysusers.d)
 sha256sums=('bb7bd9abadfb6201f39068731a955df5183f4d447c42fc0720777f32acafbfbc'
-            'SKIP')
+            'SKIP'
+            '548d48925171aeca198494236cfba7232921a25a1c4c81f5d004a734d83d1350'
+            '04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator <git-admin at x2go.org>
 
 build() {
@@ -95,20 +99,14 @@
 }
 
 package() {
-  
-  # system user/group x2gouser - 111
-  # system user/group x2goprint - 112
-  
   cd "${srcdir}/${pkgname}-${pkgver}"
   make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
 
-  # systemd service file 
+  # systemd files
   install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
+  install -Dm644 ../tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/x2goserver.conf
+  install -Dm644 ../sysusers.d ${pkgdir}/usr/lib/sysusers.d/x2goserver.conf
   
-  # X2go homedir + printing spool dir
-  install -dm 0770 --owner=111 --group=111 $pkgdir/var/lib/x2go
-  install -dm 0770 --owner=112 --group=112 $pkgdir/var/spool/x2go
-  
   # load fuse module at system start
   install -dm755 $pkgdir/usr/lib/modules-load.d
   echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf

Added: sysusers.d
===================================================================
--- sysusers.d	                        (rev 0)
+++ sysusers.d	2017-12-18 09:56:16 UTC (rev 313288)
@@ -0,0 +1,2 @@
+u x2gouser  111 "x2gouser"  /var/lib/x2go
+u x2goprint 112 "x2goprint" /var/spool/x2go

Added: tmpfiles.d
===================================================================
--- tmpfiles.d	                        (rev 0)
+++ tmpfiles.d	2017-12-18 09:56:16 UTC (rev 313288)
@@ -0,0 +1,2 @@
+d /var/lib/x2go   0770 x2gouser  x2gouser
+d /var/spool/x2go 0770 x2goprint x2goprint

Modified: x2goserver.install
===================================================================
--- x2goserver.install	2017-12-18 09:45:44 UTC (rev 313287)
+++ x2goserver.install	2017-12-18 09:56:16 UTC (rev 313288)
@@ -3,15 +3,4 @@
   ==> Use the following command to setup sqlite database:
   ==> x2godbadmin --createdb
 EOM
-
-  getent group x2gouser &> /dev/null   || groupadd -g 111 x2gouser &> /dev/null
-  getent group x2goprint &> /dev/null  || groupadd -g 112 x2goprint &> /dev/null
-  getent passwd x2gouser &> /dev/null   || useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
-  getent passwd x2goprint &> /dev/null  || useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
-
 }
-
-post_remove() {
-  rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
-  rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
-}