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

[irspy-moved-to-github.git] / web / conf / apache2.0 / xeno-dev.conf

diff --git a/web/conf/apache2.0/xeno-dev.conf b/web/conf/apache2.0/xeno-dev.conf
index c86e46d..3cf2831 100644 (file)
--- a/web/conf/apache2.0/xeno-dev.conf
+++ b/web/conf/apache2.0/xeno-dev.conf
@@ -4,9 +4,14 @@
 <VirtualHost *:80>
     ServerName x.irspy.indexdata.com
 
+    <Directory />
+        Allow from all
+       Require all granted
+    </Directory>
+
     ErrorLog     /var/log/apache2/irspy-error.log
     CustomLog    /var/log/apache2/irspy-access.log combined
-    DocumentRoot /usr/local/src/git/irspy/web/htdocs
+    DocumentRoot /home/mike/git/work/irspy/web/htdocs
     <FilesMatch "\.(html|css)$">
      SetHandler perl-script
      PerlHandler HTML::Mason::ApacheHandler
@@ -14,20 +19,20 @@
 
     PerlSetVar MasonArgsMethod mod_perl
 
-    PerlAddVar MasonCompRoot "private => /usr/local/src/git/irspy/web/htdocs"
+    PerlAddVar MasonCompRoot "private => /home/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 /home/mike/git/work/irspy/lib
+    PerlSetEnv IRSPY_COUNTER_FILE /home/mike/git/work/irspy/zebra/db/counter
 
-   # We need +Parent to make PerlSwitches -I work properly ... don't ask.
-   PerlOptions +Parent
-   PerlSwitches -I/usr/local/src/git/irspy/lib
+    # We need +Parent to make PerlSwitches -I work properly ... don't ask.
+    PerlOptions +Parent
+    PerlSwitches -I/home/mike/git/work/irspy/lib -I/home/mike/git/work/perl-indexdata-utils/lib
 
     <Location /admin>
        AuthType Basic
        AuthName "IRSpy Administration"
-       AuthUserFile /usr/local/src/git/irspy/web/conf/htpasswd
+       AuthUserFile /home/mike/git/work/irspy/web/conf/htpasswd
        Require user admin
     </Location>
 </VirtualHost>