move exim vs. postfix, heavy vs. not, into hiera

[mirror/dsa-puppet.git] / modules / roles / manifests / jenkins.pp

diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index 975141c..b4e085f 100644 (file)
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -1,14 +1,24 @@
 class roles::jenkins {
-       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',
-       }
-
-       ssl::service { 'jenkins.debian.org':
-               notify  => Exec['service apache2 reload'],
-               tlsaport => 0,
-       }
+  include apache2
+  include roles::sso_rp
+
+  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',
+  }
+
+  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',
+  }
 }