[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-222-g05a7500

X2Go dev team git-admin at x2go.org
Fri Jan 3 20:51:49 CET 2014


The branch, build-baikal has been updated
       via  05a7500abbff09c469962b0518d29c400aed4756 (commit)
      from  3213e219263cd50384e95330a35dda6b7cf9f861 (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:
 X2Go/Log.pm                     |    6 ++----
 X2Go/Server/DB.pm               |    7 +++----
 X2Go/Server/DB/PostgreSQL.pm    |    7 +++----
 X2Go/Server/DB/SQLite3.pm       |    3 +--
 debian/changelog                |    1 +
 x2goserver/bin/x2gomountdirs    |   10 +++++-----
 x2goserver/bin/x2gosessionlimit |    7 +++----
 x2goserver/sbin/x2godbadmin     |    7 +++----
 8 files changed, 21 insertions(+), 27 deletions(-)

The diff of changes is:
diff --git a/X2Go/Log.pm b/X2Go/Log.pm
index 12ee7b2..e4b9281 100644
--- a/X2Go/Log.pm
+++ b/X2Go/Log.pm
@@ -33,15 +33,13 @@ X2Go::Log Perl package for X2Go components.
 =cut
 
 use strict;
-use Config::Simple;
 use Sys::Syslog qw( :standard :macros );
+use X2Go::Config qw( get_config );
 
 use base 'Exporter';
 our @EXPORT = ( 'loglevel' );
 
-my $Config = new Config::Simple(syntax=>'ini');
-$Config->read('/etc/x2go/x2goserver.conf' );
-
+my $Config = get_config();
 my $strloglevel = $Config->param("log.loglevel");
 
 sub loglevel {
diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm
index 3216317..0f638a2 100644
--- a/X2Go/Server/DB.pm
+++ b/X2Go/Server/DB.pm
@@ -31,22 +31,21 @@ X2Go::Server::DB Perl package for X2Go::Server.
 =cut
 
 use strict;
-use Config::Simple;
 use DBI;
 use POSIX;
 use Sys::Syslog qw( :standard :macros );
 
-use X2Go::Log qw(loglevel);
+use X2Go::Config qw( get_sqlconfig );
+use X2Go::Log qw( loglevel );
 use X2Go::Server::DB::PostgreSQL;
 
 setlogmask( LOG_UPTO(loglevel()) );
 
 my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid(getuid());
 
-my $Config = new Config::Simple(syntax=>'ini');
+my $Config = get_sqlconfig();
 my $x2go_lib_path=`x2gopath libexec`;
 
-$Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql";
 my $backend=$Config->param("backend");
 
 my $host;
diff --git a/X2Go/Server/DB/PostgreSQL.pm b/X2Go/Server/DB/PostgreSQL.pm
index 313fd98..1bad04a 100644
--- a/X2Go/Server/DB/PostgreSQL.pm
+++ b/X2Go/Server/DB/PostgreSQL.pm
@@ -31,12 +31,12 @@ X2Go::Server::DB::PostgreSQL Perl package for X2Go::Server.
 =cut
 
 use strict;
-use Config::Simple;
 use DBI;
 use POSIX;
 use Sys::Syslog qw( :standard :macros );
 
-use X2Go::Log qw(loglevel);
+use X2Go::Log qw( loglevel );
+use X2Go::Config qw( get_sqlconfig );
 
 setlogmask( LOG_UPTO(loglevel()) );
 
@@ -60,10 +60,9 @@ sub init_db
 {
 	if ( ! ( $dbuser and $dbpass ) )
 	{
-		my $Config = new Config::Simple(syntax=>'ini');
+		my $Config = get_sqlconfig;
 		my $x2go_lib_path=`x2gopath libexec`;
 
-		$Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql";
 		my $backend=$Config->param("backend");
 		if ( $backend ne "postgres" )
 		{
diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm
index 38665f4..21741b8 100644
--- a/X2Go/Server/DB/SQLite3.pm
+++ b/X2Go/Server/DB/SQLite3.pm
@@ -40,9 +40,8 @@ use POSIX;
 ####       via a setgid <group> wrapper (where <group> is group ,,x2gouser'').
 ####       It is intended that the code in this package cannot do system() calls.
 
-use Config::Simple;
 use Sys::Syslog qw( :standard :macros );
-use X2Go::Log qw(loglevel);
+use X2Go::Log qw( loglevel );
 
 openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(loglevel()) );
diff --git a/debian/changelog b/debian/changelog
index c3bbc75..6401701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
       SQLite3 DB wrapper script.
     - Add X2Go Server feature X2GO_LIST_SHADOWSESSIONS.
     - Fix build-arch target in x2goserver/Makefile. (Fixes: #121).
+    - Load config files from a Perl package (X2Go::Config).
   * /debian/control:
     + Package X2Go::Log in separate package: libx2go-log-perl.
     + Package X2Go::Server::DB in separate package: libx2go-server-db-perl.
diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs
index 0cb31c3..9e8d8f3 100755
--- a/x2goserver/bin/x2gomountdirs
+++ b/x2goserver/bin/x2gomountdirs
@@ -24,9 +24,10 @@ use strict;
 use Sys::Syslog qw( :standard :macros );
 use File::BaseDir qw(xdg_config_home);
 
-use X2Go::Server::DB qw(db_insertmount db_deletemount);
-use X2Go::Utils qw(source_environment);
-use X2Go::Log qw(loglevel);
+use X2Go::Config qw( get_config );
+use X2Go::Server::DB qw( db_insertmount db_deletemount );
+use X2Go::Utils qw( source_environment );
+use X2Go::Log qw( loglevel );
 
 openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(loglevel()) );
@@ -247,8 +248,7 @@ for (my $i=0;$i<@dirs;$i++)
 	if (db_insertmount( $session, $mntpath, $host))
 	{
 
-		my $Config = new Config::Simple(syntax=>'ini');
-		$Config->read('/etc/x2go/x2goserver.conf' );
+		my $Config = get_config();
 		my $umask=$Config->param("security.umask");
 		my $umaskstr="";
 
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 8eb1cae..5ef8222 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -21,10 +21,10 @@
 # Copyright (C) 2007-2013  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
 
 use strict;
-use Config::Simple;
 use Sys::Syslog qw( :standard :macros );
 
-use X2Go::Log qw(loglevel);
+use X2Go::Config qw( get_config);
+use X2Go::Log qw( loglevel );
 
 openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(loglevel()) );
@@ -32,8 +32,7 @@ setlogmask( LOG_UPTO(loglevel()) );
 syslog('info', "x2gosessionlimit has been called");
 
 my $maxlimit=-1;
-my $Config = new Config::Simple(syntax=>'ini');
-$Config->read('/etc/x2go/x2goserver.conf' );
+my $Config = get_config();
 
 sub getGroupLimit
 {
diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin
index e3fc6f5..80fee9a 100755
--- a/x2goserver/sbin/x2godbadmin
+++ b/x2goserver/sbin/x2godbadmin
@@ -24,10 +24,10 @@ use strict;
 use Sys::Syslog qw( :standard :macros );
 use File::Path qw( make_path );
 use Getopt::Long;
-use Config::Simple;
 use DBI;
 
-use X2Go::Log qw(loglevel);
+use X2Go::Config qw( get_sqlconfig );
+use X2Go::Log qw( loglevel );
 
 openlog($0,'cons,pid','user');
 setlogmask( LOG_UPTO(loglevel()) );
@@ -58,8 +58,7 @@ if ($help  || ! ( $createdb || $adduser || $rmuser || $addgroup || $rmgroup || $
 	exit(0);
 }
 
-my $Config = new Config::Simple(syntax=>'ini');
-$Config->read('/etc/x2go/x2gosql/sql' ) or die "Can't read config file /etc/x2go/x2gosql/sql";
+my $Config = get_sqlconfig();
 
 if ($Config->param("backend") eq 'sqlite')
 {


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