[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-755-ga3ab31d

[Holger Levsen]

The following commit has been merged in the piatti branch:
commit 70f3423a060aa75b711aa22ff599ab3ba5286081
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jun 18 09:41:59 2012 +0000

    fix: adduser: The home dir must be an absolute path.

diff --git a/debian/piuparts-master.postinst b/debian/piuparts-master.postinst
index 08518ed..3ba3872 100755
--- a/debian/piuparts-master.postinst
+++ b/debian/piuparts-master.postinst
@@ -5,7 +5,7 @@ set -e
 pgroup=piuparts
 muser=piupartsm
 scriptroot=/usr/share/piuparts
-userhome=var/lib/piuparts
+userhome=/var/lib/piuparts
 
 case "$1" in
   configure)
@@ -38,12 +38,12 @@ case "$1" in
         fi
     done
 
-    install -d -o $muser -g $pgroup -m 0755 /var/lib/piuparts/master
-    install -d -o $muser -g $pgroup -m 0755 /var/lib/piuparts/master/monitor-slave
-    install -d -o $muser -g $pgroup -m 0755 /var/lib/piuparts/backup
+    install -d -o $muser -g $pgroup -m 0755 $userhome/master
+    install -d -o $muser -g $pgroup -m 0755 $userhome/master/monitor-slave
+    install -d -o $muser -g $pgroup -m 0755 $userhome/backup
 
-    install -d -o $muser -g $pgroup -m 0755 /var/lib/piuparts/htdocs
-    cp -rf $scriptroot/htdocs/* /var/lib/piuparts/htdocs/
+    install -d -o $muser -g $pgroup -m 0755 $userhome/htdocs
+    cp -rf $scriptroot/htdocs/* $userhome/htdocs/
 
     ;;
 
diff --git a/debian/piuparts-slave.postinst b/debian/piuparts-slave.postinst
index 03245ce..070ef51 100755
--- a/debian/piuparts-slave.postinst
+++ b/debian/piuparts-slave.postinst
@@ -6,7 +6,7 @@ pgroup=piuparts
 muser=piupartsm
 suser=piupartss
 scriptroot=/usr/share/piuparts
-userhome=var/lib/piuparts
+userhome=/var/lib/piuparts
 
 case "$1" in
   configure)
@@ -50,8 +50,8 @@ case "$1" in
     chown $muser:$pgroup $userhome/$muser/.ssh/authorized_keys
     chmod 0600 $userhome/$muser/.ssh/authorized_keys
 
-    install -d -o $suser -g $pgroup -m 0755 /var/lib/piuparts/slave
-    install -d -o $suser -g $pgroup -m 0755 /var/lib/piuparts/slave/0
+    install -d -o $suser -g $pgroup -m 0755 $userhome/slave
+    install -d -o $suser -g $pgroup -m 0755 $userhome/slave/0
 
     ;;
 

-- 
piuparts git repository