[Fusionforge-commits] FusionForge branch Branch_5_3 updated. v5.3-rc4-7-g71cab2e

Sylvain Beucler beuc-inria at fusionforge.org
Sun Mar 23 17:16:29 CET 2014


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 "FusionForge".

The branch, Branch_5_3 has been updated
       via  71cab2e6a4d2d87e5bd74800757266d3c0575871 (commit)
       via  808ffbd3574b142014d5357fb62a508303d8bc6c (commit)
      from  259ce86dbf651a5175df1cab11c6bd3070e573f4 (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 71cab2e6a4d2d87e5bd74800757266d3c0575871
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun Mar 23 17:13:17 2014 +0100

    Trailing slash at the end of authorized_keys, for readability + because I've had issues with that in the past

diff --git a/src/cronjobs/ssh_create.php b/src/cronjobs/ssh_create.php
index a0db35b..76dde8d 100755
--- a/src/cronjobs/ssh_create.php
+++ b/src/cronjobs/ssh_create.php
@@ -63,7 +63,7 @@ function create_authkeys($params) {
 }
 
 foreach ($keys as $username => $v) {
-	$ssh_key = join("\n", $v);
+	$ssh_key = join("\n", $v) . "\n";
 
 	$dir = forge_get_config('homedir_prefix').'/'.$username;
 	if (util_is_root_dir($dir)) {

commit 808ffbd3574b142014d5357fb62a508303d8bc6c
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun Mar 23 17:12:00 2014 +0100

    install-nsspgsql.sh: support homedir_prefix

diff --git a/src/utils/install-nsspgsql.sh b/src/utils/install-nsspgsql.sh
index cd3db24..dfb69db 100755
--- a/src/utils/install-nsspgsql.sh
+++ b/src/utils/install-nsspgsql.sh
@@ -25,7 +25,9 @@ setup_vars() {
     db_name=$(forge_get_config database_name)
     db_user=$(forge_get_config database_user)
     db_host=$(forge_get_config database_host)
-    
+    # homedir_prefix, e.g. /home/users/ (with trailing slash)
+    homedir_prefix=$(forge_get_config homedir_prefix | sed -e 's:[^/]$:&/:')
+
     db_user_nss=${db_user}_nss
 
     tmpfile_pattern=/tmp/$(basename $0).XXXXXX
@@ -53,9 +55,9 @@ connectionstring = user=$db_user_nss dbname=$db_name $hostconf
 
 
 #----------------- NSS queries
-getpwnam        = SELECT login AS username,passwd,gecos,('/var/lib/gforge/chroot/home/users/' || login) AS homedir,shell,uid,gid FROM nss_passwd WHERE login = \$1
-getpwuid        = SELECT login AS username,passwd,gecos,('/var/lib/gforge/chroot/home/users/' || login) AS homedir,shell,uid,gid FROM nss_passwd WHERE uid = \$1
-#allusers        = SELECT login AS username,passwd,gecos,('/var/lib/gforge/chroot/home/users/' || login) AS homedir,shell,uid,gid FROM nss_passwd
+getpwnam        = SELECT login AS username,passwd,gecos,('$homedir_prefix' || login) AS homedir,shell,uid,gid FROM nss_passwd WHERE login = \$1
+getpwuid        = SELECT login AS username,passwd,gecos,('$homedir_prefix' || login) AS homedir,shell,uid,gid FROM nss_passwd WHERE uid = \$1
+#allusers        = SELECT login AS username,passwd,gecos,('$homedir_prefix' || login) AS homedir,shell,uid,gid FROM nss_passwd
 getgroupmembersbygid = SELECT login AS username FROM nss_passwd WHERE gid = \$1
 getgrnam = SELECT name AS groupname,'x',gid,ARRAY(SELECT user_name FROM nss_usergroups WHERE nss_usergroups.gid = nss_groups.gid) AS members FROM nss_groups WHERE name = \$1
 getgrgid = SELECT name AS groupname,'x',gid,ARRAY(SELECT user_name FROM nss_usergroups WHERE nss_usergroups.gid = nss_groups.gid) AS members FROM nss_groups WHERE gid = \$1

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

Summary of changes:
 src/cronjobs/ssh_create.php   |    2 +-
 src/utils/install-nsspgsql.sh |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list