From 7d8d3599bf22316c0ceab2957700d307a1a914bf Mon Sep 17 00:00:00 2001
From: Fredrik Thulin <fredrik@thulin.net>
Date: Mon, 26 May 2014 14:06:24 +0200
Subject: sync from eduid-ops

---
 .../etc/puppet/modules/sunet/manifests/server.pp   | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'global/overlay/etc/puppet/modules/sunet')

diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/server.pp b/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
index 875dc69..4852e17 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
@@ -37,4 +37,50 @@ define sunet::server() {
     notify => Service['ssh'],
   }
 
+  service { 'ntp':
+    ensure    => 'running',
+  }
+
+  # Don't use pool.ntp.org servers, but rather DHCP provided NTP servers
+  line { 'no_pool_ntp_org_servers':
+      file        => '/etc/ntp.conf',
+      line        => '^server .*\.pool\.ntp\.org',
+      ensure      => 'comment',
+      notify      => Service['ntp'],
+  }
+
+  file { '/var/cache/scriptherder':
+    ensure  => 'directory',
+    path    => '/var/cache/scriptherder',
+    mode    => '1777',    # like /tmp, so user-cronjobs can also use scriptherder
+  }
+
+
+}
+
+# from http://projects.puppetlabs.com/projects/puppet/wiki/Simple_Text_Patterns/5
+define line($file, $line, $ensure = 'present') {
+  case $ensure {
+    default : { err ( "unknown ensure value ${ensure}" ) }
+    present: {
+      exec { "/bin/echo '${line}' >> '${file}'":
+        unless => "/bin/grep -qFx '${line}' '${file}'"
+      }
+    }
+    absent: {
+      exec { "/usr/bin/perl -ni -e 'print unless /^\\Q${line}\\E\$/' '${file}'":
+        onlyif => "/bin/grep -qFx '${line}' '${file}'"
+      }
+    }
+    uncomment: {
+      exec { "/bin/sed -i -e'/${line}/s/^#\\+//' '${file}'":
+        onlyif => "/bin/grep '${line}' '${file}' | /bin/grep '^#' | /usr/bin/wc -l"
+      }
+    }
+    comment: {
+      exec { "/bin/sed -i -e'/${line}/s/^\\(.\\+\\)$/#\\1/' '${file}'":
+        onlyif => "/usr/bin/test `/bin/grep '${line}' '${file}' | /bin/grep -v '^#' | /usr/bin/wc -l` -ne 0"
+      }
+    }
+  }
 }
-- 
cgit v1.1


From 15b5d5a36f1a6adcefa7bb9026a50fa9d8557994 Mon Sep 17 00:00:00 2001
From: Fredrik Thulin <fredrik@thulin.net>
Date: Mon, 26 May 2014 14:11:12 +0200
Subject: avoid double declarations

---
 global/overlay/etc/puppet/modules/sunet/manifests/server.pp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'global/overlay/etc/puppet/modules/sunet')

diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/server.pp b/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
index 4852e17..14df323 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
@@ -37,9 +37,10 @@ define sunet::server() {
     notify => Service['ssh'],
   }
 
-  service { 'ntp':
-    ensure    => 'running',
-  }
+  # already declared in puppet-cosmos/manifests/ntp.pp
+  #service { 'ntp':
+  #  ensure    => 'running',
+  #}
 
   # Don't use pool.ntp.org servers, but rather DHCP provided NTP servers
   line { 'no_pool_ntp_org_servers':
-- 
cgit v1.1