From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Mon, 8 Aug 2016 16:47:33 +0000 (+0200)
Subject: Fix post-merge hook
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPuppet.git;a=commitdiff_plain;h=cf30072bd0ddbc327abadcf944b20ee988aaff23

Fix post-merge hook
---

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 @@
 #!/bin/bash -e
 ## Run Puppet locally using puppet apply
-/usr/bin/puppet apply /etc/puppetlabs/puppet/manifests/site.pp
+/usr/bin/puppet apply --modulepath=/etc/puppetlabs/puppet/modules /etc/puppetlabs/puppet/manifests/site.pp
 
 ## Log status of the Puppet run
 if [ $? -eq 0 ]