projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Serve xhtml from generic cofiguration
[mirror/dsa-puppet.git]
/
modules
/
roles
/
templates
/
static-mirroring
/
vhost
/
static-vhosts-simple.erb
diff --git
a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index
10c820c
..
4088d28
100644
(file)
--- a/
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/
modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@
-59,10
+59,3
@@
Use common-static-vhost-with-extra www.ports.debian.org "ServerAlias www.ports-b
ServerAdmin debian-admin@debian.org
RedirectPermanent / http://www.ports.debian.org/
</VirtualHost>
ServerAdmin debian-admin@debian.org
RedirectPermanent / http://www.ports.debian.org/
</VirtualHost>
-
-<VirtualHost <%= vhost_listen %> >
- ServerName ports.debian.org
- ServerAdmin debian-admin@debian.org
- Options MultiViews Includes
- AddOutputFilter INCLUDES .xhtml
-</VirtualHost>