From: Mike Taylor <mike@indexdata.com>
Date: Fri, 14 Nov 2014 11:28:53 +0000 (+0000)
Subject: Towards IR-359
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=2ac630bef1ad6e5777cb858d9b81bea01b29f1c9;p=irspy-moved-to-github.git

Towards IR-359

Fix old developing-on-a-Mac Apache2 config to work with new directory
layout and Apple's own Apache2 instead of the one from MacPorts.
---

diff --git a/web/conf/apache2.0/cartney-dev.conf b/web/conf/apache2.0/cartney-dev.conf
index f20f0be..dbc28d6 100644
--- 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>