um, need to put it in the right place

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/apache2/files/per-host/spohr.debian.org/etc/apache2/sites-available/default-debian.org b/modules/apache2/files/per-host/spohr.debian.org/etc/apache2/sites-available/default-debian.org
new file mode 100644 (file)
index 0000000..5d31d53
--- /dev/null
+++ b/modules/apache2/files/per-host/spohr.debian.org/etc/apache2/sites-available/default-debian.org
@@ -0,0 +1,22 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+<VirtualHost *:80>
+       ServerAdmin debian-admin@debian.org
+
+       ErrorLog /var/log/apache2/error.log
+       CustomLog /var/log/apache2/access.log combined
+
+       DocumentRoot /srv/www/default.debian.org/htdocs
+
+       Alias /debian /org/mirrors/ftp.debian.org/ftp
+       HostnameLookups Off
+       UseCanonicalName Off
+       ServerSignature On
+       <IfModule mod_userdir.c>
+               UserDir disabled
+       </IfModule>
+</VirtualHost>
+# vim:set syn=apache:

diff --git a/modules/apache2/files/spohr.debian.org/etc/apache2/sites-available/default-debian.org b/modules/apache2/files/spohr.debian.org/etc/apache2/sites-available/default-debian.org
deleted file mode 100644 (file)
index 5d31d53..0000000
--- a/modules/apache2/files/spohr.debian.org/etc/apache2/sites-available/default-debian.org
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-<VirtualHost *:80>
-       ServerAdmin debian-admin@debian.org
-
-       ErrorLog /var/log/apache2/error.log
-       CustomLog /var/log/apache2/access.log combined
-
-       DocumentRoot /srv/www/default.debian.org/htdocs
-
-       Alias /debian /org/mirrors/ftp.debian.org/ftp
-       HostnameLookups Off
-       UseCanonicalName Off
-       ServerSignature On
-       <IfModule mod_userdir.c>
-               UserDir disabled
-       </IfModule>
-</VirtualHost>
-# vim:set syn=apache: