diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-08-17 17:25:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 17:25:31 +0200 |
| commit | 7d86c015dab6b43f454f119c1dfae96745b7430f (patch) | |
| tree | 856095b76bd1ae16b94ed8fb9bd4d9eed76e0164 | |
| parent | 53a00c6ab40d958f9e16713c7c6459c645d18ca6 (diff) | |
| parent | cdc48c628ff09feab8485501ffc61c4217de4e7c (diff) | |
| download | vyatta-op-7d86c015dab6b43f454f119c1dfae96745b7430f.tar.gz vyatta-op-7d86c015dab6b43f454f119c1dfae96745b7430f.zip | |
Merge pull request #14 from alkersan/ntp_show
T689: Removed show ntp op mode definition in virtue of xml rewrite
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | templates/set/date/node.def | 1 | ||||
| -rw-r--r-- | templates/set/date/node.tag/node.def | 3 | ||||
| -rw-r--r-- | templates/set/date/ntp/node.def | 2 | ||||
| -rw-r--r-- | templates/set/date/ntp/node.tag/node.def | 6 | ||||
| -rw-r--r-- | templates/show/ntp/node.def | 6 | ||||
| -rw-r--r-- | templates/show/ntp/node.tag/node.def | 3 |
8 files changed, 4 insertions, 22 deletions
@@ -27,3 +27,7 @@ libtool /src/render_xml generated-templates/* + +# Intellij +.idea/ +*.iml diff --git a/debian/control b/debian/control index 4bff070..5d7427b 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,6 @@ Depends: sed (>= 4.1.5), console-terminus, ethtool, traceroute, - ntpdate, procps (>= 1:3.2.7-3), vyatta-cfg (>= 0.16.26), vyatta-cfg-system (>= 0.19.93), diff --git a/templates/set/date/node.def b/templates/set/date/node.def deleted file mode 100644 index 517fdbf..0000000 --- a/templates/set/date/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Set date and time diff --git a/templates/set/date/node.tag/node.def b/templates/set/date/node.tag/node.def deleted file mode 100644 index c593997..0000000 --- a/templates/set/date/node.tag/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Set system date and time -allowed: echo -n '<MMDDhhmm>' '<MMDDhhmmYY>' '<MMDDhhmmCCYY>' '<MMDDhhmmCCYY.ss>' -run: sudo /bin/date "$3" diff --git a/templates/set/date/ntp/node.def b/templates/set/date/ntp/node.def deleted file mode 100644 index 9235d2e..0000000 --- a/templates/set/date/ntp/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Set system date and time from Network Time Protocol (NTP) server -run: sudo ntpdate -u 0.vyatta.pool.ntp.org diff --git a/templates/set/date/ntp/node.tag/node.def b/templates/set/date/ntp/node.tag/node.def deleted file mode 100644 index 92e0533..0000000 --- a/templates/set/date/ntp/node.tag/node.def +++ /dev/null @@ -1,6 +0,0 @@ -help: Set system date and time with given NTP server -allowed: local -a arr - eval "arr=($(cli-shell-api listEffectiveNodes system ntp server))" - echo -n "<hostname> <x.x.x.x>" ${arr[@]} -run: sudo ntpdate -u $4 - diff --git a/templates/show/ntp/node.def b/templates/show/ntp/node.def deleted file mode 100644 index 71c8813..0000000 --- a/templates/show/ntp/node.def +++ /dev/null @@ -1,6 +0,0 @@ -help: Show peer status of network time daemon -run: if ps -C ntpd &>/dev/null ; then - ntpdc -n -c peers - else - echo NTP daemon disabled - fi diff --git a/templates/show/ntp/node.tag/node.def b/templates/show/ntp/node.tag/node.def deleted file mode 100644 index e7bdb6a..0000000 --- a/templates/show/ntp/node.tag/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Show date and time of specified NTP server -allowed: awk '/^server/ { print $2 }' /etc/ntp.conf -run: /usr/sbin/ntpdate -q $3 |