X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fjenkins.pp;h=ccff2990e033d66253d188e5bf8e4f7bb4312eb1;hb=d37aae2f20083c472de30925ff3e16a692408a11;hp=1264e8b2c96237ba46068d682bd504d95a2bd24d;hpb=08a5df3e8e1957dbc22e97f80e13861b4865aacd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index 1264e8b2c..ccff2990e 100644
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -1,13 +1,58 @@
+# the jenkins.debian.org CI system
 class roles::jenkins {
-	include apache2::ssl
-	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',
+  }
+
+  ensure_packages([
+    'debian.org-jenkins.debian.org'
+  ], { ensure => 'installed' })
+
+
+  # home directories
+  file { [
+      '/srv/jenkins.debian.org',
+      '/srv/jenkins.debian.org/home-adm'
+    ]:
+      ensure => directory,
+      mode   => '2755',
+      owner  => 'jenkins-adm',
+      group  => 'jenkins-adm',
+  }
+  file { '/home/jenkins-adm':
+    ensure => link,
+    target => '/srv/jenkins.debian.org/home-adm',
+  }
+  file { '/srv/jenkins.debian.org/home-unpriv':
+      ensure => directory,
+      mode   => '2755',
+      owner  => 'jenkins',
+      group  => 'jenkins',
+  }
+  file { '/home/jenkins':
+    ensure => link,
+    target => '/srv/jenkins.debian.org/home-unpriv',
+  }
 }