-<VirtualHost <%= vhost_listen %> >
- ServerName volatile.debian.org
- ServerAlias volatile-master.debian.org
- ServerAdmin webmaster@debian.org
- ErrorLog /var/log/apache2/volatile.debian.org-error.log
- CustomLog /var/log/apache2/volatile.debian.org-access.log privacy
- RedirectMatch permanent . http://www.debian.org/volatile/
+ Use common-debian-service-ssl www.debian.org
+ Use common-ssl-HSTS
+</VirtualHost>
+
+<% if scope.function_onion_global_service_hostname(['www.debian.org']) -%>
+<VirtualHost <%= @vhost_listen %> >
+ ErrorLog /var/log/apache2/www.debian.org-error.log
+ CustomLog /var/log/apache2/www.debian.org-access.log privacy
+
+ ServerName <%= scope.function_onion_global_service_hostname(['www.debian.org']) %>
+
+ Use common-www.d.o-inner
+</VirtualHost>
+<% end %>
+
+
+# www other
+###########
+<VirtualHost <%= @vhost_listen %> >
+ Use common-www-other.d.o
+
+ ErrorLog /var/log/apache2/www-other.debian.org-error.log
+ CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
+
+ Redirect permanent / https://www.debian.org/
+</VirtualHost>
+<VirtualHost <%= @vhost_listen_443 %> >
+ Use common-www-other.d.o
+
+ CustomLog /var/log/apache2/www-other-access.log privacyssl
+ ErrorLog /var/log/apache2/www-other-error.log
+
+ Redirect permanent / https://www.debian.org/
+
+ Use common-debian-service-ssl debian.org
+ Use common-ssl-HSTS