From f773368df7c5eb40a8c6334ebbed2de88bdb21af Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Tue, 16 Jul 2024 21:28:55 +0200 Subject: op-mode: T6577: create generic service restart helper to work with the API Right now we have multiple restart helpers (e.g. dhcp server, ssh, ntp) that all do the same (more or less): * Check if service is configured on CLI * Restart if configured * Error out if unconfigured This is not available via the op-mode API. Create a new restart.py op-mode helper that takes the service name and possible VRF as argument so it's also exposed via API. (cherry picked from commit c74ae852152b0c3c3f00a1847d081d28f500e178) --- op-mode-definitions/dhcp.xml.in | 4 ++-- op-mode-definitions/dns-dynamic.xml.in | 2 +- op-mode-definitions/dns-forwarding.xml.in | 2 +- op-mode-definitions/igmp-proxy.xml.in | 2 +- op-mode-definitions/mdns-reflector.xml.in | 2 +- op-mode-definitions/restart-router-advert.xml.in | 2 +- op-mode-definitions/restart-snmp.xml.in | 2 +- op-mode-definitions/restart-ssh.xml.in | 2 +- op-mode-definitions/reverse-proxy.xml.in | 2 +- op-mode-definitions/vpn-ipsec.xml.in | 2 +- op-mode-definitions/vrrp.xml.in | 2 +- op-mode-definitions/webproxy.xml.in | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'op-mode-definitions') diff --git a/op-mode-definitions/dhcp.xml.in b/op-mode-definitions/dhcp.xml.in index eee6937d6..b3438ab80 100644 --- a/op-mode-definitions/dhcp.xml.in +++ b/op-mode-definitions/dhcp.xml.in @@ -245,7 +245,7 @@ Restart DHCP server - if cli-shell-api existsActive service dhcp-server; then sudo systemctl restart kea-dhcp4-server.service; else echo "DHCP server not configured"; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name dhcp @@ -264,7 +264,7 @@ Restart DHCPv6 server - if cli-shell-api existsActive service dhcpv6-server; then sudo systemctl restart kea-dhcp6-server.service; else echo "DHCPv6 server not configured"; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name dhcpv6 diff --git a/op-mode-definitions/dns-dynamic.xml.in b/op-mode-definitions/dns-dynamic.xml.in index 45d58e2e8..ef0f03988 100644 --- a/op-mode-definitions/dns-dynamic.xml.in +++ b/op-mode-definitions/dns-dynamic.xml.in @@ -97,7 +97,7 @@ Restart Dynamic DNS service - if cli-shell-api existsActive service dns dynamic; then sudo systemctl restart ddclient.service; else echo "Dynamic DNS not configured"; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name dns_dynamic diff --git a/op-mode-definitions/dns-forwarding.xml.in b/op-mode-definitions/dns-forwarding.xml.in index 29bfc61cf..fac3fc345 100644 --- a/op-mode-definitions/dns-forwarding.xml.in +++ b/op-mode-definitions/dns-forwarding.xml.in @@ -73,7 +73,7 @@ Restart DNS Forwarding service - if cli-shell-api existsActive service dns forwarding; then sudo systemctl restart pdns-recursor.service; else echo "DNS forwarding not configured"; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name dns_forwarding diff --git a/op-mode-definitions/igmp-proxy.xml.in b/op-mode-definitions/igmp-proxy.xml.in index 8533138d7..d6ad7ed7e 100644 --- a/op-mode-definitions/igmp-proxy.xml.in +++ b/op-mode-definitions/igmp-proxy.xml.in @@ -6,7 +6,7 @@ Restart the IGMP proxy process - sudo systemctl restart igmpproxy.service + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name igmp_proxy diff --git a/op-mode-definitions/mdns-reflector.xml.in b/op-mode-definitions/mdns-reflector.xml.in index a90d4d385..115b2858c 100644 --- a/op-mode-definitions/mdns-reflector.xml.in +++ b/op-mode-definitions/mdns-reflector.xml.in @@ -53,7 +53,7 @@ Restart mDNS repeater service - sudo systemctl restart avahi-daemon.service + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name mdns_repeater diff --git a/op-mode-definitions/restart-router-advert.xml.in b/op-mode-definitions/restart-router-advert.xml.in index 304b4dfd3..9eea3dfc4 100644 --- a/op-mode-definitions/restart-router-advert.xml.in +++ b/op-mode-definitions/restart-router-advert.xml.in @@ -6,7 +6,7 @@ Restart IPv6 Router Advertisement service - if cli-shell-api existsActive service router-advert; then sudo systemctl restart radvd.service; else echo "IPv6 Router Advertisement service not configured"; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name router_advert diff --git a/op-mode-definitions/restart-snmp.xml.in b/op-mode-definitions/restart-snmp.xml.in index 7de27df64..e9c43de01 100644 --- a/op-mode-definitions/restart-snmp.xml.in +++ b/op-mode-definitions/restart-snmp.xml.in @@ -6,7 +6,7 @@ Restart SNMP service - if cli-shell-api existsActive service snmp; then sudo systemctl restart snmpd.service; else echo "Service SNMP not configured"; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name snmp diff --git a/op-mode-definitions/restart-ssh.xml.in b/op-mode-definitions/restart-ssh.xml.in index 543cafc24..914586df8 100644 --- a/op-mode-definitions/restart-ssh.xml.in +++ b/op-mode-definitions/restart-ssh.xml.in @@ -6,7 +6,7 @@ Restart SSH service - if cli-shell-api existsActive service ssh; then sudo systemctl restart "ssh@*.service"; else echo "Service SSH not configured"; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name ssh --vrf "*" diff --git a/op-mode-definitions/reverse-proxy.xml.in b/op-mode-definitions/reverse-proxy.xml.in index 4af24880b..b45ce107f 100644 --- a/op-mode-definitions/reverse-proxy.xml.in +++ b/op-mode-definitions/reverse-proxy.xml.in @@ -6,7 +6,7 @@ Restart reverse-proxy service - if cli-shell-api existsActive load-balancing reverse-proxy; then sudo systemctl restart haproxy.service; else echo "Reverse-Proxy not configured"; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name reverse_proxy diff --git a/op-mode-definitions/vpn-ipsec.xml.in b/op-mode-definitions/vpn-ipsec.xml.in index b551af2be..0a8671aeb 100644 --- a/op-mode-definitions/vpn-ipsec.xml.in +++ b/op-mode-definitions/vpn-ipsec.xml.in @@ -112,7 +112,7 @@ Restart the IPsec VPN process - if systemctl is-active --quiet strongswan; then sudo systemctl restart strongswan ; echo "IPsec process restarted"; else echo "IPsec process not running" ; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name ipsec diff --git a/op-mode-definitions/vrrp.xml.in b/op-mode-definitions/vrrp.xml.in index 34484c706..158e7093e 100644 --- a/op-mode-definitions/vrrp.xml.in +++ b/op-mode-definitions/vrrp.xml.in @@ -30,7 +30,7 @@ Restart VRRP (Virtual Router Redundancy Protocol) process - sudo systemctl restart keepalived.service + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name vrrp diff --git a/op-mode-definitions/webproxy.xml.in b/op-mode-definitions/webproxy.xml.in index 57df44ff8..ba13907b8 100644 --- a/op-mode-definitions/webproxy.xml.in +++ b/op-mode-definitions/webproxy.xml.in @@ -34,7 +34,7 @@ Restart WebProxy service - if cli-shell-api existsActive service webproxy; then sudo systemctl restart squid.service; else echo "Service WebProxy not configured"; fi + sudo ${vyos_op_scripts_dir}/restart.py restart_service --name webproxy -- cgit v1.2.3