[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-97-g1d41ff6

[X2go dev team]

The branch, master has been updated
       via  1d41ff64f488d4aa40c78125914ca840fb020abe (commit)
       via  455ff70389358957807352d47eb78e7605a104e5 (commit)
      from  999a7a65467e1db2de8582570baa47b9e3bf9223 (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 1d41ff64f488d4aa40c78125914ca840fb020abe
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 18 21:58:16 2011 +0200

    x2goserver.postrm fix

commit 455ff70389358957807352d47eb78e7605a104e5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 18 21:57:58 2011 +0200

    Update of INSTALL, UNINSTALL file.

-----------------------------------------------------------------------

Summary of changes:
 INSTALL                  |   26 +++++++++++++++-----------
 UNINSTALL                |    4 ++--
 debian/x2goserver.postrm |    2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

The diff of changes is:
diff --git a/INSTALL b/INSTALL
index a189806..9b2c2e9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,20 +15,25 @@ in base folder of the extracted tarball.
 Set up x2gouser account and its group if they do not exist
 already:
 
- $ addgroup --system x2gousers
+ $ addgroup --system x2gouser
  $ adduser --system --no-create-home \
            --disabled-password --disabled-login \
-           --shell /bin/false --group --home /var/lib/x2go x2gouser
+           --shell /bin/false --group x2gouser --home /var/db/x2go x2gouser
 
-3.) SUID USER
--------------
+3.) SUID GROUP
+--------------
 Configure ownership, permissions and setuid user bit of x2gosqlitewrapper:
 
- $ chown x2gouser:x2gousers /usr/bin/x2gosqlitewrapper
- $ chmod 6755 /usr/bin/x2gosqlitewrapper
+ $ chown root:x2gouser /usr/bin/x2gosqlitewrapper
+ $ chmod 4755 /usr/bin/x2gosqlitewrapper
 
+4.) DATABASE SETUP (SQLite only)
+--------------------------------
 
-4.) INIT SCRIPT
+ $ x2godbadmin --createdb
+
+
+5.) INIT SCRIPT
 ---------------
 Create a simple init script that starts $PREFIX/sbin/x2gocleansessions on system start
 (runlevel 2-3-4-5). 
@@ -38,16 +43,15 @@ Alternatively, you can add a single line to /etc/rc.local:
 /usr/local/sbin/x2gocleansessions &
 
 
-5.) OPTIONAL: PostgreSQL setup
+6.) OPTIONAL: PostgreSQL setup
 ------------------------------
 This last step is optional and is only needed for a setup of x2goserver
 with PostgreSQL as database backend...
 
 When using PostgreSQL the following steps are necessary:
 
- $ chmod 700 /etc/x2go/x2gosql/passwords
+ $ chmod 0750 /etc/x2go/x2gosql/passwords
  $ touch /etc/x2go/x2gosql/passwords/pgadmin
- $ chmod 600 /etc/x2go/x2gosql/passwords/pgadmin
- $ x2godbadmin --createdb
+ $ chmod 0640 /etc/x2go/x2gosql/passwords/pgadmin
 
 
diff --git a/UNINSTALL b/UNINSTALL
index e75d6fc..e5bc0ea 100644
--- a/UNINSTALL
+++ b/UNINSTALL
@@ -3,7 +3,7 @@ TARBALL UNINSTALL OF x2goserver
 
 1.) Remove SQLite database
 --------------------------
- $ rm -vf /var/lib/x2go/x2go_sessions
+ $ rm -vf /var/db/x2go/x2go_sessions
 
 
 2.) Remove PostgreSQL passwords
@@ -15,7 +15,7 @@ TARBALL UNINSTALL OF x2goserver
 ----------------------------------------------
 
  $ deluser x2gouser
- $ delgroup x2gousers
+ $ delgroup x2gouser
 
 
 4.) Run Makefile's uninstall
diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm
index 4522b04..ba45ecc 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/lib/x2go/x2go_sessions
+		rm -vf /var/db/x2go/x2go_sessions
 		rm -vf /etc/x2go/x2gosql/passwords/pgadmin
 		getent passwd x2gouser >/dev/null && deluser x2gouser
 		getent group x2gousers >/dev/null && delgroup x2gousers


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