From 3a0b5ade7a56b17ecc55ce29f63a9ff4e4533b79 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Wed, 22 Dec 2010 11:51:45 -0800 Subject: Rename 'remote-archive commit-uri' to 'commit-archive location' per design spec review comments. --- scripts/vyatta-commit-push.pl | 4 ++-- scripts/vyatta-config-mgmt.pl | 8 ++++---- .../commit-archive/location/node.def | 24 ++++++++++++++++++++++ .../config-management/commit-archive/node.def | 1 + .../remote-archive/commit-uri/node.def | 24 ---------------------- .../config-management/remote-archive/node.def | 1 - 6 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 templates-cfg/system/config-management/commit-archive/location/node.def create mode 100644 templates-cfg/system/config-management/commit-archive/node.def delete mode 100644 templates-cfg/system/config-management/remote-archive/commit-uri/node.def delete mode 100644 templates-cfg/system/config-management/remote-archive/node.def diff --git a/scripts/vyatta-commit-push.pl b/scripts/vyatta-commit-push.pl index 526ebe5..f501366 100755 --- a/scripts/vyatta-commit-push.pl +++ b/scripts/vyatta-commit-push.pl @@ -44,8 +44,8 @@ use Sys::Hostname; my $debug = 0; my $config = new Vyatta::Config; -$config->setLevel('system config-management remote-archive'); -my @uris = $config->returnOrigValues('commit-uri'); +$config->setLevel('system config-management commit-archive'); +my @uris = $config->returnOrigValues('location'); if (scalar(@uris) < 1) { print "No URI's configured\n"; diff --git a/scripts/vyatta-config-mgmt.pl b/scripts/vyatta-config-mgmt.pl index b57db0e..5bd1b03 100755 --- a/scripts/vyatta-config-mgmt.pl +++ b/scripts/vyatta-config-mgmt.pl @@ -147,8 +147,8 @@ my ($cmd, $rc) = ('', 1); if ($action eq 'add-uri') { print "add-uri\n" if $debug; my $config = new Vyatta::Config; - $config->setLevel('system config-management remote-archive'); - my @uris = $config->returnValues('commit-uri'); + $config->setLevel('system config-management commit-archive'); + my @uris = $config->returnValues('location'); my $link = get_link($commit_uri_script); if (scalar(@uris) >= 1 and ! -e $link) { print "add link [$link]\n" if $debug; @@ -161,8 +161,8 @@ if ($action eq 'add-uri') { if ($action eq 'del-uri') { print "del-uri\n" if $debug; my $config = new Vyatta::Config; - $config->setLevel('system config-management remote-archive'); - my @uris = $config->returnValues('commit-uri'); + $config->setLevel('system config-management commit-archive'); + my @uris = $config->returnValues('location'); if (scalar(@uris) <= 0) { my $link = get_link($commit_uri_script); print "remove link [$link]\n" if $debug; diff --git a/templates-cfg/system/config-management/commit-archive/location/node.def b/templates-cfg/system/config-management/commit-archive/location/node.def new file mode 100644 index 0000000..ff0d946 --- /dev/null +++ b/templates-cfg/system/config-management/commit-archive/location/node.def @@ -0,0 +1,24 @@ +multi: +priority: 400 +type: txt +help: Commit archive location + +syntax:expression: exec "/opt/vyatta/sbin/vyatta-config-mgmt.pl \ + --action=valid-uri \ + --uri=\"$VAR(@)\" "; "Invalid URI" + +create: if [ "$COMMIT_SIBLING_POSITION" = "LAST" ] || \ + [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then + sudo ${vyatta_sbindir}/vyatta-config-mgmt.pl --action=add-uri + fi; + +delete: if [ "$COMMIT_SIBLING_POSITION" = "LAST" ] || \ + [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then + sudo ${vyatta_sbindir}/vyatta-config-mgmt.pl --action=del-uri + fi; + +val_help: ; Uniform Resource Identifier +comp_help: + "scp://:@/" + "ftp://:@/" + "tftp:///" \ No newline at end of file diff --git a/templates-cfg/system/config-management/commit-archive/node.def b/templates-cfg/system/config-management/commit-archive/node.def new file mode 100644 index 0000000..f4414ab --- /dev/null +++ b/templates-cfg/system/config-management/commit-archive/node.def @@ -0,0 +1 @@ +help: Commit archival settings \ No newline at end of file diff --git a/templates-cfg/system/config-management/remote-archive/commit-uri/node.def b/templates-cfg/system/config-management/remote-archive/commit-uri/node.def deleted file mode 100644 index 7b483f9..0000000 --- a/templates-cfg/system/config-management/remote-archive/commit-uri/node.def +++ /dev/null @@ -1,24 +0,0 @@ -multi: -priority: 400 -type: txt -help: Commit URI - -syntax:expression: exec "/opt/vyatta/sbin/vyatta-config-mgmt.pl \ - --action=valid-uri \ - --uri=\"$VAR(@)\" "; "Invalid URI" - -create: if [ "$COMMIT_SIBLING_POSITION" = "LAST" ] || \ - [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then - sudo ${vyatta_sbindir}/vyatta-config-mgmt.pl --action=add-uri - fi; - -delete: if [ "$COMMIT_SIBLING_POSITION" = "LAST" ] || \ - [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then - sudo ${vyatta_sbindir}/vyatta-config-mgmt.pl --action=del-uri - fi; - -val_help: ; Uniform Resource Identifier -comp_help: - "scp://:@/" - "ftp://:@/" - "tftp:///" \ No newline at end of file diff --git a/templates-cfg/system/config-management/remote-archive/node.def b/templates-cfg/system/config-management/remote-archive/node.def deleted file mode 100644 index 073ba7a..0000000 --- a/templates-cfg/system/config-management/remote-archive/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Remote archival settings \ No newline at end of file -- cgit v1.2.3