From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 10 Dec 2015 19:33:26 +0000 (+0100)
Subject: Really enable the puppet.
X-Git-Tag: v1.0.0~14
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=ffa3ecdbf6c2d986d0c39171a7ea1b7400336ee7;p=virtualization.git

Really enable the puppet.
---

diff --git a/lxc.sh b/lxc.sh
index c181fe2..09ca7e8 100755
--- 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