X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Ffreeside-base2.conf;h=1504266cf664fa417490fff713ca389e01b5526a;hb=72ad2f16955e4593891bb851243f8a6de9c3fb80;hp=2f1afcf6e6aea781aa599c5e67fd2a0c0b9282ef;hpb=380df2ee971291598a2b4864a69f067796694b5f;p=freeside.git

diff --git a/htetc/freeside-base2.conf b/htetc/freeside-base2.conf
index 2f1afcf6e..1504266cf 100644
--- a/htetc/freeside-base2.conf
+++ b/htetc/freeside-base2.conf
@@ -8,21 +8,44 @@ PerlModule HTML::Mason::ApacheHandler
 
 PerlRequire "%%%MASON_HANDLER%%%"
 
+PerlChildInitHandler FS::Mason::child_init
+
 #Locale::SubCountry
-AddDefaultCharset ISO-8859-1
+AddDefaultCharset UTF-8
 
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%>
-AuthName Freeside
-AuthType Basic
-AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
-require valid-user
-<Files ~ "(\.cgi|\.html)$">
-SetHandler perl-script
-PerlHandler HTML::Mason
-</Files>
+
+    AuthName Freeside
+    AuthType Basic
+    AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
+    require valid-user
+
+    <Files ~ "(\.cgi|\.html)$">
+        SetHandler perl-script
+        PerlHandler HTML::Mason
+    </Files>
+
 </Directory>
+
+<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/elements/>
+    <Files ~ "(\.html)$">
+        Deny from all
+        SetHandler None
+    </Files>
+</Directory>
+
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Helpers/>
-SetHandler perl-script
-PerlHandler HTML::Mason
+    SetHandler perl-script
+    PerlHandler HTML::Mason
+</Directory>
+
+<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/loginout>
+    AuthName Freeside
+    AuthType Basic
+    AuthUserFile %%%FREESIDE_CONF%%%/htpasswd.logout
+    require valid-user
+    <Files ~ "(\.cgi|\.html)$">
+        SetHandler default-handler
+    </Files>
 </Directory>