diff --git a/slapos/recipe/erp5_bootstrap/__init__.py b/slapos/recipe/erp5_bootstrap/__init__.py index e19dd2175bf7a1517a3f7a5d729e1c5938e8ad3d..23c68c088bad089f6a6a92287d92a9d331c89b52 100644 --- a/slapos/recipe/erp5_bootstrap/__init__.py +++ b/slapos/recipe/erp5_bootstrap/__init__.py @@ -36,7 +36,7 @@ class Recipe(GenericBaseRecipe): Input: mysql-url - mysql url, must contain connexion informations. + mysql url, must contain connexion informations. zope-url (optional) Url of zope, this url will be parsed to get these values: @@ -70,7 +70,7 @@ class Recipe(GenericBaseRecipe): Boolean, default value: "False" If true erp5 site will fix the site consistency and will use configurator to automaticlly install a - small and medium buisiness. + small and medium buisiness. """ def install(self): @@ -86,7 +86,7 @@ class Recipe(GenericBaseRecipe): # Init zope configuration zope_username = None - zope_password = None + zope_password = None zope_hostname = None zope_port = None zope_protocol = None @@ -105,7 +105,7 @@ class Recipe(GenericBaseRecipe): if self.options.get('zope-port'): zope_port = self.options['zope-port'] elif self.options.get('zope-url'): - zope_port = zope_parsed.port + zope_port = str(zope_parsed.port) else: zope_port = "8080" # Zope username and password diff --git a/slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in b/slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in index ee1494f1d8b26a2549d7619a1b9c2c219589aa83..b7e508dda67734a0cc0fe74bcc12a28a1d5c0778 100644 --- a/slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in +++ b/slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in @@ -10,7 +10,7 @@ host = "%(host)s" site_id = "%(site_id)s" mysql_url = "%(sql_connection_string)s" protocol = "%(protocol)s" -scalability = True +scalability = "%(scalability)s" == "True" erp5_catalog_storage = 'erp5_mysql_innodb_catalog' @@ -20,7 +20,7 @@ header_dict = {'Authorization': 'Basic %%s' %% \ if protocol == 'https': zope_connection = httplib.HTTPSConnection(host) elif protocol == 'http': - zope_connection = httplib.HTTPConnection(host) + zope_connection = httplib.HTTPConnection(host) else: raise ValueError("Protocol not implemented") @@ -35,9 +35,9 @@ if result.status == 204: # and (result.read() == "False"): if protocol == 'https': zope_connection = httplib.HTTPSConnection(host) elif protocol == 'http': - zope_connection = httplib.HTTPConnection(host) + zope_connection = httplib.HTTPConnection(host) else: - raise ValueError("Protocol pot implemented") + raise ValueError("Protocol not implemented") # Create the expected ERP5 instance zope_connection.request( @@ -53,8 +53,8 @@ if result.status == 204: # and (result.read() == "False"): # been done by the same script. result = zope_connection.getresponse() - # Read result make sure the site really finished to - #created the ERP5 site. + # Read result make sure the site really finished to + # created the ERP5 site. result.read() print "ERP5 site created." @@ -72,35 +72,35 @@ if scalability: if protocol == 'https': zope_connection = httplib.HTTPSConnection(host) elif protocol == 'http': - zope_connection = httplib.HTTPConnection(host) + zope_connection = httplib.HTTPConnection(host) else: raise ValueError("Protocol not implemented") zope_connection.request( 'POST', '/ERP5Site_updateConfigurationConsistency', urllib.urlencode({ 'update_method': 'ERP5Site_updateConfigurationConsistency', - 'dialog_id'='ERP5Site_viewCheckConsistency', - 'cancel_url'=cancel_url, - 'dialog_method'='ERP5Site_fixConfigurationConsistency', - 'dialog_category'='None', - 'object_path'='%2Ferp5', - 'form_id'='view', - 'select_favorite'='', - 'select_module'='', - 'select_language'='en', - 'all_languages'='1', - 'field_your_search_text'='Search', - 'default_field_your_enable_alarm%3Aint'='0', - 'field_your_enable_alarm'='on', - 'list_selection_name'='erp5_site_check_consistency_selection', - 'listbox_list_selection_name'='erp5_site_check_consistency_selection', - 'md5_object_uid_list'='d751713988987e9331980363e24189ce', - 'listbox_title'='', - 'uids%3Alist'='598', - 'listbox_uid%3Alist'='598', - 'listbox_uid%3Alist'='595', - 'listbox_uid%3Alist'='599', - 'Base_callDialogMethod%3Amethod'='', + 'dialog_id':'ERP5Site_viewCheckConsistency', + 'cancel_url':cancel_url, + 'dialog_method':'ERP5Site_fixConfigurationConsistency', + 'dialog_category':'None', + 'object_path':'%2Ferp5', + 'form_id':'view', + 'select_favorite':'', + 'select_module':'', + 'select_language':'en', + 'all_languages':'1', + 'field_your_search_text':'Search', + 'default_field_your_enable_alarm%3Aint':'0', + 'field_your_enable_alarm':'on', + 'list_selection_name':'erp5_site_check_consistency_selection', + 'listbox_list_selection_name':'erp5_site_check_consistency_selection', + 'md5_object_uid_list':'d751713988987e9331980363e24189ce', + 'listbox_title':'', + 'uids%3Alist':'598', + 'listbox_uid%3Alist':'598', + 'listbox_uid%3Alist':'595', + 'listbox_uid%3Alist':'599', + 'Base_callDialogMethod%3Amethod':'', }), headers=header_dict) @@ -117,5 +117,3 @@ if scalability: if configurator_available and not configurator_already_applied: # install small and medium business via configurator pass - -