cherokee at cherokee-project
Aug 9, 2011, 6:55 AM
Post #1 of 1
(132 views)
Permalink
|
|
[6797] wizards2: A number of fixed that fix the new Wordpress wizard.
|
|
Revision: 6797
http://svn.cherokee-project.com/changeset/6797
Author: alo
Date: 2011-08-09 15:55:13 +0200 (Tue, 09 Aug 2011)
Log Message:
-----------
A number of fixed that fix the new Wordpress wizard.
Modified Paths:
--------------
wizards2/Wizard2.py
wizards2/wizards/01-Development Platforms/php-fpm.py
wizards2/wizards/02-Content Management Systems/wordpress.py
Modified: wizards2/Wizard2.py
===================================================================
--- wizards2/Wizard2.py 2011-08-08 16:34:01 UTC (rev 6796)
+++ wizards2/Wizard2.py 2011-08-09 13:55:13 UTC (rev 6797)
@@ -68,7 +68,7 @@
return []
#
- # Private
+ # Protected
#
def _Register_Child_Wizard (self, wizard_obj):
wizard_obj.params = self.params
Modified: wizards2/wizards/01-Development Platforms/php-fpm.py
===================================================================
--- wizards2/wizards/01-Development Platforms/php-fpm.py 2011-08-08 16:34:01 UTC (rev 6796)
+++ wizards2/wizards/01-Development Platforms/php-fpm.py 2011-08-09 13:55:13 UTC (rev 6797)
@@ -151,6 +151,9 @@
if int(self.params.get('flcache', "1")):
CTK.cfg['%s!flcache' %(next)] = 'allow'
+ # Normalization
+ CTK.cfg.normalize('%s!rule'%(pre))
+
self.rule = _find_rule(pre)
# Index files
@@ -159,11 +162,7 @@
indexes.append ('index.php')
CTK.cfg['%s!directory_index' %(pre)] = ','.join(indexes)
- # Normalization
- CTK.cfg.normalize('%s!rule'%(pre))
-
-
#
# Helper functions
#
Modified: wizards2/wizards/02-Content Management Systems/wordpress.py
===================================================================
--- wizards2/wizards/02-Content Management Systems/wordpress.py 2011-08-08 16:34:01 UTC (rev 6796)
+++ wizards2/wizards/02-Content Management Systems/wordpress.py 2011-08-09 13:55:13 UTC (rev 6797)
@@ -32,7 +32,7 @@
CONFIG_VSERVER = """
vserver!%(vserver_num)s!nick = %(vserver_nick)s
-vserver!%(vserver_num)s!document_root = %(app_dir)s/wordpress
+vserver!%(vserver_num)s!document_root = %(app_dir)s
vserver!%(vserver_num)s!directory_index = index.php,index.html
# The PHP rule comes here
@@ -63,7 +63,7 @@
%(pre_rule_plus1)s!match = directory
%(pre_rule_plus1)s!match!directory = %(directory)s
%(pre_rule_plus1)s!match!final = 0
-%(pre_rule_plus1)s!document_root = %(app_dir)s/wordpress
+%(pre_rule_plus1)s!document_root = %(app_dir)s
# The PHP rule comes here
@@ -113,9 +113,16 @@
errors += self._Prerequisite__MySQL()
return errors
+ def _Handle_Unpacking (self):
+ # Unpack
+ errors = php_tpl.Install._Handle_Unpacking (self)
+ if errors: return errors
+
+ # Update app_dir, WP is in a subdir
+ self.app_dir = os.path.join (self.app_dir, "wordpress")
+
def Check_PostUnpack (self):
- errors = self._Check_File_Exists ('wp-comments-post.php')
- return errors
+ return self._Check_File_Exists ('wp-comments-post.php')
#
# GUI
|
