summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-05-29 16:15:40 +0000
committermh <mh@immerda.ch>2008-05-29 16:15:40 +0000
commit56ec15e0d9e63749aff8f8e03614bd24e80632ad (patch)
tree159eaf5af9f1f741dbb257de2b53bb2a86d0c120 /files
parente6c656d503d8a7272d29f6191688520c43cf8fb8 (diff)
merged from puzzle
Diffstat (limited to 'files')
-rw-r--r--files/.git_placeholder1
-rw-r--r--files/cron.d/puppetd2
-rw-r--r--files/cron.d/puppetd.CentOS1
-rw-r--r--files/cron.d/puppetd.Gentoo1
l---------files/cron.d/puppetmaster1
-rw-r--r--files/cron.d/puppetmaster.CentOS2
6 files changed, 7 insertions, 1 deletions
diff --git a/files/.git_placeholder b/files/.git_placeholder
new file mode 100644
index 0000000..89cb1fe
--- /dev/null
+++ b/files/.git_placeholder
@@ -0,0 +1 @@
+# file needed for git - don't remove it
diff --git a/files/cron.d/puppetd b/files/cron.d/puppetd
index 9f9e36d..bf19ea7 100644
--- a/files/cron.d/puppetd
+++ b/files/cron.d/puppetd
@@ -1 +1 @@
-#0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep puppetd > /dev/null || /etc/init.d/puppet restart
+0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep puppetd > /dev/null || /etc/init.d/puppet restart
diff --git a/files/cron.d/puppetd.CentOS b/files/cron.d/puppetd.CentOS
new file mode 100644
index 0000000..bf19ea7
--- /dev/null
+++ b/files/cron.d/puppetd.CentOS
@@ -0,0 +1 @@
+0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep puppetd > /dev/null || /etc/init.d/puppet restart
diff --git a/files/cron.d/puppetd.Gentoo b/files/cron.d/puppetd.Gentoo
new file mode 100644
index 0000000..9f9e36d
--- /dev/null
+++ b/files/cron.d/puppetd.Gentoo
@@ -0,0 +1 @@
+#0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep puppetd > /dev/null || /etc/init.d/puppet restart
diff --git a/files/cron.d/puppetmaster b/files/cron.d/puppetmaster
new file mode 120000
index 0000000..7e5177a
--- /dev/null
+++ b/files/cron.d/puppetmaster
@@ -0,0 +1 @@
+puppetmaster.CentOS \ No newline at end of file
diff --git a/files/cron.d/puppetmaster.CentOS b/files/cron.d/puppetmaster.CentOS
new file mode 100644
index 0000000..40a16e7
--- /dev/null
+++ b/files/cron.d/puppetmaster.CentOS
@@ -0,0 +1,2 @@
+# we restart puppetmaster every 4 hours to avoid memory problems
+0 */6 * * * root /etc/init.d/puppetmaster restart > /dev/null