From: John Malconian <malc@indexdata.com>
Date: Fri, 7 Nov 2014 16:42:36 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=354b9d20635973121f3ce09d187e49070e8cce8e;hp=264b70886ef245894b6d0ac8cf9e77aa14bb7ad8;p=irspy-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
---

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index e735586..ebdd477 100644
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -19,7 +19,7 @@ MaxClients 32
 
 <VirtualHost *:80>
     ServerName irspy.indexdata.com
-    ServerAlias irspy2.indexdata.com irspy irspy-dev.indexdata.com
+    ServerAlias irspy02.indexdata.com irspy irspy-dev.indexdata.com
 
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined
@@ -46,7 +46,7 @@ MaxClients 32
 	AuthType Basic
 	AuthName "IRSpy Administration"
 	AuthUserFile /home/indexdata/irspy/web/conf/htpasswd
-	Require user admin
+	Require user admin irspy
     </Location>
 
     ProxyRequests off