The branch, master has been updated via 6d8c08225949f4c2c3f4fab862cc159bf6dfe582 (commit) from 9faed78b1887eb2bab9402d8eb026f9b222d5f85 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6d8c08225949f4c2c3f4fab862cc159bf6dfe582 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Dec 9 15:38:25 2013 +0100 session DB creation on postinst... * debian/x2goserver.postinst: + Make sure x2godbadmin is evoked from package x2goserver. * debian/x2goserver.init: + Make sure x2godbadmin is evoked from package x2goserver. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++++- debian/libx2go-server-db-perl.postinst | 16 ---------------- debian/x2goserver.postinst | 17 ++++++++++++++++- x2goserver.spec | 2 +- 4 files changed, 21 insertions(+), 19 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 272a424..4cb98da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,12 +44,15 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low x2goserver.conf in new x2goserver-common package. + Move several x2goserver-* package to x2goserver's Recommends field. + Add Reinhard Tartler to Uploaders. - * /debian/x2goserver.init: + * debian/x2goserver.postinst: + + Make sure x2godbadmin is evoked from package x2goserver. + * debian/x2goserver.init: + Rely on $PATH when invoking x2gocleansessions. * Move code in pre/post+inst/rm scripts around (from x2goserver package to libx2go-server-db-perl and x2goserver-common). * x2goclient.spec: + Bring debian/control and x2goclient.spec in sync. + + Make sure x2godbadmin is evoked from package x2goserver. [ Guangzhou Nianguan Electronics Technology Co.Ltd. ] * New upstream version (4.1.0.0): diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst index 147d902..239d5c9 100755 --- a/debian/libx2go-server-db-perl.postinst +++ b/debian/libx2go-server-db-perl.postinst @@ -29,22 +29,6 @@ case "$1" in if ! dpkg-statoverride --list /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper >/dev/null; then dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/libx2go-server-db-sqlite3-wrapper fi - - # setup up SQLite3 database, do nothing it PostgeSQL is already configured - if [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null; then - if [ ! -f /var/lib/x2go/x2go_sessions ]; then - x2godbadmin --createdb - else - # make sure db permissions are set correctly - chown -R root:x2gouser /var/lib/x2go - # egid x2gouser needs write access to the db dir (for temporary db journal file) - chmod 0770 /var/lib/x2go - # ... and to the db file itself, of course - chmod 0660 /var/lib/x2go/x2go_sessions - fi - else - echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone." - fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index b4fe116..2772bcb 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -52,12 +52,27 @@ case "$1" in dpkg-statoverride --add --update root root 0440 /etc/sudoers.d/x2goserver fi - # create /etc/x2go/applications symlink if not already there (as link or as dir) if ! test -e /etc/x2go/applications; then ln -s /usr/share/applications /etc/x2go/applications fi + # setup up SQLite3 database, do nothing if PostgeSQL is already configured + if [ -f /etc/x2go/x2gosql/sql ] && egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null; then + if [ ! -f /var/lib/x2go/x2go_sessions ]; then + x2godbadmin --createdb + else + # make sure db permissions are set correctly + chown -R root:x2gouser /var/lib/x2go + # egid x2gouser needs write access to the db dir (for temporary db journal file) + chmod 0770 /var/lib/x2go + # ... and to the db file itself, of course + chmod 0660 /var/lib/x2go/x2go_sessions + fi + else + echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone." + fi + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/x2goserver.spec b/x2goserver.spec index 7471012..5b0d91b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -294,7 +294,7 @@ getent passwd x2gouser >/dev/null || \ -c "x2go" x2gouser exit 0 -%post -n perl-X2Go-Server-DB +%post # Initialize the session database [ ! -f %{_sharedstatedir}/x2go/x2go_sessions ] && %{_sbindir}/x2godbadmin --createdb || : hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).