aboutsummaryrefslogtreecommitdiff
path: root/modules/cron-puppet
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-08 18:28:11 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-08 18:28:19 +0200
commit5b4fbb5f53cfe34b9852223bc5dee86875fbe7b0 (patch)
tree9d97ee7848753ee69fc713881fdb004ce94c9cec /modules/cron-puppet
parent596f9fefb01f1419e640f3f3a878443adc047b07 (diff)
downloadPuppet-5b4fbb5f53cfe34b9852223bc5dee86875fbe7b0.tar.gz
Puppet-5b4fbb5f53cfe34b9852223bc5dee86875fbe7b0.tar.zst
Puppet-5b4fbb5f53cfe34b9852223bc5dee86875fbe7b0.zip
Rename cron-puppet class to cron_puppet
Diffstat (limited to 'modules/cron-puppet')
-rw-r--r--modules/cron-puppet/files/post-merge14
-rw-r--r--modules/cron-puppet/manifests/init.pp17
2 files changed, 0 insertions, 31 deletions
diff --git a/modules/cron-puppet/files/post-merge b/modules/cron-puppet/files/post-merge
deleted file mode 100644
index b8dc266..0000000
--- a/modules/cron-puppet/files/post-merge
+++ /dev/null
@@ -1,14 +0,0 @@
1#!/bin/bash -e
2## Run Puppet locally using puppet apply
3/usr/bin/puppet apply /etc/puppetlabs/puppet/manifests/site.pp
4
5## Log status of the Puppet run
6if [ $? -eq 0 ]
7then
8 /usr/bin/logger -i "Puppet has run successfully" -t "puppet-run"
9 exit 0
10else
11 /usr/bin/logger -i "Puppet has ran into an error, please run Puppet manually" -t "puppet-run"
12 exit 1
13fi
14
diff --git a/modules/cron-puppet/manifests/init.pp b/modules/cron-puppet/manifests/init.pp
deleted file mode 100644
index 4ce0be4..0000000
--- a/modules/cron-puppet/manifests/init.pp
+++ /dev/null
@@ -1,17 +0,0 @@
1class cron-puppet {
2 file { 'post-hook':
3 ensure => file,
4 path => '/etc/puppetlabs/puppet/.git/hooks/post-merge',
5 source => 'puppet:///modules/cron-puppet/post-merge',
6 mode => 0755,
7 owner => root,
8 group => root,
9 }
10 cron { 'puppet-apply':
11 ensure => present,
12 command => "cd /etc/puppetlabs/puppet ; /usr/bin/git pull",
13 user => root,
14 minute => '*/30',
15 require => File['post-hook'],
16 }
17}