Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --git a/bin/pod2x b/bin/pod2x
index 1ec998f..64ccf88 100755 (executable)
--- a/bin/pod2x
+++ b/bin/pod2x
@@ -6,9 +6,7 @@ my $mw_username = 'ivan';
 chomp( my $mw_password = `cat .mw-password` );
 
 my $site_perl = "./FS";
-#my $html = "Freeside:1.7:Documentation:Developer";
-#my $html = "Freeside:1.9:Documentation:Developer";
-my $html = "Freeside:3:Documentation:Developer";
+my $html = "Freeside:5:Documentation:Developer";
 
 foreach my $dir (
   $html,

diff --git a/htetc/freeside-base2.4.conf b/htetc/freeside-base2.4.conf
index 3396340..c6b1fd7 100644 (file)
--- a/htetc/freeside-base2.4.conf
+++ b/htetc/freeside-base2.4.conf
@@ -63,6 +63,11 @@ PerlSetVar FreesideHttpOnly 1
     <Files "freeside.css">
         Satisfy any
     </Files>
+
+    <Files ~ "(\.html)$">
+        Deny from all
+        SetHandler None
+    </Files>
 </Directory>
 
 <Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Helpers/>