aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-05 22:14:52 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-05 22:14:52 -0300
commit08bd8b75213f0efc9fd218e8c17358bb814c0fbe (patch)
tree3d18a200e3e93dc4044aa43ccd83fb7268295ba3 /bin
parent15c02939c8c685ae77f7384f8d7bb6b93998e8f1 (diff)
downloadpuppet-bootstrap-08bd8b75213f0efc9fd218e8c17358bb814c0fbe.tar.gz
puppet-bootstrap-08bd8b75213f0efc9fd218e8c17358bb814c0fbe.tar.bz2
Deploy fixes
Diffstat (limited to 'bin')
-rwxr-xr-xbin/deploy4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/deploy b/bin/deploy
index 289f86c..6088edb 100755
--- 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