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:
4857bcf
)
Fix some issues with the previous change.
author
Paul Wise
<pabs@debian.org>
Fri, 1 Apr 2016 06:01:40 +0000
(14:01 +0800)
committer
Paul Wise
<pabs@debian.org>
Fri, 1 Apr 2016 06:01:40 +0000
(14:01 +0800)
modules/roles/templates/apache-www.debian.org.erb
patch
|
blob
|
history
diff --git
a/modules/roles/templates/apache-www.debian.org.erb
b/modules/roles/templates/apache-www.debian.org.erb
index
aaebe84
..
8be28f0
100644
(file)
--- a/
modules/roles/templates/apache-www.debian.org.erb
+++ b/
modules/roles/templates/apache-www.debian.org.erb
@@
-144,10
+144,6
@@
DocumentRoot <%= wwwdo_document_root %>/
ErrorLog /var/log/apache2/www-other.debian.org-error.log
CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
DocumentRoot <%= wwwdo_document_root %>/
ErrorLog /var/log/apache2/www-other.debian.org-error.log
CustomLog /var/log/apache2/www-other.debian.org-access.log privacy
- #RewriteLog /var/log/apache2/www-other.debian.org-redirect.log
- #RewriteLogLevel 1
-
- RewriteEngine on
</Macro>
<Macro common-www.d.o>
</Macro>
<Macro common-www.d.o>
@@
-281,16
+277,6
@@
</Macro>
</Macro>
-<VirtualHost <%= vhost_listen %> >
- Use common-www-other.d.o
- RewriteRule ^/(.*)$ http://www.debian.org/$1 [R=301,L]
-</VirtualHost>
-<VirtualHost <%= vhost_listen_443 %> >
- Use common-www-other.d.o
- RewriteRule ^/(.*)$ https://www.debian.org/$1 [R=301,L]
-</VirtualHost>
-
-
<VirtualHost <%= vhost_listen %> >
ErrorLog /var/log/apache2/www.debian.org-error.log
CustomLog /var/log/apache2/www.debian.org-access.log privacy
<VirtualHost <%= vhost_listen %> >
ErrorLog /var/log/apache2/www.debian.org-error.log
CustomLog /var/log/apache2/www.debian.org-access.log privacy
@@
-308,16
+294,22
@@
</VirtualHost>
</VirtualHost>
+<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 / http://www.debian.org/
+</VirtualHost>
<VirtualHost <%= vhost_listen_443 %> >
<VirtualHost <%= vhost_listen_443 %> >
- ServerName debian.org
- ServerAdmin webmaster@debian.org
+ 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/
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 www.debian.org
Use common-ssl-HSTS
</VirtualHost>
Use common-debian-service-ssl www.debian.org
Use common-ssl-HSTS
</VirtualHost>