Add puppet_apply script with lockfile

[perso/Immae/Projets/Puppet.git] / modules / base_installation / files / cronie / puppet-post-merge

diff --git a/modules/base_installation/files/cronie/puppet-post-merge b/modules/base_installation/files/cronie/puppet-post-merge
index ac5e3ff1cc57456ad93054d7fff9a697a1f7f035..f5c21a72aa796fd5b475bee2ab6805781f1b20ad 100644 (file)
--- a/modules/base_installation/files/cronie/puppet-post-merge
+++ b/modules/base_installation/files/cronie/puppet-post-merge
@@ -1,7 +1,7 @@
 #!/bin/bash
-## Run Puppet locally using puppet apply
+## Run Puppet locally using puppet_apply
 git submodule update --init
-/usr/bin/puppet apply `pwd`/manifests/site.pp
+/usr/local/sbin/puppet_apply `pwd`/manifests/site.pp
 
 ## Log status of the Puppet run
 if [ $? -eq 0 ]