From ba2cf1b5d938810077b0fd73844faf432e8e8f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 14 Aug 2017 19:02:29 +0200
Subject: Install OVH vps from scratch

---
 modules/cron_puppet/files/post-merge | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/cron_puppet/files/post-merge')

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 ]
-- 
cgit v1.2.3