Deploy fixes

diff --git a/bin/deploy b/bin/deploy
index 289f86cac1f588dd298853d6ac5592a893c1f0dd..6088edbc19374354fb0ca0a1745ba9bc0bace826 100755 (executable)
--- a/bin/deploy
+++ b/bin/deploy
@@ -16,7 +16,7 @@ else
 fi
 
 # Set manifest
-PUPPET_MANIFEST="$BASEDIR/puppet/manifests/nodes/$FQDN.pp"
+PUPPET_MANIFEST="$BASEDIR/manifests/nodes/$FQDN.pp"
 if [ ! -e "$PUPPET_MANIFEST" ]; then
   PUPPET_MANIFEST="$BASEDIR/puppet/manifests/nodes/default.pp"
 fi
@@ -59,5 +59,5 @@ if [ -d "$BASEDIR/puppet/files/patches/$DIST" ]; then
 fi
 
 # Run puppet apply
-PUPPET_OPTS="--confdir=$BASEDIR/puppet --modulepath=$BASEDIR/puppet/modules"
+PUPPET_OPTS="--confdir=$BASEDIR --modulepath=$BASEDIR/modules"
 LC_ALL=C $SUDO puppet apply $PUPPET_OPTS $PUPPET_MANIFEST