From d85b9132e5817f7a10eb93b52c2696711bc5d18d Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Tue, 4 Dec 2007 14:06:49 -0800 Subject: * change "user group" to "user level". * "admin" => "users", "quaggavty", "vyattacfg", "sudo". * "users" => "users", "quaggavty" * use "sudo" group for sudo permissions. * don't add "root" to /etc/group. --- templates/system/login/user/node.def | 2 +- templates/system/login/user/node.tag/group/node.def | 7 ------- templates/system/login/user/node.tag/level/node.def | 7 +++++++ 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 templates/system/login/user/node.tag/group/node.def create mode 100644 templates/system/login/user/node.tag/level/node.def (limited to 'templates/system/login/user') diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def index fbac0c54..d05ac373 100644 --- a/templates/system/login/user/node.def +++ b/templates/system/login/user/node.def @@ -9,7 +9,7 @@ then rm -rf /tmp/vyatta-delete-system-login-user-$(@).\\\$PPID && exit 0; \ fi && \ sudo /opt/vyatta/sbin/vyatta_update_login_user.pl \ '$(@)' '$(full-name/@)' '$(authentication/encrypted-password/@)' \ - '$(group/@)'" + '$(level/@)'" delete: "if [ x$(@) == x ]; then exit 1; fi && \ if [ x$(@) == xroot ]; then \ echo Cannot delete user \"root\" 1>&2 && exit 2; \ diff --git a/templates/system/login/user/node.tag/group/node.def b/templates/system/login/user/node.tag/group/node.def deleted file mode 100644 index 17739351..00000000 --- a/templates/system/login/user/node.tag/group/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: txt -help: "User group" -default: "admin" -syntax: $(@) in "admin", "users"; "Users can only be in group \"admin\" or \"users\"" -#comp_help:Possible completions: -# admin\t\tAdministrators -# users\t\tNormal users diff --git a/templates/system/login/user/node.tag/level/node.def b/templates/system/login/user/node.tag/level/node.def new file mode 100644 index 00000000..30ac731c --- /dev/null +++ b/templates/system/login/user/node.tag/level/node.def @@ -0,0 +1,7 @@ +type: txt +help: "User privilege level" +default: "admin" +syntax: $(@) in "admin", "users"; "Allowed levels are \"admin\" and \"users\"" +#comp_help:Possible completions: +# admin\t\tAdministrators +# users\t\tNormal users -- cgit v1.2.3