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

X2go dev team git-admin at x2go.org
Sun Aug 14 21:16:25 CEST 2011


The branch, master has been updated
       via  4845ffbb364a0f1f04f4a5337c5b977c450f38c6 (commit)
       via  fd778562a808b62e54f4e808d55b7f0202b2c9fc (commit)
      from  366ef9d7526fd4739bbd368bc964f9acfb504e7d (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 4845ffbb364a0f1f04f4a5337c5b977c450f38c6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 14 21:15:39 2011 +0200

    Remove Debianisms from INSTALL howto.

commit fd778562a808b62e54f4e808d55b7f0202b2c9fc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 2 14:50:09 2011 +0200

    INSTALL howto update

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

Summary of changes:
 INSTALL          |   42 +++++++++++++++++++++++-------------------
 debian/changelog |    1 +
 2 files changed, 24 insertions(+), 19 deletions(-)

The diff of changes is:
diff --git a/INSTALL b/INSTALL
index bcfde84..46a7bf4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,10 +6,9 @@ TARBALL INSTALLATION OF x2goserver
 Set up x2gouser account and its group if they do not exist
 already:
 
- $ addgroup --system x2gouser
- $ adduser --system --no-create-home \
-           --disabled-password --disabled-login \
-           --shell /bin/false --group --home /var/lib/x2go x2gouser
+ $ groupadd --system x2gouser
+ $ useradd --system --no-create-home \
+           --shell /bin/false --home /var/lib/x2go x2gouser
 
 2.) INSTALL x2goserver FILES
 -----------------------------
@@ -28,15 +27,10 @@ Configure ownership, permissions and setuid user bit of x2gosqlitewrapper:
   run, leaving this here for documentation only.
 
  $ chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
- $ chmod 2755 /usr/bin/x2gosqlitewrapper
-
-4.) DATABASE SETUP (SQLite only)
---------------------------------
-
- $ x2godbadmin --createdb
+ $ chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
 
 
-5.) INIT SCRIPT
+4.) INIT SCRIPT
 ---------------
 Create a simple init script that starts $PREFIX/sbin/x2gocleansessions on system start
 (runlevel 2-3-4-5). 
@@ -45,16 +39,26 @@ Alternatively, you can add a single line to /etc/rc.local:
 
 /usr/local/sbin/x2gocleansessions &
 
+4.) DATABASE SETUP (SQLite only)
+--------------------------------
+
+ $ x2godbadmin --createdb
+
+
+4a.) DEFAULT: SQLite setup
+--------------------------
+This variant is the default X2go database setup. The X2go database keeps track of
+running/suspended/finished X2go sessions, mounted devices, etc. If you use SQLite
+as DB backend, X2go will run on one single server.
 
-6.) OPTIONAL: PostgreSQL setup
-------------------------------
-This last step is optional and is only needed for a setup of x2goserver
-with PostgreSQL as database backend...
+For multi-X2goServer support use the PostgreSQL setup variant of X2go server. All files
+should be present for this setup. If not, please report it as a bug.
 
-When using PostgreSQL the following steps are necessary:
 
- $ chmod 0750 /etc/x2go/x2gosql/passwords
- $ touch /etc/x2go/x2gosql/passwords/pgadmin
- $ chmod 0640 /etc/x2go/x2gosql/passwords/pgadmin
+4b.) ALTERNATIVE: PostgreSQL setup
+----------------------------------
+This variant is for a setup of x2goserver that uses a PostgreSQL database backend...
 
+The exact installation of x2goserver with PostgreSQL support is described here:
+http://wiki.x2go.org/adding_x2go_server_postgresql_support
 
diff --git a/debian/changelog b/debian/changelog
index 32f517f..8ba0dce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     in /usr/bin find these scripts.
   * Add x2gobasepath script to reliably detect x2goserver install path.
   * Add man page for x2gobasepath.
+  * Remove Debianisms from INSTALL howto.
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.


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




More information about the x2go-commits mailing list