2 files changed, 7 insertions, 5 deletions

diff --git a/modules/cron_puppet/files/post-merge b/modules/cron_puppet/files/post-merge
index 1ba08fb..ac5e3ff 100644
--- a/modules/cron_puppet/files/post-merge
+++ b/modules/cron_puppet/files/post-merge
@@ -1,7 +1,7 @@
-#!/bin/bash -e
+#!/bin/bash
 ## Run Puppet locally using puppet apply
 git submodule update --init
-/usr/bin/puppet apply --modulepath=/etc/puppetlabs/puppet/modules /etc/puppetlabs/puppet/manifests/site.pp
+/usr/bin/puppet apply `pwd`/manifests/site.pp
 
 ## Log status of the Puppet run
 if [ $? -eq 0 ]
diff --git a/modules/cron_puppet/manifests/init.pp b/modules/cron_puppet/manifests/init.pp
index 1756a06..c9d5a51 100644
--- a/modules/cron_puppet/manifests/init.pp
+++ b/modules/cron_puppet/manifests/init.pp
@@ -1,7 +1,9 @@
-class cron_puppet {
+class cron_puppet (
+  $code_path = "/etc/puppetlabs/code"
+) {
     file { 'post-hook':
         ensure  => file,
-        path    => '/etc/puppetlabs/puppet/.git/hooks/post-merge',
+        path    => "$code_path/.git/hooks/post-merge",
         source  => 'puppet:///modules/cron_puppet/post-merge',
         mode    => '0755',
         owner   => root,
@@ -12,7 +14,7 @@ class cron_puppet {
     }
     cron { 'puppet-apply':
         ensure  => present,
-        command => "cd /etc/puppetlabs/puppet ; /usr/bin/git pull",
+        command => "cd $code_path ; /usr/bin/git pull",
         user    => root,
         minute  => '*/30',
         require => File['post-hook'],