diff options
| -rw-r--r-- | data/templates/vrrp/10-override.conf.j2 | 6 | ||||
| -rw-r--r-- | src/systemd/keepalived.service | 13 |
2 files changed, 1 insertions, 18 deletions
diff --git a/data/templates/vrrp/10-override.conf.j2 b/data/templates/vrrp/10-override.conf.j2 index 4a16012b6..dd0216d23 100644 --- a/data/templates/vrrp/10-override.conf.j2 +++ b/data/templates/vrrp/10-override.conf.j2 @@ -2,14 +2,10 @@ {% set snmp = '--snmp' if snmp is defined else '' %} [Unit] After=vyos-router.service -# Only start if there is our configuration file - remove Debian default -# config file from the condition list -ConditionFileNotEmpty= +# Only start if there is our configuration file ConditionFileNotEmpty=/run/keepalived/keepalived.conf [Service] -KillMode=process -Type=simple # Read configuration variable file if it is present ExecStart= ExecStart=/usr/sbin/keepalived --use-file /run/keepalived/keepalived.conf --pid /run/keepalived/keepalived.pid --dont-fork {{ snmp }} diff --git a/src/systemd/keepalived.service b/src/systemd/keepalived.service deleted file mode 100644 index a462d8614..000000000 --- a/src/systemd/keepalived.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Keepalive Daemon (LVS and VRRP) -After=vyos-router.service -# Only start if there is a configuration file -ConditionFileNotEmpty=/run/keepalived/keepalived.conf - -[Service] -KillMode=process -Type=simple -# Read configuration variable file if it is present -ExecStart=/usr/sbin/keepalived --use-file /run/keepalived/keepalived.conf --pid /run/keepalived/keepalived.pid --dont-fork --snmp -ExecReload=/bin/kill -HUP $MAINPID -PIDFile=/run/keepalived/keepalived.pid |