From 19255724eb08b110822717bc996defcd6e22bfad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 15 Aug 2017 10:44:56 +0200 Subject: [PATCH] misc: adapt to change in wcsctl path (#18011) --- README | 2 +- debian/agent/settings.py | 2 +- debian/agent/sudo-hobo-agent | 4 ++-- hobo/agent/worker/settings.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 5e2dca4..c73ed22 100644 --- a/README +++ b/README @@ -139,7 +139,7 @@ Agents - w.c.s. -w.c.s. instances will be deployed using "/usr/sbin/wcsctl" by default, this +w.c.s. instances will be deployed using "/usr/bin/wcsctl" by default, this command can be adapted in the WCS_MANAGE_COMMAND setting. It should be run with the same rights as the wcs process (redefine the command to use sudo if necessary). diff --git a/debian/agent/settings.py b/debian/agent/settings.py index b604725..244e39f 100644 --- a/debian/agent/settings.py +++ b/debian/agent/settings.py @@ -17,7 +17,7 @@ BROKER_URL = 'amqp://' # *.dev.example.net. AGENT_HOST_PATTERNS = None -WCS_MANAGE_COMMAND = 'sudo -u wcs /usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg' +WCS_MANAGE_COMMAND = 'sudo -u wcs /usr/bin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg' AUTHENTIC_MANAGE_COMMAND = 'sudo -u authentic-multitenant /usr/bin/authentic2-multitenant-manage' COMBO_MANAGE_COMMAND = 'sudo -u combo /usr/bin/combo-manage' PASSERELLE_MANAGE_COMMAND = 'sudo -u passerelle /usr/bin/passerelle-manage' diff --git a/debian/agent/sudo-hobo-agent b/debian/agent/sudo-hobo-agent index 934d9bf..03ca368 100644 --- a/debian/agent/sudo-hobo-agent +++ b/debian/agent/sudo-hobo-agent @@ -1,4 +1,4 @@ -hobo-agent ALL=(wcs)NOPASSWD:/usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_deploy * - +hobo-agent ALL=(wcs)NOPASSWD:/usr/bin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_deploy * - hobo-agent ALL=(authentic-multitenant)NOPASSWD:/usr/bin/authentic2-multitenant-manage hobo_deploy * - hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-manage hobo_deploy * - hobo-agent ALL=(passerelle)NOPASSWD:/usr/bin/passerelle-manage hobo_deploy * - @@ -11,7 +11,7 @@ hobo-agent ALL=(hobo-piwik)NOPASSWD:/usr/bin/piwik-manage hobo_deploy * - hobo-agent ALL=(bijoe)NOPASSWD:/usr/bin/bijoe-manage hobo_deploy * - hobo-agent ALL=(hobo)NOPASSWD:/usr/bin/hobo-manage hobo_deploy * - -hobo-agent ALL=(wcs)NOPASSWD:/usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_notify - +hobo-agent ALL=(wcs)NOPASSWD:/usr/bin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_notify - hobo-agent ALL=(authentic-multitenant)NOPASSWD:/usr/bin/authentic2-multitenant-manage hobo_notify - hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-manage hobo_notify - hobo-agent ALL=(passerelle)NOPASSWD:/usr/bin/passerelle-manage hobo_notify - diff --git a/hobo/agent/worker/settings.py b/hobo/agent/worker/settings.py index b44e09f..cba7448 100644 --- a/hobo/agent/worker/settings.py +++ b/hobo/agent/worker/settings.py @@ -17,7 +17,7 @@ BROKER_URL = 'amqp://' # *.dev.example.net. AGENT_HOST_PATTERNS = None -WCS_MANAGE_COMMAND = '/usr/sbin/wcsctl' +WCS_MANAGE_COMMAND = '/usr/bin/wcsctl' AUTHENTIC_MANAGE_COMMAND = '/usr/bin/authentic2-multitenant-manage' COMBO_MANAGE_COMMAND = '/usr/lib/combo/manage.py' PASSERELLE_MANAGE_COMMAND = '/usr/lib/passerelle/manage.py' -- 2.14.1