Permalink
Browse files

A number of fixed that fix the new Wordpress wizard.

git-svn-id: svn://cherokee-project.com/wizards2@6797 5dc97367-97f1-0310-9951-d761b3857238
  • Loading branch information...
alobbs committed Aug 9, 2011
1 parent 1a9ad5a commit a6a7fe915d714aa3b098d7c8505e81743e6bf5fe
Showing with 15 additions and 9 deletions.
  1. +1 −1 Wizard2.py
  2. +3 −4 wizards/01-Development Platforms/php-fpm.py
  3. +11 −4 wizards/02-Content Management Systems/wordpress.py
View
@@ -68,7 +68,7 @@ def Configure_Cherokee (self):
return []
#
- # Private
+ # Protected
#
def _Register_Child_Wizard (self, wizard_obj):
wizard_obj.params = self.params
@@ -151,6 +151,9 @@ def Configure_Cherokee (self):
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,10 +162,6 @@ def Configure_Cherokee (self):
indexes.append ('index.php')
CTK.cfg['%s!directory_index' %(pre)] = ','.join(indexes)
- # Normalization
- CTK.cfg.normalize('%s!rule'%(pre))
-
-
#
# Helper functions
@@ -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 @@ def Check_Prerequisites (self):
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

0 comments on commit a6a7fe9

Please sign in to comment.