cherokee at cherokee-project
Oct 13, 2009, 2:43 PM
Post #1 of 1
(126 views)
Permalink
|
|
[3696] cherokee/trunk/admin/Wizard_Drupal.py: Adds extra rule to the wizard .
|
|
Revision: 3696
http://svn.cherokee-project.com/changeset/3696
Author: taher
Date: 2009-10-13 23:43:37 +0200 (Tue, 13 Oct 2009)
Log Message:
-----------
Adds extra rule to the wizard. RFE http://bugs.cherokee-project.com/586
Modified Paths:
--------------
cherokee/trunk/admin/Wizard_Drupal.py
Modified: cherokee/trunk/admin/Wizard_Drupal.py
===================================================================
--- cherokee/trunk/admin/Wizard_Drupal.py 2009-10-10 02:38:16 UTC (rev 3695)
+++ cherokee/trunk/admin/Wizard_Drupal.py 2009-10-13 21:43:37 UTC (rev 3696)
@@ -14,17 +14,23 @@
ERROR_NO_HOST = _("A host name must be provided.")
CONFIG_DIR = """
-%(pre_rule_plus2)s!match = request
-%(pre_rule_plus2)s!match!request = ^%(web_dir)s/$
-%(pre_rule_plus2)s!handler = redir
-%(pre_rule_plus2)s!handler!rewrite!1!show = 0
-%(pre_rule_plus2)s!handler!rewrite!1!substring = %(web_dir)s/index.php
+%(pre_rule_plus3)s!match = request
+%(pre_rule_plus3)s!match!request = ^%(web_dir)s/$
+%(pre_rule_plus3)s!handler = redir
+%(pre_rule_plus3)s!handler!rewrite!1!show = 0
+%(pre_rule_plus3)s!handler!rewrite!1!substring = %(web_dir)s/index.php
-%(pre_rule_plus1)s!match = directory
-%(pre_rule_plus1)s!match!directory = %(web_dir)s
-%(pre_rule_plus1)s!match!final = 0
-%(pre_rule_plus1)s!document_root = %(local_src_dir)s
+%(pre_rule_plus2)s!match = directory
+%(pre_rule_plus2)s!match!directory = %(web_dir)s
+%(pre_rule_plus2)s!match!final = 0
+%(pre_rule_plus2)s!document_root = %(local_src_dir)s
+%(pre_rule_plus1)s!match = and
+%(pre_rule_plus1)s!match!left = directory
+%(pre_rule_plus1)s!match!left!directory = %(web_dir)s
+%(pre_rule_plus1)s!match!right = request
+%(pre_rule_plus1)s!match!right!request = \.(engine|inc|info|install|module|profile|test|po|sh|.*sql|theme|tpl(\.php)?|xtmpl|svn-base)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template|all-wcprops|entries|format)$
+
# IMPORTANT: The PHP rule comes here
%(pre_rule_minus1)s!match = and
@@ -51,6 +57,11 @@
%(pre_vsrv)s!document_root = %(local_src_dir)s
%(pre_vsrv)s!directory_index = index.php,index.html
+%(pre_rule_plus2)s!match = request
+%(pre_rule_plus2)s!match!request = \.(engine|inc|info|install|module|profile|test|po|sh|.*sql|theme|tpl(\.php)?|xtmpl|svn-base)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template|all-wcprops|entries|format)$
+%(pre_rule_plus2)s!handler = custom_error
+%(pre_rule_plus2)s!handler!error = 403
+
%(pre_rule_plus1)s!match = fullpath
%(pre_rule_plus1)s!match!fullpath!1 = /
%(pre_rule_plus1)s!handler = redir
@@ -151,6 +162,7 @@
php_info = wizard_php_get_info (self._cfg, pre_vsrv)
php_rule = int (php_info['rule'].split('!')[-1])
+ pre_rule_plus2 = "%s!rule!%d" % (pre_vsrv, php_rule + 2)
pre_rule_plus1 = "%s!rule!%d" % (pre_vsrv, php_rule + 1)
pre_rule_minus1 = "%s!rule!%d" % (pre_vsrv, php_rule - 1)
pre_rule_minus2 = "%s!rule!%d" % (pre_vsrv, php_rule - 2)
@@ -214,6 +226,7 @@
php_info = wizard_php_get_info (self._cfg, self._pre)
php_rule = int (php_info['rule'].split('!')[-1])
+ pre_rule_plus3 = "%s!rule!%d" % (self._pre, php_rule + 3)
pre_rule_plus2 = "%s!rule!%d" % (self._pre, php_rule + 2)
pre_rule_plus1 = "%s!rule!%d" % (self._pre, php_rule + 1)
pre_rule_minus1 = "%s!rule!%d" % (self._pre, php_rule - 1)
|
