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

diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index b4e085fad..ccff2990e 100644
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -1,9 +1,13 @@
+# the jenkins.debian.org CI system
 class roles::jenkins {
-  include apache2
   include roles::sso_rp
 
+  include apache2
+  include apache2::auth_digest
+  include apache2::authn_file
+  include apache2::proxy_http
+  include apache2::rewrite
   include apache2::ssl
-  apache2::module { 'proxy_http': }
 
   apache2::site { '010-jenkins.debian.org':
     site   => 'jenkins.debian.org',
@@ -21,4 +25,34 @@ class roles::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',
+  }
 }