aboutsummaryrefslogtreecommitdiff
path: root/modules/cron_puppet/files
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-08 18:47:33 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-08 18:47:33 +0200
commitcf30072bd0ddbc327abadcf944b20ee988aaff23 (patch)
tree86613118c44ad5dc8127e3a3050419111fdfee2a /modules/cron_puppet/files
parentb21c999a427d0a802673918e311b7ed8913e9868 (diff)
downloadPuppet-cf30072bd0ddbc327abadcf944b20ee988aaff23.tar.gz
Puppet-cf30072bd0ddbc327abadcf944b20ee988aaff23.tar.zst
Puppet-cf30072bd0ddbc327abadcf944b20ee988aaff23.zip
Fix post-merge hook
Diffstat (limited to 'modules/cron_puppet/files')
-rw-r--r--modules/cron_puppet/files/post-merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/cron_puppet/files/post-merge b/modules/cron_puppet/files/post-merge
index b8dc266..7310b98 100644
--- a/modules/cron_puppet/files/post-merge
+++ b/modules/cron_puppet/files/post-merge
@@ -1,6 +1,6 @@
1#!/bin/bash -e 1#!/bin/bash -e
2## Run Puppet locally using puppet apply 2## Run Puppet locally using puppet apply
3/usr/bin/puppet apply /etc/puppetlabs/puppet/manifests/site.pp 3/usr/bin/puppet apply --modulepath=/etc/puppetlabs/puppet/modules /etc/puppetlabs/puppet/manifests/site.pp
4 4
5## Log status of the Puppet run 5## Log status of the Puppet run
6if [ $? -eq 0 ] 6if [ $? -eq 0 ]