diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-08-24 16:54:14 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-08-24 16:54:14 +0200 |
| commit | 6558143f92e9130cc6ed2c8d0e864e0f12798ba9 (patch) | |
| tree | be5a4c50a71ea94dafffff8d3ab3efe3893430ff | |
| parent | 6d25ac690532c3644f2ce6ed63ebb8be32870a6f (diff) | |
| download | vyatta-cfg-system-6558143f92e9130cc6ed2c8d0e864e0f12798ba9.tar.gz vyatta-cfg-system-6558143f92e9130cc6ed2c8d0e864e0f12798ba9.zip | |
T441: adjust user groups to work with FRR instead of quagga.
| -rwxr-xr-x | debian/vyatta-cfg-system.postinst.in | 4 | ||||
| -rw-r--r-- | sysconf/level | 4 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/group/node.def | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 9898fc2b..be10fda4 100755 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -225,7 +225,7 @@ update-rc.d ec2-vyos-init start 2345 # Add radius operator user for radius users to map to if ! grep -q '^radius_user' /etc/passwd; then adduser --quiet --firstuid 1001 --disabled-login --ingroup users --gecos "radius user" --shell /bin/vbash radius_user - adduser --quiet radius_user quaggavty + adduser --quiet radius_user frrvty adduser --quiet radius_user vyattaop adduser --quiet radius_user operator adduser --quiet radius_user adm @@ -236,7 +236,7 @@ fi # Add radius admin user for radius users to map to if ! grep -q '^radius_priv_user' /etc/passwd; then adduser --quiet --firstuid 1001 --disabled-login --ingroup vyattacfg --gecos "radius privileged user" --shell /bin/vbash radius_priv_user - adduser --quiet radius_priv_user quaggavty + adduser --quiet radius_priv_user frrvty adduser --quiet radius_priv_user vyattacfg adduser --quiet radius_priv_user sudo adduser --quiet radius_priv_user adm diff --git a/sysconf/level b/sysconf/level index 9da13bf5..ecc8c487 100644 --- a/sysconf/level +++ b/sysconf/level @@ -1,2 +1,2 @@ -admin:quaggavty,vyattacfg,sudo,adm,dip,disk -operator:quaggavty,vyattaop,operator,adm,dip +admin:frrvty,vyattacfg,sudo,adm,dip,disk +operator:frrvty,vyattaop,operator,adm,dip diff --git a/templates/system/login/user/node.tag/group/node.def b/templates/system/login/user/node.tag/group/node.def index f706521a..77d52ed8 100644 --- a/templates/system/login/user/node.tag/group/node.def +++ b/templates/system/login/user/node.tag/group/node.def @@ -7,9 +7,9 @@ val_help: u32:0-65535; Group ID syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*\\$?$" ; "Invalid group name $VAR(@)" syntax:expression: ! $VAR(@) in \ - "quaggavty", "vyattacfg", "vyattaop", "sudo", "adm", "operator" + "frrvty", "vyattacfg", "vyattaop", "sudo", "adm", "operator" ; "Use configuration level to change membership of operator and admin groups" allowed: awk -F: ' - $1 == "quaggavty" || $1 == "vyattacfg" || $1 == "vyattaop" || \ + $1 == "frrvty" || $1 == "vyattacfg" || $1 == "vyattaop" || \ $1 == "sudo" || $1 == "adm" || $1 == "operator" { next; } {printf "%s ", $1}' </etc/group |