From 0be5b3e217417bf47ce528c1e170b0d482901243 Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Sun, 12 Jul 2015 19:00:19 +0200 Subject: [PATCH] Tant qu'a faire, on remplace tous les init par /sbin/service (compat systemd) --- Python/etc/monit/services | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Python/etc/monit/services b/Python/etc/monit/services index 398f78e..7761167 100644 --- a/Python/etc/monit/services +++ b/Python/etc/monit/services @@ -15,7 +15,7 @@ def service(group=None, **kw): Les arguments supplémentaires peuvent être: name (par défault le nom du groupe) - init (le nom du script de démarrage dans /etc/init.d, (par défaut name)) + init (le nom du service, anciennement init, (par défaut name)) pidp (le nom du fichier de pid (par défaut /var/run/.pid)) extra (des lignes supplémentaires)""" @@ -34,8 +34,8 @@ def service(group=None, **kw): matchingp = 'matching "%s"' % (name) else: matchingp = '' - start_cmd = kw.get('start_cmd', '/etc/init.d/%s start' % init) - stop_cmd = kw.get('stop_cmd', '/etc/init.d/%s stop' % init) + start_cmd = kw.get('start_cmd', '/usr/sbin/service %s start' % init) + stop_cmd = kw.get('stop_cmd', '/usr/sbin/service %s stop' % init) out("""# %(name)s check process %(name)s %(pidp)s""" % locals()) if matchingp: @@ -81,13 +81,13 @@ if has('nginx'): else: out("""# fcgiwrap check process fcgiwrap matching fcgiwrap - start program = "/etc/init.d/fcgiwrap start" - stop program = "/etc/init.d/fcgiwrap stop" + start program = "/usr/sbin/service fcgiwrap start" + stop program = "/usr/sbin/service fcgiwrap stop" if 5 restarts within 5 cycles then timeout""") if has('radio'): - service(None, name='radio-vlc', start_cmd = "/etc/init.d/radio start", stop_cmd = "/etc/init.d/radio stop", pidp='/tmp/multicast.pid') - service(None, name='radio-igmp', start_cmd = "/etc/init.d/igmp start", stop_cmd = "/etc/init.d/igmp stop", pidf='igmp') + service(None, name='radio-vlc', start_cmd = "/usr/sbin/service radio start", stop_cmd = "/usr/sbin/service radio stop", pidp='/tmp/multicast.pid') + service(None, name='radio-igmp', start_cmd = "/usr/sbin/service igmp start", stop_cmd = "/usr/sbin/service igmp stop", pidf='igmp') service('intranet2-service', name="intranet2", @@ -112,8 +112,8 @@ if has('gunicorn'): "timeout 20 seconds for 5 cycles then restart") service(None, name="gunicorn_%s" % site, - start_cmd = "/etc/init.d/gunicorn start %s" % site, - stop_cmd = "/etc/init.d/gunicorn stop %s" % site, + start_cmd = "/usr/sbin/service gunicorn start %s" % site, + stop_cmd = "/usr/sbin/service gunicorn stop %s" % site, pidf = "gunicorn/%s" % site, extra = extra, ) @@ -122,8 +122,8 @@ if has('asterisk-server'): service(name="sms_queuing") service('asterisk-server', pidp="/var/run/asterisk/asterisk.pid", - start_cmd = "/etc/init.d/asterisk start", - stop_cmd = "/etc/init.d/asterisk stop", + start_cmd = "/usr/sbin/service asterisk start", + stop_cmd = "/usr/sbin/service asterisk stop", ) service("at",