Merge local changes on sulfur

[deb/packages.git] / conf / apache.conf.sed.in

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 9c7430c0b3cc639cc6a8969246a14353be902f95..4165bb9f1eda77d1e2a08196543865996343c7ca 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -65,10 +65,11 @@
   AddEncoding x-gzip .gz
 </Directory>
 
-<VirtualHost *>
+<VirtualHost 91.189.94.219:80>
    ServerAdmin frank@lichtenheld.de
    DocumentRoot %TOPDIR%/www/
    ServerName %SITE%
+   ServerAlias packages.ubunut.com
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
@@ -140,7 +141,7 @@
 
 </VirtualHost>
 
-<VirtualHost *>
+<VirtualHost 91.189.94.219:80>
    ServerAdmin frank@lichtenheld.de
    DocumentRoot %TOPDIR%/www/
    ServerName packages.ubuntu.net