template AuthUserFile htpasswd to be in FREESIDE_CONF dir instead of hardcoded location

diff --git a/htetc/freeside-base1.99.conf b/htetc/freeside-base1.99.conf
index c1c187c..8e890e6 100644 (file)
--- a/htetc/freeside-base1.99.conf
+++ b/htetc/freeside-base1.99.conf
@@ -11,7 +11,7 @@ PerlRequire "%%%MASON_HANDLER%%%"
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
 AuthName Freeside
 AuthType Basic
-AuthUserFile /usr/local/etc/freeside/htpasswd
+AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
 require valid-user
 <Files ~ (\.cgi|\.html)>
 SetHandler perl-script

diff --git a/htetc/freeside-base1.conf b/htetc/freeside-base1.conf
index 3f6bd0e..73962a7 100644 (file)
--- a/htetc/freeside-base1.conf
+++ b/htetc/freeside-base1.conf
@@ -5,7 +5,7 @@ PerlModule HTML::Mason
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
 AuthName Freeside
 AuthType Basic
-AuthUserFile /usr/local/etc/freeside/htpasswd
+AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
 require valid-user
 <Files ~ (\.cgi|\.html)>
 AddHandler perl-script .cgi .html

diff --git a/htetc/freeside-base2.conf b/htetc/freeside-base2.conf
index 38f7840..6606129 100644 (file)
--- a/htetc/freeside-base2.conf
+++ b/htetc/freeside-base2.conf
@@ -11,7 +11,7 @@ PerlRequire "%%%MASON_HANDLER%%%"
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
 AuthName Freeside
 AuthType Basic
-AuthUserFile /usr/local/etc/freeside/htpasswd
+AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
 require valid-user
 <Files ~ (\.cgi|\.html)>
 SetHandler perl-script