projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
80049ab
)
Add certs for www-master and cgi.d.o
author
Peter Palfrader
<peter@palfrader.org>
Thu, 4 Feb 2016 08:00:39 +0000
(09:00 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Thu, 4 Feb 2016 08:00:39 +0000
(09:00 +0100)
hieradata/common.yaml
patch
|
blob
|
history
modules/roles/manifests/init.pp
patch
|
blob
|
history
modules/roles/manifests/syncproxy.pp
patch
|
blob
|
history
modules/roles/manifests/www_master.pp
patch
|
blob
|
history
diff --git
a/hieradata/common.yaml
b/hieradata/common.yaml
index
36e328e
..
42e7d2b
100644
(file)
--- a/
hieradata/common.yaml
+++ b/
hieradata/common.yaml
@@
-166,6
+166,8
@@
roles:
- wilder.debian.org
www_master:
- wolkenstein.debian.org
- wilder.debian.org
www_master:
- wolkenstein.debian.org
+ cgi.d.o:
+ - wolkenstein.debian.org
postgres_backup_server:
- backuphost.debian.org
- storace.debian.org
postgres_backup_server:
- backuphost.debian.org
- storace.debian.org
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
125f763
..
c436bac
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-104,6
+104,13
@@
class roles {
include roles::www_master
}
include roles::www_master
}
+ if has_role('cgi.d.o') {
+ ssl::service { 'cgi.debian.org':
+ notify => Service['apache2'],
+ key => true,
+ }
+ }
+
if has_role('keyring') {
include roles::keyring
}
if has_role('keyring') {
include roles::keyring
}
diff --git
a/modules/roles/manifests/syncproxy.pp
b/modules/roles/manifests/syncproxy.pp
index
ea9e24e
..
86ba67c
100644
(file)
--- a/
modules/roles/manifests/syncproxy.pp
+++ b/
modules/roles/manifests/syncproxy.pp
@@
-36,7
+36,10
@@
class roles::syncproxy {
if $::apache2 and $syncproxy_name != 'unknown' {
include apache2::ssl
if $::apache2 and $syncproxy_name != 'unknown' {
include apache2::ssl
- ssl::service { "$syncproxy_name": notify => Service['apache2'], key => true, }
+ ssl::service {
+ "$syncproxy_name": notify => Service['apache2'],
+ key => true,
+ }
apache2::site { '010-syncproxy.debian.org':
site => 'syncproxy.debian.org',
content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
apache2::site { '010-syncproxy.debian.org':
site => 'syncproxy.debian.org',
content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
diff --git
a/modules/roles/manifests/www_master.pp
b/modules/roles/manifests/www_master.pp
index
856721c
..
70fc559
100644
(file)
--- a/
modules/roles/manifests/www_master.pp
+++ b/
modules/roles/manifests/www_master.pp
@@
-1,6
+1,9
@@
class roles::www_master {
class roles::www_master {
- rsync::site { 'www_master':
- source => 'puppet:///modules/roles/www_master/rsyncd.conf',
- }
-
+ rsync::site { 'www_master':
+ source => 'puppet:///modules/roles/www_master/rsyncd.conf',
+ }
+ ssl::service { 'www-master.debian.org':
+ notify => Service['apache2'],
+ key => true,
+ }
}
}