diff options
| author | Alex Harpin <development@landsofshadow.co.uk> | 2015-11-21 09:33:14 +0000 |
|---|---|---|
| committer | Alex Harpin <development@landsofshadow.co.uk> | 2015-11-21 09:57:21 +0000 |
| commit | cfec488a33e45606b1285a073a93aa69f935d8ae (patch) | |
| tree | b99cfd266f6680ce6d41d764c549366c79249273 | |
| parent | 6b8e2a100d2864adcdc309d08b91ecbb22c83403 (diff) | |
| download | vyatta-op-cfec488a33e45606b1285a073a93aa69f935d8ae.tar.gz vyatta-op-cfec488a33e45606b1285a073a93aa69f935d8ae.zip | |
vyatta-op: add "check if service is configured" to restart commands
Add a check to the recent service restart CLI command additions to
ensure they are currently configured before allowing a restart.
Bug #514 http://bugzilla.vyos.net/show_bug.cgi?id=514
| -rw-r--r-- | templates/restart/dns/forwarding/node.def | 15 | ||||
| -rw-r--r-- | templates/restart/snmp/node.def | 15 | ||||
| -rw-r--r-- | templates/restart/ssh/node.def | 15 |
3 files changed, 27 insertions, 18 deletions
diff --git a/templates/restart/dns/forwarding/node.def b/templates/restart/dns/forwarding/node.def index b66ab3c..5740ebf 100644 --- a/templates/restart/dns/forwarding/node.def +++ b/templates/restart/dns/forwarding/node.def @@ -1,9 +1,12 @@ help: Restart DNS forwarding run: - echo "Restarting DNS forwarding..." - sudo /opt/vyatta/sbin/vyatta-dns-forwarding.pl --restart-dnsforwarding; - if [[ $? -eq 0 ]]; then - echo "Success!" - fi - + if cli-shell-api existsActive service dns forwarding; then + echo "Restarting DNS forwarding..." + sudo /opt/vyatta/sbin/vyatta-dns-forwarding.pl --restart-dnsforwarding; + if [[ $? -eq 0 ]]; then + echo "Success!" + fi + else + echo "DNS forwarding is not configured" + fi diff --git a/templates/restart/snmp/node.def b/templates/restart/snmp/node.def index 6d7c35b..689b035 100644 --- a/templates/restart/snmp/node.def +++ b/templates/restart/snmp/node.def @@ -1,9 +1,12 @@ help: Restart SNMP service run: - echo "Restarting SNMP..." - sudo /opt/vyatta/sbin/vyatta-snmp.pl --restart-snmp; - if [[ $? -eq 0 ]]; then - echo "Success!" - fi - + if cli-shell-api existsActive service snmp; then + echo "Restarting SNMP..." + sudo /opt/vyatta/sbin/vyatta-snmp.pl --restart-snmp; + if [[ $? -eq 0 ]]; then + echo "Success!" + fi + else + echo "SNMP is not configured" + fi diff --git a/templates/restart/ssh/node.def b/templates/restart/ssh/node.def index c8f59a9..1fa1aff 100644 --- a/templates/restart/ssh/node.def +++ b/templates/restart/ssh/node.def @@ -1,9 +1,12 @@ help: Restart SSH service run: - echo "Restarting SSH..." - sudo /usr/sbin/invoke-rc.d ssh restart - if [[ $? -eq 0 ]]; then - echo "Success!" - fi - + if cli-shell-api existsActive service ssh; then + echo "Restarting SSH..." + sudo /usr/sbin/invoke-rc.d ssh restart + if [[ $? -eq 0 ]]; then + echo "Success!" + fi + else + echo "SSH is not configured" + fi |