Projet

Général

Profil

0001-misc-adapt-to-wcs-change-of-user-17984.patch

Frédéric Péters, 12 août 2017 18:35

Télécharger (3,54 ko)

Voir les différences: 

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(-)
debian/agent/settings.py
17 17 
# *.dev.example.net.
18 18 
AGENT_HOST_PATTERNS = None
19 19 

  		




  20
  
  
    
WCS_MANAGE_COMMAND = 'sudo -u wcs-au-quotidien /usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg'

  		




  
  20
  
    
WCS_MANAGE_COMMAND = 'sudo -u wcs /usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg'

  		




  21
  21
  
    
AUTHENTIC_MANAGE_COMMAND = 'sudo -u authentic-multitenant /usr/bin/authentic2-multitenant-manage'

  		




  22
  22
  
    
COMBO_MANAGE_COMMAND = 'sudo -u combo /usr/bin/combo-manage'

  		




  23
  23
  
    
PASSERELLE_MANAGE_COMMAND = 'sudo -u passerelle /usr/bin/passerelle-manage'

  		












  

    
      debian/agent/sudo-hobo-agent
    
  





  1
  
  
    
hobo-agent ALL=(wcs-au-quotidien)NOPASSWD:/usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_deploy * -

  		




  
  1
  
    
hobo-agent ALL=(wcs)NOPASSWD:/usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_deploy * -

  		




  2
  2
  
    
hobo-agent ALL=(authentic-multitenant)NOPASSWD:/usr/bin/authentic2-multitenant-manage hobo_deploy * -

  		




  3
  3
  
    
hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-manage hobo_deploy * -

  		




  4
  4
  
    
hobo-agent ALL=(passerelle)NOPASSWD:/usr/bin/passerelle-manage hobo_deploy * -

  		




  ......




  11
  11
  
    
hobo-agent ALL=(bijoe)NOPASSWD:/usr/bin/bijoe-manage hobo_deploy * -

  		




  12
  12
  
    
hobo-agent ALL=(hobo)NOPASSWD:/usr/bin/hobo-manage hobo_deploy * -

  		




  13
  13
  
    

  		




  14
  
  
    
hobo-agent ALL=(wcs-au-quotidien)NOPASSWD:/usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_notify -

  		




  
  14
  
    
hobo-agent ALL=(wcs)NOPASSWD:/usr/sbin/wcsctl -f /etc/wcs/wcs-au-quotidien.cfg hobo_notify -

  		




  15
  15
  
    
hobo-agent ALL=(authentic-multitenant)NOPASSWD:/usr/bin/authentic2-multitenant-manage hobo_notify -

  		




  16
  16
  
    
hobo-agent ALL=(combo)NOPASSWD:/usr/bin/combo-manage hobo_notify -

  		




  17
  17
  
    
hobo-agent ALL=(passerelle)NOPASSWD:/usr/bin/passerelle-manage hobo_notify -

  		












  

    
      hobo/agent/worker/settings.py
    
  





  44
  44
  
    
BIJOE_MANAGE_TRY_COMMAND = BIJOE_MANAGE_COMMAND

  		




  45
  45
  
    

  		




  46
  46
  
    
PASSERELLE_TENANTS_DIRECTORY = '/var/lib/passerelle/tenants'

  		




  47
  
  
    
WCS_TENANTS_DIRECTORY = '/var/lib/wcs-au-quotidien'

  		




  
  47
  
    
WCS_TENANTS_DIRECTORY = '/var/lib/wcs'

  		




  48
  48
  
    
AUTHENTIC_TENANTS_DIRECTORY = '/var/lib/authentic2-multitenant/tenants'

  		




  49
  49
  
    
CHRONO_TENANTS_DIRECTORY = '/var/lib/chrono/tenants'

  		




  50
  50
  
    
COMBO_TENANTS_DIRECTORY = '/var/lib/combo/tenants'

  		












  

    
      hobo/contrib/ozwillo/views.py
    
  





  266
  266
  
    

  		




  267
  267
  
    
    tenant = '%s%s.%s' % (wcs[0], instance_slug, settings.OZWILLO_ENV_DOMAIN)

  		




  268
  268
  
    
    subprocess.check_call([

  		




  269
  
  
    
        'sudo', '-u', 'wcs-au-quotidien',

  		




  
  269
  
    
        'sudo', '-u', 'wcs',

  		




  270
  270
  
    
        wcs[1], '-f', '/etc/wcs/wcs-au-quotidien.cfg',

  		




  271
  271
  
    
        'delete_tenant', '--force-drop', tenant

  		




  272
  272
  
    
    ])

  		




  273
  
  
    
-