X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fjenkins.pp;h=34038e3c3cea1405ee6c3039acff0c515c30299b;hb=f7adabc11f4b86313d541b2007570cf3e475320b;hp=afbca199a0eb5d700cb17da30fc56c12887142d5;hpb=9d9c36b33d983b2de4e20f13c86a7d108125feb8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index afbca199a..34038e3c3 100644
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -1,13 +1,21 @@
 class roles::jenkins {
-	apache2::module { 'ssl': }
-	apache2::module { 'proxy_http': }
+  include apache2::ssl
+  apache2::module { 'proxy_http': }
 
-	apache2::site { '010-jenkins.debian.org':
-		site    => 'jenkins.debian.org',
-		source => 'puppet:///modules/roles/jenkins/jenkins.debian.org',
-	}
+  apache2::site { '010-jenkins.debian.org':
+    site    => 'jenkins.debian.org',
+    source => 'puppet:///modules/roles/jenkins/jenkins.debian.org',
+  }
 
-	ssl::service { 'jenkins.debian.org':
-		notify => Service['apache2'],
-	}
+  ssl::service { 'jenkins.debian.org':
+    notify  => Exec['service apache2 reload'],
+    key => true,
+  }
+
+  dsa_systemd::linger { 'jenkins': }
+
+  file { '/etc/sudoers.d/jenkins':
+    mode   => '0440',
+    source => 'puppet:///modules/roles/jenkins/sudoers',
+  }
 }