aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-08 17:54:33 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2016-08-08 17:54:33 +0200
commit596f9fefb01f1419e640f3f3a878443adc047b07 (patch)
treef3828f9cbed38a7f1f0aad6ee0894b1e7c41a006
parentc81a7f92b58e02c6f3029dda840478ef66b933e1 (diff)
downloadPuppet-596f9fefb01f1419e640f3f3a878443adc047b07.tar.gz
Puppet-596f9fefb01f1419e640f3f3a878443adc047b07.tar.zst
Puppet-596f9fefb01f1419e640f3f3a878443adc047b07.zip
Add cron-puppet module
-rw-r--r--manifests/site.pp3
-rw-r--r--modules/cron-puppet/files/post-merge14
-rw-r--r--modules/cron-puppet/manifests/init.pp17
3 files changed, 34 insertions, 0 deletions
diff --git a/manifests/site.pp b/manifests/site.pp
new file mode 100644
index 0000000..1464586
--- /dev/null
+++ b/manifests/site.pp
@@ -0,0 +1,3 @@
1node default {
2 include cron-puppet
3}
diff --git a/modules/cron-puppet/files/post-merge b/modules/cron-puppet/files/post-merge
new file mode 100644
index 0000000..b8dc266
--- /dev/null
+++ b/modules/cron-puppet/files/post-merge
@@ -0,0 +1,14 @@
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
new file mode 100644
index 0000000..4ce0be4
--- /dev/null
+++ b/modules/cron-puppet/manifests/init.pp
@@ -0,0 +1,17 @@
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}