feat: CLI Commands

Author: cerealcable

Makefile.am

@@ -9,6 +9,7 @@ vsbindir = $(vprefix)/sbin
 sbin_SCRIPTS =
 sbin_SCRIPTS += scripts/eap_proxy.py
 sbin_SCRIPTS += scripts/vyatta-service-eap-proxy-update.sh
+sbin_SCRIPTS += scripts/vyatta-service-eap-proxy-restart.sh
 
 bin_sudo_users_SCRIPTS =
 
@@ -19,4 +20,5 @@ cpiop = find  . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
 
 install-exec-hook:
 	mkdir -p $(DESTDIR)$(cfgdir)
-	cd templates-cfg; $(cpiop) $(DESTDIR)$(cfgdir)
+	cd templates/cfg; $(cpiop) $(DESTDIR)$(cfgdir)
+	cd templates/op; $(cpiop) $(DESTDIR)$(opdir)

debian/changelog

@@ -1,3 +1,11 @@
+vyatta-eap-proxy (0.3.1) unstable; urgency=low
+
+  * `show eap-proxy status` command
+  * `show eap-proxy logs` command
+  * `restart eap-proxy` command
+
+ -- Morgan Humes <[email protected]>  Wed, 28 Feb 2019 00:13:30 -0600
+
 vyatta-eap-proxy (0.3.0) unstable; urgency=low
 
   * Renamed eap-proxy router-interface to rg-interface

scripts/vyatta-service-eap-proxy-restart.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# Obtain session
+eval $(echo $(/bin/cli-shell-api getSessionEnv $PPID))
+cli-shell-api setupSession
+
+BIN_PATH="/opt/vyatta/sbin/eap_proxy.py"
+PIDFILE="/var/run/eap_proxy.pid"
+CONFIG_OPTIONS=(\
+    "ping-gateway" \
+    "ignore-when-wan-up" \
+    "ignore-start" \
+    "ignore-logoff" \
+    "restart-dhcp" \
+    "set-mac" \
+)
+DAEMON_OPTIONS=(--daemon --pidfile "$PIDFILE" --syslog)
+IF_WAN=$(cli-shell-api returnValue service eap-proxy wan-interface)
+IF_RG=$(cli-shell-api returnValue service eap-proxy rg-interface)
+OPTIONS=()
+for option in "${CONFIG_OPTIONS[@]}"; do
+    if [[ "$(cli-shell-api returnValue service eap-proxy "$option")" == "enable" ]]; then
+      OPTIONS+=("--$option")
+    fi
+done
+
+/sbin/start-stop-daemon --stop --retry 30 --pidfile "$PIDFILE" --oknodo --quiet
+/sbin/start-stop-daemon --start --pidfile "$PIDFILE" --exec "$BIN_PATH" -- \
+    "$IF_WAN" "$IF_RG" "${OPTIONS[@]}" "${DAEMON_OPTIONS[@]}"