From 688a2f2f8d457bf5fca2a2dd87266a15b9bcd9a4 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Tue, 6 Apr 2010 13:19:07 +0000 Subject: [PATCH] path cleanups --- web/conf/apache2.0/irspy.conf | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/web/conf/apache2.0/irspy.conf b/web/conf/apache2.0/irspy.conf index 10d4622..5e87206 100644 --- 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 us2 -# /home/wosch/indexdata/irspy +# /usr/local/src/git/indexdata/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: -# Include /home/wosch/indexdata/irspy/web/conf/apache2.0/cfspy.conf +# Include /usr/local/src/git/indexdata/irspy/web/conf/apache2.0/irspy.conf # # When running on Ubuntu (and probably Debian), don't forget to # install libapache-request-perl as well as libhtml-mason-perl, @@ -21,11 +21,12 @@ #NameVirtualHost 192.168.1.75 - ServerName cfspy.indexdata.com + ServerName irspy.indexdata.com + ServerAlias irspy2.indexdata.com irspy - ErrorLog /var/log/apache2/cfspy-error.log - CustomLog /var/log/apache2/cfspy-access.log combined - DocumentRoot /home/wosch/indexdata/irspy/web/htdocs + ErrorLog /var/log/apache2/irspy-error.log + CustomLog /var/log/apache2/irspy-access.log combined + DocumentRoot /usr/local/src/git/indexdata/irspy/web/htdocs SetHandler perl-script PerlHandler HTML::Mason::ApacheHandler @@ -33,19 +34,19 @@ PerlSetVar MasonArgsMethod mod_perl - PerlAddVar MasonCompRoot "private => /home/wosch/indexdata/irspy/web/htdocs" - PerlSetVar MasonDataDir /home/wosch/indexdata/irspy/web/data - PerlSetVar IRSpyLibDir /home/wosch/indexdata/irspy/lib - PerlSetEnv PERL5LIB /home/wosch/indexdata/irspy/lib + 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 # We need +Parent to make PerlSwitches -I work properly ... don't ask. PerlOptions +Parent - PerlSwitches -I/home/wosch/indexdata/irspy/lib + PerlSwitches -I/usr/local/src/git/indexdata/irspy/lib AuthType Basic AuthName "IRSpy Administration" - AuthUserFile /home/wosch/indexdata/irspy/web/conf/htpasswd + AuthUserFile /usr/local/src/git/indexdata/irspy/web/conf/htpasswd Require user admin -- 1.7.10.4