X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=web%2Fconf%2Fapache2.0%2Fcartney-dev.conf;h=dbc28d6b52d5ce9b639581c8860f155ed28504ea;hb=HEAD;hp=7f3ae9836978571ea28332c31de6c57bd2a5c9f6;hpb=3449efcc9b1fd02f9ccbe3808f54c39b7b6c8fda;p=irspy-moved-to-github.git

diff --git a/web/conf/apache2.0/cartney-dev.conf b/web/conf/apache2.0/cartney-dev.conf
index 7f3ae98..dbc28d6 100644
--- a/web/conf/apache2.0/cartney-dev.conf
+++ b/web/conf/apache2.0/cartney-dev.conf
@@ -4,7 +4,14 @@
 # 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:
+#	Undefined subroutine &ZOOM::IRSpy::connect_to_registry
+# (This ought not to make any difference, as the Apache2::Request
+# module should of course get loaded from within IRSpy anyway, but you
+# never know with Apache.)
 PerlModule Apache2::Request
 
 <VirtualHost *:80>
@@ -13,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
@@ -23,17 +30,24 @@ 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>
+
+    ProxyRequests off
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+    </Proxy>
+    ProxyPass         /toroid/ http://localhost:12367/
+    ProxyPassReverse  /toroid/ http://localhost:12367/
 </VirtualHost>