[arch-commits] Commit in x2goserver/repos (12 files)

Andreas Radke andyrtr at nymeria.archlinux.org
Mon Jul 29 13:47:21 UTC 2013


    Date: Monday, July 29, 2013 @ 15:47:21
  Author: andyrtr
Revision: 191716

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  x2goserver/repos/extra-i686/PKGBUILD
    (from rev 191715, x2goserver/trunk/PKGBUILD)
  x2goserver/repos/extra-i686/x2goserver.install
    (from rev 191715, x2goserver/trunk/x2goserver.install)
  x2goserver/repos/extra-i686/x2goserver.service
    (from rev 191715, x2goserver/trunk/x2goserver.service)
  x2goserver/repos/extra-x86_64/PKGBUILD
    (from rev 191715, x2goserver/trunk/PKGBUILD)
  x2goserver/repos/extra-x86_64/x2goserver.install
    (from rev 191715, x2goserver/trunk/x2goserver.install)
  x2goserver/repos/extra-x86_64/x2goserver.service
    (from rev 191715, x2goserver/trunk/x2goserver.service)
Deleted:
  x2goserver/repos/extra-i686/PKGBUILD
  x2goserver/repos/extra-i686/x2goserver.install
  x2goserver/repos/extra-i686/x2goserver.service
  x2goserver/repos/extra-x86_64/PKGBUILD
  x2goserver/repos/extra-x86_64/x2goserver.install
  x2goserver/repos/extra-x86_64/x2goserver.service

---------------------------------+
 /PKGBUILD                       |  126 ++++++++++++++++++++++++++++++++++++++
 /x2goserver.install             |  122 ++++++++++++++++++++++++++++++++++++
 /x2goserver.service             |   20 ++++++
 extra-i686/PKGBUILD             |   63 -------------------
 extra-i686/x2goserver.install   |   61 ------------------
 extra-i686/x2goserver.service   |   10 ---
 extra-x86_64/PKGBUILD           |   63 -------------------
 extra-x86_64/x2goserver.install |   61 ------------------
 extra-x86_64/x2goserver.service |   10 ---
 9 files changed, 268 insertions(+), 268 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-07-29 13:46:52 UTC (rev 191715)
+++ extra-i686/PKGBUILD	2013-07-29 13:47:21 UTC (rev 191716)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-
-# Contributor: Gerhard Brauer <gerbra at archlinux.de>
-# Contributor: Richard Murri <admin at richardmurri.com>
-# Contributor: Markus Opitz <mastero23 at gmail dot com>
-# Contributor: Milan Knížek <knizek at volny.cz>
-
-pkgname=x2goserver
-pkgver=4.0.1.5
-pkgrel=1
-pkgdesc="Open source terminal server"
-arch=('i686' 'x86_64')
-url="http://www.x2go.org/"
-license=('GPL')
-depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth')
-makedepends=('man2html')
-#optdepends=('cups-x2go: printing support')
-options=('emptydirs')
-install=x2goserver.install
-backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        x2goserver.service)
-md5sums=('2bcd0f96d38951f96c08a5d92c21aa41'
-         'f76081c01e40b6206895d194dc949707')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # -r option does not exist in Arch linux
-  # (However, html man pages do not get installed anyway...)
-  for Makefile in $(find . -type f -name Makefile); do
-    sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
-    sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
-  done
-
-  # fix some Makefile permission options
-  for Makefile in $(find . -type f -name Makefile); do
-    sed -i "s:-o root -g root ::g" $Makefile
-  done
-
-  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
-
-  # systemd service file - only runs x2gocleansessions
-  install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
-  
-  # X2go homedir + printing spool dir
-  install -dm 770 $pkgdir/var/lib/x2go
-  install -dm 770 $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
-
-  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN"
-  install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN"
-}

Copied: x2goserver/repos/extra-i686/PKGBUILD (from rev 191715, x2goserver/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-07-29 13:47:21 UTC (rev 191716)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+
+# Contributor: Gerhard Brauer <gerbra at archlinux.de>
+# Contributor: Richard Murri <admin at richardmurri.com>
+# Contributor: Markus Opitz <mastero23 at gmail dot com>
+# Contributor: Milan Knížek <knizek at volny.cz>
+
+pkgname=x2goserver
+pkgver=4.0.1.6
+pkgrel=1
+pkgdesc="Open source terminal server"
+arch=('i686' 'x86_64')
+url="http://www.x2go.org/"
+license=('GPL')
+depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth')
+makedepends=('man2html')
+#optdepends=('cups-x2go: printing support')
+options=('emptydirs')
+install=x2goserver.install
+backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        x2goserver.service)
+md5sums=('61f2248fb16bc035f92b9588ab19c35e'
+         'f76081c01e40b6206895d194dc949707')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # -r option does not exist in Arch linux
+  # (However, html man pages do not get installed anyway...)
+  for Makefile in $(find . -type f -name Makefile); do
+    sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
+    sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
+  done
+
+  # fix some Makefile permission options
+  for Makefile in $(find . -type f -name Makefile); do
+    sed -i "s:-o root -g root ::g" $Makefile
+  done
+
+  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
+
+  # systemd service file - only runs x2gocleansessions
+  install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
+  
+  # X2go homedir + printing spool dir
+  install -dm 770 $pkgdir/var/lib/x2go
+  install -dm 770 $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
+
+  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN"
+  install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN"
+}

Deleted: extra-i686/x2goserver.install
===================================================================
--- extra-i686/x2goserver.install	2013-07-29 13:46:52 UTC (rev 191715)
+++ extra-i686/x2goserver.install	2013-07-29 13:47:21 UTC (rev 191716)
@@ -1,61 +0,0 @@
-pre_install() {
-  cat << 'EOM'
-  ==> Use the following command to setup sqlite database:
-  ==> x2godbadmin --createdb
-EOM
-}
-
-
-post_install() {
-
-  # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values
-
-  # x2gouser
-  if grep -q "^x2gouser:" /etc/group &> /dev/null ; then
-    groupmod -g 111 -n x2gouser x2gouser &> /dev/null
-  else
-    groupadd -g 111 x2gouser &> /dev/null
-  fi
-
-  if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then
-    usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null
-  else
-    useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
-  fi 
-
-  # x2goprint
-  if grep -q "^x2goprint:" /etc/group &> /dev/null ; then
-    groupmod -g 112 -n x2goprint x2goprint &> /dev/null
-  else
-    groupadd -g 112 x2goprint &> /dev/null
-  fi
-
-  if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then
-    usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null
-  else
-    useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
-  fi
-  
-  # fix permissions - see INSTALL file
-  chown -R x2goprint:x2goprint /var/spool/x2go
-  chmod 0770 /var/spool/x2go
-    
-  chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
-  chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
-  
-  chown root:x2goprint /usr/bin/x2goprint
-  chmod 2755 /usr/bin/x2goprint
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-    userdel x2gouser &> /dev/null
-    userdel x2goprint &> /dev/null
-    groupdel x2gouser &> /dev/null || /bin/true
-    groupdel x2goprint &> /dev/null || /bin/true
-    rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
-    rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
-}

Copied: x2goserver/repos/extra-i686/x2goserver.install (from rev 191715, x2goserver/trunk/x2goserver.install)
===================================================================
--- extra-i686/x2goserver.install	                        (rev 0)
+++ extra-i686/x2goserver.install	2013-07-29 13:47:21 UTC (rev 191716)
@@ -0,0 +1,61 @@
+pre_install() {
+  cat << 'EOM'
+  ==> Use the following command to setup sqlite database:
+  ==> x2godbadmin --createdb
+EOM
+}
+
+
+post_install() {
+
+  # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values
+
+  # x2gouser
+  if grep -q "^x2gouser:" /etc/group &> /dev/null ; then
+    groupmod -g 111 -n x2gouser x2gouser &> /dev/null
+  else
+    groupadd -g 111 x2gouser &> /dev/null
+  fi
+
+  if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null
+  else
+    useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
+  fi 
+
+  # x2goprint
+  if grep -q "^x2goprint:" /etc/group &> /dev/null ; then
+    groupmod -g 112 -n x2goprint x2goprint &> /dev/null
+  else
+    groupadd -g 112 x2goprint &> /dev/null
+  fi
+
+  if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null
+  else
+    useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
+  fi
+  
+  # fix permissions - see INSTALL file
+  chown -R x2goprint:x2goprint /var/spool/x2go
+  chmod 0770 /var/spool/x2go
+    
+  chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
+  chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
+  
+  chown root:x2goprint /usr/bin/x2goprint
+  chmod 2755 /usr/bin/x2goprint
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+    userdel x2gouser &> /dev/null
+    userdel x2goprint &> /dev/null
+    groupdel x2gouser &> /dev/null || /bin/true
+    groupdel x2goprint &> /dev/null || /bin/true
+    rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
+    rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
+}

Deleted: extra-i686/x2goserver.service
===================================================================
--- extra-i686/x2goserver.service	2013-07-29 13:46:52 UTC (rev 191715)
+++ extra-i686/x2goserver.service	2013-07-29 13:47:21 UTC (rev 191716)
@@ -1,10 +0,0 @@
-[Unit]
-Description=x2go - remote desktop server
-After=syslog.target network.target
-
-[Service]
-ExecStart=/usr/bin/x2gocleansessions
-PIDFile=/run/x2goserver.pid
-
-[Install]
-WantedBy=multi-user.target

Copied: x2goserver/repos/extra-i686/x2goserver.service (from rev 191715, x2goserver/trunk/x2goserver.service)
===================================================================
--- extra-i686/x2goserver.service	                        (rev 0)
+++ extra-i686/x2goserver.service	2013-07-29 13:47:21 UTC (rev 191716)
@@ -0,0 +1,10 @@
+[Unit]
+Description=x2go - remote desktop server
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/x2gocleansessions
+PIDFile=/run/x2goserver.pid
+
+[Install]
+WantedBy=multi-user.target

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-07-29 13:46:52 UTC (rev 191715)
+++ extra-x86_64/PKGBUILD	2013-07-29 13:47:21 UTC (rev 191716)
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-
-# Contributor: Gerhard Brauer <gerbra at archlinux.de>
-# Contributor: Richard Murri <admin at richardmurri.com>
-# Contributor: Markus Opitz <mastero23 at gmail dot com>
-# Contributor: Milan Knížek <knizek at volny.cz>
-
-pkgname=x2goserver
-pkgver=4.0.1.5
-pkgrel=1
-pkgdesc="Open source terminal server"
-arch=('i686' 'x86_64')
-url="http://www.x2go.org/"
-license=('GPL')
-depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth')
-makedepends=('man2html')
-#optdepends=('cups-x2go: printing support')
-options=('emptydirs')
-install=x2goserver.install
-backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        x2goserver.service)
-md5sums=('2bcd0f96d38951f96c08a5d92c21aa41'
-         'f76081c01e40b6206895d194dc949707')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # -r option does not exist in Arch linux
-  # (However, html man pages do not get installed anyway...)
-  for Makefile in $(find . -type f -name Makefile); do
-    sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
-    sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
-  done
-
-  # fix some Makefile permission options
-  for Makefile in $(find . -type f -name Makefile); do
-    sed -i "s:-o root -g root ::g" $Makefile
-  done
-
-  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
-
-  # systemd service file - only runs x2gocleansessions
-  install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
-  
-  # X2go homedir + printing spool dir
-  install -dm 770 $pkgdir/var/lib/x2go
-  install -dm 770 $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
-
-  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN"
-  install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN"
-}

Copied: x2goserver/repos/extra-x86_64/PKGBUILD (from rev 191715, x2goserver/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-07-29 13:47:21 UTC (rev 191716)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+
+# Contributor: Gerhard Brauer <gerbra at archlinux.de>
+# Contributor: Richard Murri <admin at richardmurri.com>
+# Contributor: Markus Opitz <mastero23 at gmail dot com>
+# Contributor: Milan Knížek <knizek at volny.cz>
+
+pkgname=x2goserver
+pkgver=4.0.1.6
+pkgrel=1
+pkgdesc="Open source terminal server"
+arch=('i686' 'x86_64')
+url="http://www.x2go.org/"
+license=('GPL')
+depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth')
+makedepends=('man2html')
+#optdepends=('cups-x2go: printing support')
+options=('emptydirs')
+install=x2goserver.install
+backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        x2goserver.service)
+md5sums=('61f2248fb16bc035f92b9588ab19c35e'
+         'f76081c01e40b6206895d194dc949707')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # -r option does not exist in Arch linux
+  # (However, html man pages do not get installed anyway...)
+  for Makefile in $(find . -type f -name Makefile); do
+    sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
+    sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
+  done
+
+  # fix some Makefile permission options
+  for Makefile in $(find . -type f -name Makefile); do
+    sed -i "s:-o root -g root ::g" $Makefile
+  done
+
+  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
+
+  # systemd service file - only runs x2gocleansessions
+  install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
+  
+  # X2go homedir + printing spool dir
+  install -dm 770 $pkgdir/var/lib/x2go
+  install -dm 770 $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
+
+  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN"
+  install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN"
+}

Deleted: extra-x86_64/x2goserver.install
===================================================================
--- extra-x86_64/x2goserver.install	2013-07-29 13:46:52 UTC (rev 191715)
+++ extra-x86_64/x2goserver.install	2013-07-29 13:47:21 UTC (rev 191716)
@@ -1,61 +0,0 @@
-pre_install() {
-  cat << 'EOM'
-  ==> Use the following command to setup sqlite database:
-  ==> x2godbadmin --createdb
-EOM
-}
-
-
-post_install() {
-
-  # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values
-
-  # x2gouser
-  if grep -q "^x2gouser:" /etc/group &> /dev/null ; then
-    groupmod -g 111 -n x2gouser x2gouser &> /dev/null
-  else
-    groupadd -g 111 x2gouser &> /dev/null
-  fi
-
-  if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then
-    usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null
-  else
-    useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
-  fi 
-
-  # x2goprint
-  if grep -q "^x2goprint:" /etc/group &> /dev/null ; then
-    groupmod -g 112 -n x2goprint x2goprint &> /dev/null
-  else
-    groupadd -g 112 x2goprint &> /dev/null
-  fi
-
-  if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then
-    usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null
-  else
-    useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
-  fi
-  
-  # fix permissions - see INSTALL file
-  chown -R x2goprint:x2goprint /var/spool/x2go
-  chmod 0770 /var/spool/x2go
-    
-  chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
-  chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
-  
-  chown root:x2goprint /usr/bin/x2goprint
-  chmod 2755 /usr/bin/x2goprint
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-    userdel x2gouser &> /dev/null
-    userdel x2goprint &> /dev/null
-    groupdel x2gouser &> /dev/null || /bin/true
-    groupdel x2goprint &> /dev/null || /bin/true
-    rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
-    rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
-}

Copied: x2goserver/repos/extra-x86_64/x2goserver.install (from rev 191715, x2goserver/trunk/x2goserver.install)
===================================================================
--- extra-x86_64/x2goserver.install	                        (rev 0)
+++ extra-x86_64/x2goserver.install	2013-07-29 13:47:21 UTC (rev 191716)
@@ -0,0 +1,61 @@
+pre_install() {
+  cat << 'EOM'
+  ==> Use the following command to setup sqlite database:
+  ==> x2godbadmin --createdb
+EOM
+}
+
+
+post_install() {
+
+  # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values
+
+  # x2gouser
+  if grep -q "^x2gouser:" /etc/group &> /dev/null ; then
+    groupmod -g 111 -n x2gouser x2gouser &> /dev/null
+  else
+    groupadd -g 111 x2gouser &> /dev/null
+  fi
+
+  if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null
+  else
+    useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
+  fi 
+
+  # x2goprint
+  if grep -q "^x2goprint:" /etc/group &> /dev/null ; then
+    groupmod -g 112 -n x2goprint x2goprint &> /dev/null
+  else
+    groupadd -g 112 x2goprint &> /dev/null
+  fi
+
+  if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null
+  else
+    useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
+  fi
+  
+  # fix permissions - see INSTALL file
+  chown -R x2goprint:x2goprint /var/spool/x2go
+  chmod 0770 /var/spool/x2go
+    
+  chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
+  chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
+  
+  chown root:x2goprint /usr/bin/x2goprint
+  chmod 2755 /usr/bin/x2goprint
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+    userdel x2gouser &> /dev/null
+    userdel x2goprint &> /dev/null
+    groupdel x2gouser &> /dev/null || /bin/true
+    groupdel x2goprint &> /dev/null || /bin/true
+    rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
+    rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
+}

Deleted: extra-x86_64/x2goserver.service
===================================================================
--- extra-x86_64/x2goserver.service	2013-07-29 13:46:52 UTC (rev 191715)
+++ extra-x86_64/x2goserver.service	2013-07-29 13:47:21 UTC (rev 191716)
@@ -1,10 +0,0 @@
-[Unit]
-Description=x2go - remote desktop server
-After=syslog.target network.target
-
-[Service]
-ExecStart=/usr/bin/x2gocleansessions
-PIDFile=/run/x2goserver.pid
-
-[Install]
-WantedBy=multi-user.target

Copied: x2goserver/repos/extra-x86_64/x2goserver.service (from rev 191715, x2goserver/trunk/x2goserver.service)
===================================================================
--- extra-x86_64/x2goserver.service	                        (rev 0)
+++ extra-x86_64/x2goserver.service	2013-07-29 13:47:21 UTC (rev 191716)
@@ -0,0 +1,10 @@
+[Unit]
+Description=x2go - remote desktop server
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/bin/x2gocleansessions
+PIDFile=/run/x2goserver.pid
+
+[Install]
+WantedBy=multi-user.target




More information about the arch-commits mailing list