more path fixes

diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf
index d7b24bb..d7bc973 100644 (file)
--- a/web/conf/apache2.0/irspy.conf
+++ b/web/conf/apache2.0/irspy.conf
@@ -3,11 +3,11 @@
 # Sample configuration for running an IRSpy web-site under Apache 2.x.
 #
 # This is the configuration that I use on the development machine 
 # Sample configuration for running an IRSpy web-site under Apache 2.x.
 #
 # This is the configuration that I use on the development machine 

-#      /usr/local/src/git/indexdata/irspy
+#      /usr/local/src/git/irspy

 #
 # This file can be included in the Apache configuration by adding a
 # line like this to apache.conf or one of its included files:
 #
 # This file can be included in the Apache configuration by adding a
 # line like this to apache.conf or one of its included files:

-#      Include /usr/local/src/git/indexdata/irspy/web/conf/apache2.0/irspy.conf
+#      Include /usr/local/src/git/irspy/web/conf/apache2.0/irspy.conf

 #
 # For debian & unbuntu: please read irspy/README for a list of depending packages
 #
 #
 # For debian & unbuntu: please read irspy/README for a list of depending packages
 #

@@ -18,7 +18,7 @@
 
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined
 
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined

-    DocumentRoot /usr/local/src/git/indexdata/irspy/web/htdocs
+    DocumentRoot /usr/local/src/git/irspy/web/htdocs

     <FilesMatch "\.(html|css)$">
      SetHandler perl-script
      PerlHandler HTML::Mason::ApacheHandler
     <FilesMatch "\.(html|css)$">
      SetHandler perl-script
      PerlHandler HTML::Mason::ApacheHandler

@@ -26,19 +26,19 @@
 
     PerlSetVar MasonArgsMethod mod_perl
 
 
     PerlSetVar MasonArgsMethod mod_perl
 

-    PerlAddVar MasonCompRoot "private => /usr/local/src/git/indexdata/irspy/web/htdocs"
-    PerlSetVar MasonDataDir              /usr/local/src/git/indexdata/irspy/web/data
-    PerlSetVar IRSpyLibDir               /usr/local/src/git/indexdata/irspy/lib
-    PerlSetEnv PERL5LIB /usr/local/src/git/indexdata/irspy/lib
+    PerlAddVar MasonCompRoot "private => /usr/local/src/git/irspy/web/htdocs"
+    PerlSetVar MasonDataDir              /usr/local/src/git/irspy/web/data
+    PerlSetVar IRSpyLibDir               /usr/local/src/git/irspy/lib
+    PerlSetEnv PERL5LIB /usr/local/src/git/irspy/lib

 
    # We need +Parent to make PerlSwitches -I work properly ... don't ask.
    PerlOptions +Parent
 
    # We need +Parent to make PerlSwitches -I work properly ... don't ask.
    PerlOptions +Parent

-   PerlSwitches -I/usr/local/src/git/indexdata/irspy/lib
+   PerlSwitches -I/usr/local/src/git/irspy/lib

 
     <Location /admin>
        AuthType Basic
        AuthName "IRSpy Administration"
 
     <Location /admin>
        AuthType Basic
        AuthName "IRSpy Administration"

-       AuthUserFile /usr/local/src/git/indexdata/irspy/web/conf/htpasswd
+       AuthUserFile /usr/local/src/git/irspy/web/conf/htpasswd

        Require user admin
     </Location>
 </VirtualHost>
        Require user admin
     </Location>
 </VirtualHost>