[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.1-53-g9b7afc8

X2Go dev team git-admin at x2go.org
Sun May 19 13:03:14 CEST 2013


The branch, build-main has been updated
       via  9b7afc801b779c468dffcec904513f8cd6302df9 (commit)
      from  d4b5e9d275a05d7628d00b48acf754c90c8b3bf7 (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:
 sbin/x2gobroker-keygen |   11 +++++++----
 x2gobroker/defaults.py |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen
index efe0ac2..11751e8 100755
--- a/sbin/x2gobroker-keygen
+++ b/sbin/x2gobroker-keygen
@@ -29,6 +29,9 @@ import logging
 import binascii
 import paramiko
 
+from pwd import getpwnam
+from grp import getgrnam
+
 try:
     import x2gobroker.defaults
 except ImportError:
@@ -68,7 +71,7 @@ if os.geteuid() != 0:
 if __name__ == '__main__':
 
     common_options = [
-        {'args':['-t','--type'], 'default': 'RSA', 'help': 'Choose a key type for the X2Go Session Broker pub/priv SSH key pair (available: RSA, DSA).', },
+        {'args':['-t','---key-type'], 'default': 'RSA', 'help': 'Choose a key type for the X2Go Session Broker pub/priv SSH key pair (available: RSA, DSA).', },
         {'args':['-f','--force'], 'default': False, 'action': 'store_true', 'help': 'Enforce the creation of a public/private key pair. WARNING: This will overwrite earlier created keys.', },
     ]
     p = argparse.ArgumentParser(description='X2Go Session Broker (Key Generator)',\
@@ -91,7 +94,7 @@ if __name__ == '__main__':
     broker_uid = x2gobroker.defaults.X2GOBROKER_DAEMON_USER
     broker_uidnumber = getpwnam(broker_uid).pw_uid
     broker_gid = x2gobroker.defaults.X2GOBROKER_DAEMON_GROUP
-    broker_gidnumber = getgrnam(_broker_gid).gr_gid
+    broker_gidnumber = getgrnam(broker_gid).gr_gid
     broker_home = x2gobroker.defaults.X2GOBROKER_HOME
 
     if not os.path.exists(broker_home):
@@ -99,7 +102,7 @@ if __name__ == '__main__':
         sys.exit(-2)
 
     logger_broker.info('Creating pub/priv key pair for X2Go Session Broker...')
-    if not path.exists('{home}/.ssh'.format(home=broker_home)):
+    if not os.path.exists('{home}/.ssh'.format(home=broker_home)):
         os.mkdir('{home}/.ssh'.format(home=broker_home))
         os.chown('{home}/.ssh'.format(home=broker_home), broker_uidnumber, broker_gidnumber)
         os.chmod('{home}/.ssh'.format(home=broker_home), 0750)
@@ -111,7 +114,7 @@ if __name__ == '__main__':
     elif cmdine_args.key_type.upper() == 'DSA':
         key = paramiko.DSAKey.generate(2048)
 
-    logger_broker.info('  {key_type} key has been generated, fingerprint is {fingerprint}'.format(key_type=cmdine_args.key_type.upper(), fingerprint=binascii.hexlify(key.get_fingerprint())))
+    logger_broker.info('  {key_type} key has been generated, fingerprint is {fingerprint}'.format(key_type=cmdline_args.key_type.upper(), fingerprint=binascii.hexlify(key.get_fingerprint())))
 
     key.write_private_key_file('{home}/.ssh/id_rsa'.format(home=broker_home))
     os.chown('{home}/.ssh/id_rsa'.format(home=broker_home), broker_uidnumber, broker_gidnumber)
diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py
index 4368a67..0a99af4 100644
--- a/x2gobroker/defaults.py
+++ b/x2gobroker/defaults.py
@@ -97,7 +97,7 @@ else:
 X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf"
 
 # the home directory of the user that the daemon/cgi runs as
-X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~'))
+X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~{broker_uid}'.format(broker_uid=X2GOBROKER_DAEMON_USER)))
 
 # defaults for X2Go Sessino Broker configuration file
 X2GOBROKER_CONFIG_DEFAULTS = {


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).




More information about the x2go-commits mailing list