summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-05-05 13:42:51 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-05-05 13:42:51 -0700
commit3591ae5310a40b457baecde3ab1b06182893f25b (patch)
tree73fe7153236a98ef47bbcf60e0cfa49f8002a9d3 /templates
parentd26620bb8534591c1678e8087b0fc809d33fc67f (diff)
downloadvyatta-cfg-system-3591ae5310a40b457baecde3ab1b06182893f25b.tar.gz
vyatta-cfg-system-3591ae5310a40b457baecde3ab1b06182893f25b.zip
Split up system login scripts
1. User and Radius separate scripts 2. Tacacs (incomplete) moved to separate package
Diffstat (limited to 'templates')
-rw-r--r--templates/system/login/node.def3
-rw-r--r--templates/system/login/radius-server/node.def1
-rw-r--r--templates/system/login/tacplus-server/node.def4
-rw-r--r--templates/system/login/tacplus-server/node.tag/secret/node.def2
-rw-r--r--templates/system/login/tacplus-server/node.tag/timeout/node.def3
-rw-r--r--templates/system/login/user/node.def1
6 files changed, 3 insertions, 11 deletions
diff --git a/templates/system/login/node.def b/templates/system/login/node.def
index 62e693e2..66ac660c 100644
--- a/templates/system/login/node.def
+++ b/templates/system/login/node.def
@@ -1,3 +1,2 @@
help: Set user access
-delete:expression: "echo User root cannot be deleted 1>&2 && exit 1"
-end: /opt/vyatta/sbin/vyatta_update_login.pl
+delete: echo 'User root cannot be deleted' 1>&2; exit 1
diff --git a/templates/system/login/radius-server/node.def b/templates/system/login/radius-server/node.def
index 137a92a0..f74cc568 100644
--- a/templates/system/login/radius-server/node.def
+++ b/templates/system/login/radius-server/node.def
@@ -4,3 +4,4 @@ help: Set radius server authentication
commit:expression: $VAR(port) != "" && $VAR(secret) != ""
&& $VAR(timeout) != ""
; "Port, secret, and timeout must be specified for Radius"
+end: /opt/vyatta/sbin/vyatta_update_radius.pl
diff --git a/templates/system/login/tacplus-server/node.def b/templates/system/login/tacplus-server/node.def
deleted file mode 100644
index 7fe9cc27..00000000
--- a/templates/system/login/tacplus-server/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-help: Set TACACS+ server IP addresses
-commit:expression: $VAR(secret) != "" ; "secret must be specified for TACACS+"
diff --git a/templates/system/login/tacplus-server/node.tag/secret/node.def b/templates/system/login/tacplus-server/node.tag/secret/node.def
deleted file mode 100644
index 0f673ae2..00000000
--- a/templates/system/login/tacplus-server/node.tag/secret/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Set TACACS+ secret
diff --git a/templates/system/login/tacplus-server/node.tag/timeout/node.def b/templates/system/login/tacplus-server/node.tag/timeout/node.def
deleted file mode 100644
index 8ce5f585..00000000
--- a/templates/system/login/tacplus-server/node.tag/timeout/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: u32
-help: Set TACACS+ server connection timeout in seconds
-default: 3
diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def
index d23a397f..26625b7f 100644
--- a/templates/system/login/user/node.def
+++ b/templates/system/login/user/node.def
@@ -7,3 +7,4 @@ commit:expression: $VAR(authentication/encrypted-password) != ""
; "user password must be specified"
syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*\\$?$"
; "invalid user name $VAR(@)"
+end: /opt/vyatta/sbin/vyatta_update_login.pl