Commit 7c9c2e1f authored by Rafael Monnerat's avatar Rafael Monnerat

Remove setSoftwareHome (commented)

parent 0e51f6d5
master allmywork allow_login_change allow_login_change_differentiate_id_and_login allow_login_change_wip arnau arnau-kns arnau-kns-without-property-mapping arnau-merge arnau-poc auto_extend_select_list autoflake backup_erp5_workflow bk_erp5ish_actions_tool bk_sqlcatalog boc-interaction-drop cache catalog_fulltext catalog_fulltext_old cedric cedriclen cedriclen-eos certificate_authority cherries cherry-pick-4a8e045d cleanJSByJSLint clean_up_upgrader compact_title_no_reference credential_update_action datetimefield deferred_listbox devel douglas_forum dream_distributor drop-legacy-simulation eos-dev erp5-component erp5-data-notebook erp5-forum erp5-preference erp5-release erp5-slapos-upgrade erp5-util-testing erp5-vifib erp5-vifib-cleanup erp5_calendar erp5_free_subscription erp5_workflow feature/renderjs-form-error-handling feature/renderjs-formbox feature/renderjs-listbox-columnsort feature/renderjs-reports feature/rjs-listbox-stats fix/accounting_period_constraint_vs_acquired_node fix/change_state_priority fix/login_validate_check_consistency fix_system_processes_ownership for_testrunner_1 for_testrunner_2 formbox gabriel gabriel-fix-rounding-in-accounting-generation gabriel-fix-rounding-in-accounting-generation2 gadget-json-value http_cache_fix improve_default_caching_policy_manager interaction-drop isDeletable item_tracking_graph_editor ivan jerome-bt-reference-doc jerome-test jerome_events jerome_graph_editor_renderjs jerome_new_style_solve_divergence jerome_promise_in_tests jerome_user_preference_time_zone jio jm/form-action-guard joblib-activity kato kns lazy_simulation_causality lignan lingnan listbox-generator mame mame-bt5-cleanup mame-erp5_project-cleanup mame-naming-convention mame-naming-convention-list_method mame-test-stock-indexation mame-work mame2 master-erp5-test-result-scalability master-erp5-test-result-scalability-rebase master-test-fix-additionalbt5path master_calendar_wip_patches master_calendar_wip_patches_extend_security master_no_guard_on_workflow_transition master_no_guard_on_workflow_transition_plus_calendar_wip_patchs merge_xhtml_jquery mmariani-inventory mrp new-render-presentation nexedi-erp5-jp no_longer_simulated_state officejs officejs_clean pere portal_callables portal_solver_process_security_configuration presentation rebased_mrp reindex_calendar_after_change_calendar_exception renderjs/test romain-fulltext scalability-master2 scalability-master2-rebase scalability-rebase shop-box simulation sms_more_than_140_characters strict_catalog syncml test/rjs test/rjsacc test/rjsfull test/tmp test/ui test_page testnode_software_link timezones tristan tristan-merge tristan-performance ttr ttrm upgradeSite view-aggregated-amounts vivekpab_erp5webrenderjs_layoutconfig vivekpab_jabberclient vivekpab_renderjs_interfaces wenjie wenjie_branch xiaowu_newui yryr yryr-components-cp yryr-inventory-cache yryr-test yryr-with-components yusei test-ui test-rjsfull test-rjsacc test-rjs renderjs-test nexedi/master jio-reports-old feature-jio-reports erp5.util-0.4.49 erp5.util-0.4.46 erp5.util-0.4.44 erp5.util-0.4.43 erp5.util-0.4.41 erp5.util-0.4.40 erp5.util-0.4.37 erp5.util-0.4.1 erp5.util-0.4 erp5.util-0.3 erp5.util-0.2 erp5.util-0.1
No related merge requests found
......@@ -296,45 +296,45 @@ class IntrospectionTool(LogMixin, BaseTool):
"""
return getConfiguration().softwarehome
security.declareProtected(Permissions.ManagePortal, 'setSoftwareHome')
def setSoftwareHome(self, relative_path):
"""
EXPERIMENTAL - DEVELOPMENT
#security.declareProtected(Permissions.ManagePortal, 'setSoftwareHome')
#def setSoftwareHome(self, relative_path):
# """
# EXPERIMENTAL - DEVELOPMENT
Set the value of SOFTWARE_HOME for zopectl startup script
or from zope.conf (whichever is most relevant)
# Set the value of SOFTWARE_HOME for zopectl startup script
# or from zope.conf (whichever is most relevant)
Rationale: multiple versions of ERP5 / Zope can be present
at the same time on the same system
# Rationale: multiple versions of ERP5 / Zope can be present
# at the same time on the same system
WARNING: the list of possible path should be protected
if possible (ex. /etc/erp5/software_home)
"""
config = self._loadExternalConfig()
allowed_path_list = config.get("main", "zopehome").split("\n")
base_zope_path = config.get("base", "base_zope_path").split("\n")
path = "%s/%s/lib/python" % (base_zope_path,relative_path)
if path not in allowed_path_list:
raise Unauthorized("You are setting one Unauthorized path as Zope Home.")
# WARNING: the list of possible path should be protected
# if possible (ex. /etc/erp5/software_home)
# """
# config = self._loadExternalConfig()
# allowed_path_list = config.get("main", "zopehome").split("\n")
# base_zope_path = config.get("base", "base_zope_path").split("\n")
# path = "%s/%s/lib/python" % (base_zope_path,relative_path)
#
# if path not in allowed_path_list:
# raise Unauthorized("You are setting one Unauthorized path as Zope Home.")
config_file = self._getZopeConfigurationFile("bin/zopectl")
new_file_list = []
for line in config_file:
if line.startswith("SOFTWARE_HOME="):
# Only comment the line, so it can easily reverted
new_file_list.append("#%s" % (line))
new_file_list.append('SOFTWARE_HOME="%s"\n' % (path))
else:
new_file_list.append(line)
# config_file = self._getZopeConfigurationFile("bin/zopectl")
# new_file_list = []
# for line in config_file:
# if line.startswith("SOFTWARE_HOME="):
# # Only comment the line, so it can easily reverted
# new_file_list.append("#%s" % (line))
# new_file_list.append('SOFTWARE_HOME="%s"\n' % (path))
# else:
# new_file_list.append(line)
config_file.close()
# config_file.close()
# reopen file for write
config_file = self._getZopeConfigurationFile("bin/zopectl", "w")
config_file.write("".join(new_file_list))
config_file.close()
return
# # reopen file for write
# config_file = self._getZopeConfigurationFile("bin/zopectl", "w")
# config_file.write("".join(new_file_list))
# config_file.close()
# return
security.declareProtected(Permissions.ManagePortal, 'getPythonExecutable')
def getPythonExecutable(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment