From: Stephen Gran Date: Sat, 17 Oct 2009 11:07:02 +0000 (+0100) Subject: um, need to put it in the right place X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b6f3bc135d632ee23d81ea23150d0c42c0ffc0ee;p=dsa-puppet.git um, need to put it in the right place Signed-off-by: Stephen Gran --- 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 index 00000000..5d31d531 --- /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 +## + + + 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 + + UserDir disabled + + +# 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 index 5d31d531..00000000 --- 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 -## - - - 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 - - UserDir disabled - - -# vim:set syn=apache: