[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99.9-7-g0c93005

[X2Go dev team]

The branch, build-baikal has been updated
       via  0c93005f85ed13e74d362e4dc7febff47ad59e81 (commit)
      from  e887a2beb7d4d82f9401ebf219f6e13f38635114 (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:
 debian/changelog           |    3 +++
 debian/x2goserver.postinst |   21 +++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6d568a8..89b9fc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ x2goserver (3.0.99.10-0~x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * New upstream version (3.0.99.10):
     - Replace all string ,,X2Go.' with ,,X2Go''.
+  * x2goserver.postinst script leaves the DB file alone if
+    a DB backend different from SQLite is configured. Thanks
+    to Jochen Schulz for bringing this into awareness.
 
   [ Jochen Schulz ]
   * New upstream version (3.0.99.10):
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index b84f7db..68d83d7 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -57,15 +57,20 @@ case "$1" in
 			# and we need to respect the administrator's choices
 		fi
 
-		if [ ! -f /var/lib/x2go/x2go_sessions ]; then
-			x2godbadmin --createdb
+		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
-			# 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
+			echo "X2Go is configured to use a non-SQLite DB backend, leaving the database alone."
 		fi
 
 		### setgid section for x2gouser (SQLite DB access)


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