From 58045fc2346d432f4b390ed1d20c15c23469d089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sat, 12 Aug 2017 18:34:48 +0200 Subject: [PATCH] misc: adapt to wcs change of user (#17984) --- debian/agent/settings.py | 2 +- debian/agent/sudo-hobo-agent | 4 ++-- hobo/agent/worker/settings.py | 2 +- hobo/contrib/ozwillo/views.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/agent/settings.py b/debian/agent/settings.py index 78d81b4..b604725 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-au-quotidien /usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg' +WCS_MANAGE_COMMAND = 'sudo -u wcs /usr/sbin/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 7c25336..934d9bf 100644 --- a/debian/agent/sudo-hobo-agent +++ b/debian/agent/sudo-hobo-agent @@ -1,4 +1,4 @@ -hobo-agent ALL=(wcs-au-quotidien)NOPASSWD:/usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_deploy * - +hobo-agent ALL=(wcs)NOPASSWD:/usr/sbin/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-au-quotidien)NOPASSWD:/usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_notify - +hobo-agent ALL=(wcs)NOPASSWD:/usr/sbin/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 a6d98a4..b44e09f 100644 --- a/hobo/agent/worker/settings.py +++ b/hobo/agent/worker/settings.py @@ -44,7 +44,7 @@ HOBO_MANAGE_TRY_COMMAND = HOBO_MANAGE_COMMAND BIJOE_MANAGE_TRY_COMMAND = BIJOE_MANAGE_COMMAND PASSERELLE_TENANTS_DIRECTORY = '/var/lib/passerelle/tenants' -WCS_TENANTS_DIRECTORY = '/var/lib/wcs-au-quotidien' +WCS_TENANTS_DIRECTORY = '/var/lib/wcs' AUTHENTIC_TENANTS_DIRECTORY = '/var/lib/authentic2-multitenant/tenants' CHRONO_TENANTS_DIRECTORY = '/var/lib/chrono/tenants' COMBO_TENANTS_DIRECTORY = '/var/lib/combo/tenants' diff --git a/hobo/contrib/ozwillo/views.py b/hobo/contrib/ozwillo/views.py index f17683f..51b31fc 100644 --- a/hobo/contrib/ozwillo/views.py +++ b/hobo/contrib/ozwillo/views.py @@ -266,7 +266,7 @@ def ozwillo_destroy_thread(instance): tenant = '%s%s.%s' % (wcs[0], instance_slug, settings.OZWILLO_ENV_DOMAIN) subprocess.check_call([ - 'sudo', '-u', 'wcs-au-quotidien', + 'sudo', '-u', 'wcs', wcs[1], '-f', '/etc/wcs/wcs-au-quotidien.cfg', 'delete_tenant', '--force-drop', tenant ]) -- 2.14.1