aboutsummaryrefslogtreecommitdiff
path: root/modules/cron_puppet/files
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2017-08-14 19:02:29 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2017-08-24 00:33:58 +0200
commitba2cf1b5d938810077b0fd73844faf432e8e8f9d (patch)
tree40884fcc70af8eb349979b2ff62e3e4435bae5a5 /modules/cron_puppet/files
parenteb9fec57fcfcc84f0e310e343167a10fb13ca0c8 (diff)
downloadPuppet-ba2cf1b5d938810077b0fd73844faf432e8e8f9d.tar.gz
Puppet-ba2cf1b5d938810077b0fd73844faf432e8e8f9d.tar.zst
Puppet-ba2cf1b5d938810077b0fd73844faf432e8e8f9d.zip
Install OVH vps from scratch
Diffstat (limited to 'modules/cron_puppet/files')
-rw-r--r--modules/cron_puppet/files/post-merge4
1 files changed, 2 insertions, 2 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 @@
1#!/bin/bash -e 1#!/bin/bash
2## Run Puppet locally using puppet apply 2## Run Puppet locally using puppet apply
3git submodule update --init 3git submodule update --init
4/usr/bin/puppet apply --modulepath=/etc/puppetlabs/puppet/modules /etc/puppetlabs/puppet/manifests/site.pp 4/usr/bin/puppet apply `pwd`/manifests/site.pp
5 5
6## Log status of the Puppet run 6## Log status of the Puppet run
7if [ $? -eq 0 ] 7if [ $? -eq 0 ]