From: Mike Taylor <mike@indexdata.com>
Date: Fri, 22 Mar 2013 09:34:51 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=commitdiff_plain;h=4ea0039ab12cfd6b1921e0496c0cc4f7daca4e4b;hp=813831baeff1fbcf5ee6b79ec447942dc429331d

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

diff --git a/.gitignore b/.gitignore
index d4567d4..f7bca28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ MYMETA.yml
 Makefile
 blib
 pm_to_blib
+log
diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index 53720a3..6d7573f 100644
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -12,7 +12,7 @@
 
 <VirtualHost *:80>
     ServerName irspy.indexdata.com
-    ServerAlias irspy2.indexdata.com irspy
+    #ServerAlias irspy2.indexdata.com irspy
 
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined