Skip to content
Snippets Groups Projects
Commit b0444f4c authored by Peter Palfrader's avatar Peter Palfrader
Browse files

ssl for debdetlta.d.n and incoming.d.o and incoming.ports.d.o

parent 81b77c4f
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules/roles/manifests/static_mirror.pp
+ 6
− 3
View file @ b0444f4c
......@@ -89,12 +89,15 @@ class roles::static_mirror {
ssl::service { 'bits.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'blends.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'lintian.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'incoming.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'incoming.ports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'onion.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'release.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'security-team.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'www.ports.debian.org' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
# dn
ssl::service { 'news.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'debdeltas.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'micronews.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'mozilla.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
ssl::service { 'debaday.debian.net' : ensure => "ifstatic", notify => Exec['service apache2 reload'], key => true, }
......@@ -130,6 +133,8 @@ class roles::static_mirror {
onion::service { 'backports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'bits.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'blends.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'incoming.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'incoming.ports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'lintian.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'onion.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'release.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
......@@ -140,6 +145,7 @@ class roles::static_mirror {
onion::service { 'micronews.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'mozilla.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'debaday.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'debdeltas.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'timeline.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'wnpp-by-tags.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
# dc
......@@ -158,9 +164,6 @@ class roles::static_mirror {
onion::service { 'miniconf10.debconf.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
# non-SSL
onion::service { 'debdeltas.debian.net' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'incoming.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'incoming.ports.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'metadata.ftp-master.debian.org': ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
onion::service { 'planet.debian.org' : ensure => "ifstatic", port => 80, target_port => 80, target_address => $onion_v4_addr }
}
......
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+ 3
− 3
View file @ b0444f4c
......@@ -139,9 +139,9 @@ end
lines = []
vhost(lines, "mozilla.debian.net" , :ssl => true, :ssl_optional => true)
vhost(lines, "backports.debian.org" , :ssl => true)
vhost(lines, "incoming.debian.org")
vhost(lines, "incoming.ports.debian.org")
vhost(lines, "debdeltas.debian.net")
vhost(lines, "incoming.debian.org" , :ssl => true, :ssl_optional => true)
vhost(lines, "incoming.ports.debian.org" , :ssl => true, :ssl_optional => true)
vhost(lines, "debdeltas.debian.net" , :ssl => true)
vhost(lines, "news.debian.net" , :ssl => true)
vhost(lines, "debaday.debian.net" , :ssl => true)
vhost(lines, "timeline.debian.net" , :ssl => true)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment