Really enable the puppet.
authorFrantišek Dvořák <valtri@civ.zcu.cz>
Thu, 10 Dec 2015 19:33:26 +0000 (20:33 +0100)
committerFrantišek Dvořák <valtri@civ.zcu.cz>
Thu, 10 Dec 2015 19:33:26 +0000 (20:33 +0100)
lxc.sh

diff --git a/lxc.sh b/lxc.sh
index c181fe2..09ca7e8 100755 (executable)
--- a/lxc.sh
+++ b/lxc.sh
@@ -14,6 +14,10 @@ IMAGE_POOL=/var/lib/lxc
 IMAGE_FILE=${IMAGE_POOL}/${FACTER_hostname}
 IMAGE_SOURCE=/var/lib/lxc/debian7-x86_64.tar.gz
 VIRSH_ARGS="-c lxc://"
+SRCDIR="`dirname $0`"
+if echo ${SRCDIR} | grep -vq ^/; then
+    SRCDIR="`pwd`/${SRCDIR}"
+fi
 
 if [ -z $FACTER_fqdn ]; then
     echo "ERROR: no facter fqdn settings found"
@@ -99,8 +103,8 @@ valtri@ADMIN.META
 xparak@ADMIN.META
 __EOF__
 
-    cp -v `dirname $0`/puppet.conf etc/puppet/
-    sed -i -e 's/^\(START\)=.*/\1=yes/' /etc/default/puppet
+    cp -v ${SRCDIR}/puppet.conf etc/puppet/
+    sed -i -e 's/^\(START\)=.*/\1=yes/' etc/default/puppet
     rm -rf /var/lib/puppet/ssl/* || :
 
     sed -i -e 's/^#\(GSSAPIAuthentication\).*/\1 yes/' /etc/ssh/sshd_config