projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whitespace change
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
jenkins.pp
diff --git
a/modules/roles/manifests/jenkins.pp
b/modules/roles/manifests/jenkins.pp
index
e38b023
..
b4e085f
100644
(file)
--- a/
modules/roles/manifests/jenkins.pp
+++ b/
modules/roles/manifests/jenkins.pp
@@
-1,16
+1,24
@@
class roles::jenkins {
class roles::jenkins {
+ include apache2
+ include roles::sso_rp
+
include apache2::ssl
apache2::module { 'proxy_http': }
apache2::site { '010-jenkins.debian.org':
include apache2::ssl
apache2::module { 'proxy_http': }
apache2::site { '010-jenkins.debian.org':
- site
=> 'jenkins.debian.org',
+ site => 'jenkins.debian.org',
source => 'puppet:///modules/roles/jenkins/jenkins.debian.org',
}
ssl::service { 'jenkins.debian.org':
source => 'puppet:///modules/roles/jenkins/jenkins.debian.org',
}
ssl::service { 'jenkins.debian.org':
- notify
=> Exec['service apache2 reload'],
- key => true,
+ notify => Exec['service apache2 reload'],
+ key
=> true,
}
dsa_systemd::linger { 'jenkins': }
}
dsa_systemd::linger { 'jenkins': }
+
+ file { '/etc/sudoers.d/jenkins':
+ mode => '0440',
+ source => 'puppet:///modules/roles/jenkins/sudoers',
+ }
}
}