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

diff --git a/modules/roles/manifests/jenkins.pp b/modules/roles/manifests/jenkins.pp
index 3a068f9aa..ccff2990e 100644
--- a/modules/roles/manifests/jenkins.pp
+++ b/modules/roles/manifests/jenkins.pp
@@ -1,3 +1,4 @@
+# the jenkins.debian.org CI system
 class roles::jenkins {
   include roles::sso_rp
 
@@ -5,6 +6,7 @@ class roles::jenkins {
   include apache2::auth_digest
   include apache2::authn_file
   include apache2::proxy_http
+  include apache2::rewrite
   include apache2::ssl
 
   apache2::site { '010-jenkins.debian.org':
@@ -23,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',
+  }
 }