X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fjenkins.pp;h=799953371678b290a035d8f650e58003f9c1f154;hb=352aef002a241441b2562c5df1f7c191d77e213b;hp=56bd7a592e18e171c8100c7df699bbf2bb104e7c;hpb=21e5d62634a48c6fb4ee93d58a68eb4a485984d5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index 56bd7a592..799953371 100644
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -1,12 +1,27 @@
 class roles::jenkins {
-	apache2::module { 'proxy_http': }
+  include roles::sso_rp
 
-	apache2::site { '010-jenkins.debian.org':
-		site    => 'jenkins.debian.org',
-		source => 'puppet:///modules/roles/jenkins/jenkins.debian.org',
-	}
+  include apache2
+  include apache2::auth_digest
+  include apache2::authn_file
+  include apache2::proxy_http
+  include apache2::rewrite
+  include apache2::ssl
 
-	ssl::service { 'jenkins.debian.org':
-		notify => Service['apache2'],
-	}
+  apache2::site { '010-jenkins.debian.org':
+    site   => 'jenkins.debian.org',
+    source => 'puppet:///modules/roles/jenkins/jenkins.debian.org',
+  }
+
+  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',
+  }
 }