[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-114-gc8c54cd

[X2Go dev team]

The branch, build-baikal has been updated
       via  c8c54cd38251c843d97e13776b47b75e51e6cb1f (commit)
      from  dc8bfbe86594b7fb9185dfa1a92f6c976d1df45a (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 INSTALL                    |    2 +-
 UNINSTALL                  |    2 +-
 debian/changelog           |    1 +
 debian/x2goserver.postinst |   12 ++++++------
 debian/x2goserver.postrm   |    2 +-
 debian/x2goserver.preinst  |    4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)

The diff of changes is:
diff --git a/INSTALL b/INSTALL
index 9b2c2e9..3bb1ea1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,7 @@ already:
  $ addgroup --system x2gouser
  $ adduser --system --no-create-home \
            --disabled-password --disabled-login \
-           --shell /bin/false --group x2gouser --home /var/db/x2go x2gouser
+           --shell /bin/false --group x2gouser --home /var/lib/x2go x2gouser
 
 3.) SUID GROUP
 --------------
diff --git a/UNINSTALL b/UNINSTALL
index e5bc0ea..aac101c 100644
--- a/UNINSTALL
+++ b/UNINSTALL
@@ -3,7 +3,7 @@ TARBALL UNINSTALL OF x2goserver
 
 1.) Remove SQLite database
 --------------------------
- $ rm -vf /var/db/x2go/x2go_sessions
+ $ rm -vf /var/lib/x2go/x2go_sessions
 
 
 2.) Remove PostgreSQL passwords
diff --git a/debian/changelog b/debian/changelog
index 7b754d8..3120baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     (instead of Conflicts).
   * Switch to setgid instead of setuid for SQLite wrapper.
   * Tab'ified postinst/postrm scripts.
+  * Store SQLite db in /var/lib/x2go to comply to latest FHS.
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 2049c0f..77730bd 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -35,24 +35,24 @@ case "$1" in
 			echo "Creating x2gouser user." >&2
 			adduser --system --no-create-home \
 			        --disabled-password --disabled-login \
-			        --shell /bin/false --group --home /var/db/x2go x2gouser
+			        --shell /bin/false --group --home /var/lib/x2go x2gouser
 		else
 			echo "User x2gouser already exists." >&2
 			# make sure all settings are appropriate
 			id -g --name "x2gouser" | grep "x2gousers" >/dev/null && usermod --gid x2gouser x2gouser
-			usermod --home /var/db/x2go x2gouser
+			usermod --home /var/lib/x2go x2gouser
 			usermod --shell /bin/false x2gouser
 		fi
 
-		if [ ! -f /var/db/x2go/x2go_sessions ]; then
+		if [ ! -f /var/lib/x2go/x2go_sessions ]; then
 			x2godbadmin --createdb
 		else
 			# make sure db permissions are set correctly
-			chown root:x2gouser /var/db/x2go -Rf
+			chown root:x2gouser /var/lib/x2go -Rf
 			# egid x2gouser needs write access to the db dir (for temporary db journal file)
-			chmod 0770 /var/db/x2go
+			chmod 0770 /var/lib/x2go
 			# ... and to the db file itself, of course
-			chmod 0660 /var/db/x2go/x2go_sessions
+			chmod 0660 /var/lib/x2go/x2go_sessions
 		fi
 
 		# we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser.
diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm
index ba45ecc..4522b04 100755
--- a/debian/x2goserver.postrm
+++ b/debian/x2goserver.postrm
@@ -20,7 +20,7 @@ case "$1" in
 	purge)
 		dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper || true
 		echo "Removing x2go session database" >&2
-		rm -vf /var/db/x2go/x2go_sessions
+		rm -vf /var/lib/x2go/x2go_sessions
 		rm -vf /etc/x2go/x2gosql/passwords/pgadmin
 		getent passwd x2gouser >/dev/null && deluser x2gouser
 		getent group x2gousers >/dev/null && delgroup x2gousers
diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst
index 2368407..a0422ed 100755
--- a/debian/x2goserver.preinst
+++ b/debian/x2goserver.preinst
@@ -21,8 +21,8 @@ set -e
 case "$1" in
 	install|upgrade)
 		# cleanup old x2goserver installations
-		test -f /var/lib/x2go/x2go_sessions && rm /var/lib/x2go/x2go_sessions
-		test -d /var/lib/x2go && rm -Rfv /var/lib/x2go/
+		test -f /var/db/x2go/x2go_sessions && rm /var/db/x2go/x2go_sessions
+		test -d /var/db/x2go && rm -Rfv /var/db/x2go/
 		getent group x2gousers >/dev/null && { echo; echo "*** WARNING: found obsolete group ,,x2gousers'', please remove manually!!!"; echo; }
 		;;
 	abort-upgrade)


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).