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

Conflicts:
	web/conf/apache2.0/irspy.conf

diff --git a/bin/irspy-nagios.pl b/bin/irspy-nagios.pl
index 8ec764b..1e4a0fb 100755 (executable)
--- a/bin/irspy-nagios.pl
+++ b/bin/irspy-nagios.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Copyright (c) 2013 IndexData ApS, http://indexdata.com
+# Copyright (c) 2013 Index Data ApS, http://indexdata.com
 #
 # irspy-nagios.pl - check if IRSpy updates run
 

diff --git a/web/conf/apache2.0/cartney-dev.conf b/web/conf/apache2.0/cartney-dev.conf
index f20f0be..dbc28d6 100644 (file)
--- a/web/conf/apache2.0/cartney-dev.conf
+++ b/web/conf/apache2.0/cartney-dev.conf
@@ -4,7 +4,7 @@
 # See comments in mk2-config-cmc/apache/cmc-dev-mac.conf for details
 # on running HTML::Mason-based sites under the apache2 port for Macs.
 
-PerlSwitches -I/usr/local/src/git/irspy/lib
+PerlSwitches -I/Users/mike/git/work/irspy/lib -I/Users/mike/git/work/ZOOM-Perl/blib/lib -I/Users/mike/git/work/ZOOM-Perl/blib/arch
 
 # Empirally, it seems that including this next line prevents the bug
 # in which some but not all requests result in the error:
@@ -20,9 +20,9 @@ PerlModule Apache2::Request
         Allow from all
     </Directory>
 
-    ErrorLog     /opt/local/apache2/logs/irspy-error.log
-    CustomLog    /opt/local/apache2/logs/irspy-access.log combined
-    DocumentRoot /usr/local/src/git/irspy/web/htdocs
+    ErrorLog        /var/log/apache2/irspy-error.log
+    CustomLog       /var/log/apache2/irspy-access.log combined
+    DocumentRoot /Users/mike/git/work/irspy/web/htdocs
     <FilesMatch "\.(html|css)$">
      SetHandler perl-script
      PerlHandler HTML::Mason::ApacheHandler
@@ -30,16 +30,15 @@ PerlModule Apache2::Request
 
     PerlSetVar MasonArgsMethod mod_perl
 
-    PerlAddVar MasonCompRoot "private => /usr/local/src/git/irspy/web/htdocs"
+    PerlAddVar MasonCompRoot "private => /Users/mike/git/work/irspy/web/htdocs"
     PerlSetVar MasonDataDir /tmp/irspy-mason
     # IRSpyLibDir is used only to find source for online documentation
-    PerlSetVar IRSpyLibDir /usr/local/src/git/irspy/lib
-    PerlSetEnv PERL5LIB /usr/local/src/git/irspy/lib
+    PerlSetVar IRSpyLibDir /Users/mike/git/work/irspy/lib
 
     <Location /admin>
        AuthType Basic
        AuthName "IRSpy Administration"
-       AuthUserFile /usr/local/src/git/irspy/web/conf/htpasswd
+       AuthUserFile /Users/mike/git/work/irspy/web/conf/htpasswd
        Require user admin
     </Location>
 

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index dec404e..3ba0447 100644 (file)
--- 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 irspy-dev
+    ServerAlias irspy02.indexdata.com irspy irspy-dev.indexdata.com irspy-dev
 
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined