X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fjenkins.pp;h=b4e085fad14879f7b6d02e732ef05390db656b70;hb=e8ce3758531d3d751c8d5fe1923535052cd98f90;hp=f036d1955c0659bc952571c5e03452ca1f999e2f;hpb=dff2163a13d36f929819dc15c746770faab4af55;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index f036d1955..b4e085fad 100644
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -1,22 +1,24 @@
 class roles::jenkins {
-	include apache2::ssl
-	apache2::module { 'proxy_http': }
+  include apache2
+  include roles::sso_rp
 
-	apache2::site { '010-jenkins.debian.org':
-		site    => 'jenkins.debian.org',
-		source => 'puppet:///modules/roles/jenkins/jenkins.debian.org',
-	}
+  include apache2::ssl
+  apache2::module { 'proxy_http': }
 
-	ssl::service { 'jenkins.debian.org':
-		notify  => Exec['service apache2 reload'],
-		key => true,
-	}
+  apache2::site { '010-jenkins.debian.org':
+    site   => 'jenkins.debian.org',
+    source => 'puppet:///modules/roles/jenkins/jenkins.debian.org',
+  }
 
-	file { '/var/lib/systemd/linger':
-		ensure => directory,
-		mode   => '755',
-	}
-	file { '/var/lib/systemd/linger/jenkins':
-		ensure => present,
-	}
+  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',
+  }
 }