From e1dd3295c1eb99551588523af6a124f2da95281e Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 7 Sep 2019 14:43:53 +0200 Subject: [PATCH] Fix reload, use systemctl instead of service --- gvaweb/webtasks/tasks.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gvaweb/webtasks/tasks.py b/gvaweb/webtasks/tasks.py index e980e87..dc8440b 100644 --- a/gvaweb/webtasks/tasks.py +++ b/gvaweb/webtasks/tasks.py @@ -21,7 +21,7 @@ _LOGGER = get_task_logger(__name__) SUDO_CMD = '/usr/bin/sudo' RM_CMD = '/bin/rm' LN_CMD = '/bin/ln' -SERVICE_CMD = '/usr/sbin/service' +SERVICE_CMD = '/sbin/systemctl' INSTALL_CMD = '/usr/bin/install' JINJAENV = Environment(loader=PackageLoader('webtasks', 'templates')) @@ -198,9 +198,6 @@ def create_web_php_fpm_pool_config(username): stderr=subprocess.STDOUT) subprocess.check_output([ SUDO_CMD, RM_CMD, filename], stderr=subprocess.STDOUT) - subprocess.check_output([ - SUDO_CMD, SERVICE_CMD, 'php5-fpm', 'reload'], - stderr=subprocess.STDOUT) except subprocess.CalledProcessError as cpe: log_and_raise(cpe, 'could not configure PHP FPM for %s', username) return True @@ -220,9 +217,6 @@ def delete_web_php_fpm_pool_config(username): subprocess.check_output([ SUDO_CMD, RM_CMD, "-f", _build_php_fpm_pool_file(username)], stderr=subprocess.STDOUT) - subprocess.check_output([ - SUDO_CMD, SERVICE_CMD, 'php5-fpm', 'reload'], - stderr=subprocess.STDOUT) except subprocess.CalledProcessError as cpe: log_and_raise( cpe, 'could not delete PHP FPM configuration for %s', username)