X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=etc%2Fkoha-httpd.conf;h=6233c9d2d69cc84a2f1b029487aaad0ce61bb581;hb=47bd795b828c7b99524145fe337ea0c6ac7d588f;hp=dc82d08a394edb563f9766d2fbd58aee32ff78a7;hpb=60186fa42fa0742eb3e8484f1fd4b16e04d32ae1;p=koha_fer

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
index dc82d08a39..6233c9d2d6 100644
--- a/etc/koha-httpd.conf
+++ b/etc/koha-httpd.conf
@@ -20,6 +20,23 @@
    SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
    SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
 
+  # This syntax allows you to override a system preference
+  # for a given virtual host. Use with caution!
+  # You should add all the system preferences you override
+  # in one or more vhosts to the environment variable
+  # OVERRIDE_SYSPREF_NAMES for your staff intranet vhost
+# SevEnv OVERRIDE_SYSPREF_PrefName
+
+   <Directory "__OPAC_WWW_DIR__">
+      Options -Indexes
+   </Directory>
+
+   # Secure internal stuff
+   <DirectoryMatch "__OPAC_WWW_DIR__/.*/(modules|xslt|includes)">
+      Order deny,allow
+      Deny from all
+   </DirectoryMatch>
+
    <IfModule mod_gzip.c>
      mod_gzip_on yes
      mod_gzip_dechunk yes
@@ -82,18 +99,20 @@
    ErrorDocument 404 /cgi-bin/koha/errors/404.pl
    ErrorDocument 500 /cgi-bin/koha/errors/500.pl
 
-#  Rewrite Rules
-   RewriteEngine On
+   <IfModule mod_rewrite.c>
+     # Rewrite Rules
+     RewriteEngine On
 
-#  Uncomment to turn on rewrite logging
-#  RewriteLog __LOG_DIR__/koha-opac-rewrite.log
-#  RewriteLogLevel 1
-   RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*)
-   RewriteRule (.+) $1?%1%2 [N,R,NE]
+     # Uncomment to turn on rewrite logging
+     #RewriteLog __LOG_DIR__/koha-opac-rewrite.log
+     #RewriteLogLevel 1
 
-   RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT]
-   RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
-   RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
+     RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*)
+     #RewriteRule (.+) $1?%1%2 [N,R,NE]
+     RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/opac-detail\.pl?bib=$1 [PT]
+     RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
+     RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
+   </IfModule>
 </VirtualHost>
 
 ## Intranet
@@ -105,6 +124,7 @@
    ScriptAlias /cgi-bin/koha/ "__INTRANET_CGI_DIR__/"
    ScriptAlias /index.html "__INTRANET_CGI_DIR__/mainpage.pl"
    ScriptAlias /search "__INTRANET_CGI_DIR__/search.pl"
+   Alias /plugin/ "__PLUGINS_DIR__/"
    ErrorLog __LOG_DIR__/koha-error_log
 #  TransferLog __LOG_DIR__/koha-access.log
    SetEnv KOHA_CONF "__KOHA_CONF_DIR__/koha-conf.xml"
@@ -113,12 +133,27 @@
    SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
    Options +FollowSymLinks
 
+   # If you are overriding any system preferences,
+   # list them in this variable so the preference editor
+   # knows that they have been overridden.
+#  SevEnv OVERRIDE_SYSPREF_NAMES "Pref1,Pref2,Pref3"
+
    ErrorDocument 400 /cgi-bin/koha/errors/400.pl
    ErrorDocument 401 /cgi-bin/koha/errors/401.pl
    ErrorDocument 403 /cgi-bin/koha/errors/403.pl
    ErrorDocument 404 /cgi-bin/koha/errors/404.pl
    ErrorDocument 500 /cgi-bin/koha/errors/500.pl
 
+   <Directory "__INTRANET_WWW_DIR__">
+      Options -Indexes
+   </Directory>
+
+   # Secure internal stuff
+   <DirectoryMatch "__INTRANET_WWW_DIR__/.*/(modules|xslt|includes)">
+      Order deny,allow
+      Deny from all
+   </DirectoryMatch>
+
    <IfModule mod_gzip.c>
      mod_gzip_on yes
      mod_gzip_dechunk yes
@@ -166,14 +201,18 @@
      </IfModule>
   </IfModule>
 
-   RewriteEngine On    
-#  Uncomment to turn on rewrite logging
-#  RewriteLog __LOG_DIR__/koha-intranet-rewrite.log
-#  RewriteLogLevel 1
+   <IfModule mod_rewrite.c>
+     # Rewrite Rules
+     RewriteEngine On
+
+     # Uncomment to turn on rewrite logging
+     #RewriteLog __LOG_DIR__/koha-intranet-rewrite.log
+     #RewriteLogLevel 1
 
-   RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*)
-   RewriteRule (.+) $1?%1%2 [N,R,NE]
-   RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT]
-   RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
-   RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
+     RewriteCond %{QUERY_STRING} (.*?)(?:[A-Za-z0-9_-]+)=&(.*)
+     #RewriteRule (.+) $1?%1%2 [N,R,NE]
+     RewriteRule ^/bib/([^\/]*)/?$ /cgi-bin/koha/detail\.pl?bib=$1 [PT]
+     RewriteRule ^/isbn/([^\/]*)/?$ /search?q=isbn:$1 [PT]
+     RewriteRule ^/issn/([^\/]*)/?$ /search?q=issn:$1 [PT]
+   </IfModule>
 </VirtualHost>