Install OVH vps from scratch

[perso/Immae/Projets/Puppet.git] / modules / cron_puppet / files / post-merge

diff --git a/modules/cron_puppet/files/post-merge b/modules/cron_puppet/files/post-merge
index 7310b98ce7bb439840ac0336e2445531bb99e798..ac5e3ff1cc57456ad93054d7fff9a697a1f7f035 100644 (file)
--- a/modules/cron_puppet/files/post-merge
+++ b/modules/cron_puppet/files/post-merge
@@ -1,6 +1,7 @@
-#!/bin/bash -e
+#!/bin/bash
 ## Run Puppet locally using puppet apply
-/usr/bin/puppet apply --modulepath=/etc/puppetlabs/puppet/modules /etc/puppetlabs/puppet/manifests/site.pp
+git submodule update --init
+/usr/bin/puppet apply `pwd`/manifests/site.pp
 
 ## Log status of the Puppet run
 if [ $? -eq 0 ]