YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove APPS_DEFAULT_PHP_VERSION from the core

Browse source
This commit is contained in:
Kay0u 2020-04-12 23:43:39 +02:00
parent b20b7f3a85
commit 23c6ca5236
No known key found for this signature in database
GPG key ID: AE1DCADB6415A156
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/app.py
View file

@ -59,7 +59,6 @@ APPS_CATALOG_CONF = '/etc/yunohost/apps_catalog.yml'
APPS_CATALOG_CRON_PATH = "/etc/cron.daily/yunohost-fetch-apps-catalog" APPS_CATALOG_CRON_PATH = "/etc/cron.daily/yunohost-fetch-apps-catalog"
APPS_CATALOG_API_VERSION = 2 APPS_CATALOG_API_VERSION = 2
APPS_CATALOG_DEFAULT_URL = "https://app.yunohost.org/default" APPS_CATALOG_DEFAULT_URL = "https://app.yunohost.org/default"
APPS_DEFAULT_PHP_VERSION = "7.0"
re_github_repo = re.compile( re_github_repo = re.compile(
r'^(http[s]?://|git@)github.com[/:]' r'^(http[s]?://|git@)github.com[/:]'
@ -348,7 +347,6 @@ def app_change_url(operation_logger, app, domain, path):
env_dict["YNH_APP_ID"] = app_id env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app env_dict["YNH_APP_INSTANCE_NAME"] = app
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
env_dict["YNH_APP_OLD_DOMAIN"] = old_domain env_dict["YNH_APP_OLD_DOMAIN"] = old_domain
env_dict["YNH_APP_OLD_PATH"] = old_path env_dict["YNH_APP_OLD_PATH"] = old_path
@ -485,7 +483,6 @@ def app_upgrade(app=[], url=None, file=None):
env_dict["YNH_APP_ID"] = app_id env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
# Start register change on system # Start register change on system
related_to = [('app', app_instance_name)] related_to = [('app', app_instance_name)]
@ -698,7 +695,6 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
env_dict["YNH_APP_ID"] = app_id env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(instance_number) env_dict["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
# Start register change on system # Start register change on system
operation_logger.extra.update({'env': env_dict}) operation_logger.extra.update({'env': env_dict})
@ -807,7 +803,6 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
env_dict_remove["YNH_APP_ID"] = app_id env_dict_remove["YNH_APP_ID"] = app_id
env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(instance_number) env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(instance_number)
env_dict_remove["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
# Execute remove script # Execute remove script
operation_logger_remove = OperationLogger('remove_on_failed_install', operation_logger_remove = OperationLogger('remove_on_failed_install',
@ -985,7 +980,6 @@ def app_remove(operation_logger, app):
env_dict["YNH_APP_ID"] = app_id env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app env_dict["YNH_APP_INSTANCE_NAME"] = app
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
operation_logger.extra.update({'env': env_dict}) operation_logger.extra.update({'env': env_dict})
operation_logger.flush() operation_logger.flush()
@ -1410,7 +1404,6 @@ def app_action_run(operation_logger, app, action, args=None):
env_dict["YNH_APP_ID"] = app_id env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app env_dict["YNH_APP_INSTANCE_NAME"] = app
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
env_dict["YNH_ACTION"] = action env_dict["YNH_ACTION"] = action
_, path = tempfile.mkstemp() _, path = tempfile.mkstemp()
@ -1474,7 +1467,6 @@ def app_config_show_panel(operation_logger, app):
"YNH_APP_ID": app_id, "YNH_APP_ID": app_id,
"YNH_APP_INSTANCE_NAME": app, "YNH_APP_INSTANCE_NAME": app,
"YNH_APP_INSTANCE_NUMBER": str(app_instance_nb), "YNH_APP_INSTANCE_NUMBER": str(app_instance_nb),
"YNH_DEFAULT_PHP_VERSION": APPS_DEFAULT_PHP_VERSION,
} }
return_code, parsed_values = hook_exec(config_script, return_code, parsed_values = hook_exec(config_script,
@ -1548,7 +1540,6 @@ def app_config_apply(operation_logger, app, args):
"YNH_APP_ID": app_id, "YNH_APP_ID": app_id,
"YNH_APP_INSTANCE_NAME": app, "YNH_APP_INSTANCE_NAME": app,
"YNH_APP_INSTANCE_NUMBER": str(app_instance_nb), "YNH_APP_INSTANCE_NUMBER": str(app_instance_nb),
"YNH_DEFAULT_PHP_VERSION": APPS_DEFAULT_PHP_VERSION,
} }
args = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {} args = dict(urlparse.parse_qsl(args, keep_blank_values=True)) if args else {}

4
src/yunohost/backup.py
View file

@ -51,7 +51,6 @@ from yunohost.hook import (
from yunohost.tools import tools_postinstall from yunohost.tools import tools_postinstall
from yunohost.regenconf import regen_conf from yunohost.regenconf import regen_conf
from yunohost.log import OperationLogger from yunohost.log import OperationLogger
from yunohost.app import APPS_DEFAULT_PHP_VERSION
from functools import reduce from functools import reduce
BACKUP_PATH = '/home/yunohost.backup' BACKUP_PATH = '/home/yunohost.backup'
@ -562,7 +561,6 @@ class BackupManager():
env_var["YNH_APP_ID"] = app_id env_var["YNH_APP_ID"] = app_id
env_var["YNH_APP_INSTANCE_NAME"] = app env_var["YNH_APP_INSTANCE_NAME"] = app
env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_var["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
tmp_app_dir = os.path.join('apps/', app) tmp_app_dir = os.path.join('apps/', app)
tmp_app_bkp_dir = os.path.join(self.work_dir, tmp_app_dir, 'backup') tmp_app_bkp_dir = os.path.join(self.work_dir, tmp_app_dir, 'backup')
env_var["YNH_APP_BACKUP_DIR"] = tmp_app_bkp_dir env_var["YNH_APP_BACKUP_DIR"] = tmp_app_bkp_dir
@ -1413,7 +1411,6 @@ class RestoreManager():
env_dict_remove["YNH_APP_ID"] = app_id env_dict_remove["YNH_APP_ID"] = app_id
env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_dict_remove["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
operation_logger = OperationLogger('remove_on_failed_restore', operation_logger = OperationLogger('remove_on_failed_restore',
[('app', app_instance_name)], [('app', app_instance_name)],
@ -1461,7 +1458,6 @@ class RestoreManager():
env_var["YNH_APP_ID"] = app_id env_var["YNH_APP_ID"] = app_id
env_var["YNH_APP_INSTANCE_NAME"] = app env_var["YNH_APP_INSTANCE_NAME"] = app
env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_var["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
env_var["YNH_DEFAULT_PHP_VERSION"] = APPS_DEFAULT_PHP_VERSION
env_var["YNH_APP_BACKUP_DIR"] = app_backup_in_archive env_var["YNH_APP_BACKUP_DIR"] = app_backup_in_archive
return env_var return env_var