diff options
| author | Daniil Baturin <daniil@baturin.org> | 2015-06-29 00:56:29 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-06-29 00:56:29 +0200 |
| commit | bfa0be96e86d793e6978ce3f7750c3a21fec0ba4 (patch) | |
| tree | 7ad12db9912ed1294e8e92d7205ca7b02f564867 | |
| parent | 0d53445cf639a4072e6d2ecd71da6c9f1c78d4b8 (diff) | |
| parent | 06073474594426a2da5cb9907fc7587df56c0c23 (diff) | |
| download | vyatta-cfg-system-bfa0be96e86d793e6978ce3f7750c3a21fec0ba4.tar.gz vyatta-cfg-system-bfa0be96e86d793e6978ce3f7750c3a21fec0ba4.zip | |
Merge branch 'lithium' of github.com:vyos/vyatta-cfg-system into lithium
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | scripts/rl-system.init | 11 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/authentication/encrypted-password/node.def | 3 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/authentication/public-keys/node.def | 4 |
5 files changed, 26 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 30ad5b68..4c4fb96f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +vyatta-cfg-system (0.20.44+vyos2+lithium31) unstable; urgency=low + + [ Alex Harpin ] + * Revert "vyatta-cfg-system: prevent deletion of all user authentication" + + -- Alex Harpin <development@landsofshadow.co.uk> Mon, 22 Jun 2015 21:20:41 +0100 + +vyatta-cfg-system (0.20.44+vyos2+lithium30) unstable; urgency=low + + [ Alex Harpin ] + * vyatta-cfg-system: prevent deletion of system based post-hook symlinks + * vyatta-cfg-system: update dh_gencontrol with new development build flag + + -- Alex Harpin <development@landsofshadow.co.uk> Tue, 16 Jun 2015 07:48:49 +0100 + vyatta-cfg-system (0.20.44+vyos2+lithium29) unstable; urgency=low [ Alex Harpin ] diff --git a/debian/rules b/debian/rules index 96038c44..4f9e89fa 100755 --- a/debian/rules +++ b/debian/rules @@ -96,7 +96,7 @@ binary-indep: build install dh_compress dh_fixperms dh_installdeb - if [ -f "../.VYATTA_DEV_BUILD" ]; then \ + if [ -f "../.VYOS_DEV_BUILD" ]; then \ dh_gencontrol -- -v999.dev $(SUBSTVARS); \ else \ dh_gencontrol $(SUBSTVARS); \ diff --git a/scripts/rl-system.init b/scripts/rl-system.init index fac5fbc1..6a2b8d25 100755 --- a/scripts/rl-system.init +++ b/scripts/rl-system.init @@ -210,8 +210,17 @@ start () { # note that this approach only supports hooks that are "configured", # i.e., it does not support hooks that need to always be present. cpostdir=$(cli-shell-api getPostCommitHookDir) + + # exclude commits hooks from vyatta-cfg + excluded="10vyatta-log-commit.pl 99vyos-user-postcommit-hooks" + if [ -d "$cpostdir" ]; then - rm -f $cpostdir/* + for f in $cpostdir/* + do + if [[ ! $excluded =~ $(basename $f) ]]; then + rm -f $cpostdir/$(basename $f) + fi + done fi ## Clear out apt config file--it will be filled in by config load diff --git a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def index a8b3ee54..29ad14a8 100644 --- a/templates/system/login/user/node.tag/authentication/encrypted-password/node.def +++ b/templates/system/login/user/node.tag/authentication/encrypted-password/node.def @@ -9,6 +9,3 @@ syntax:expression: ($VAR(@) == "*" || $VAR(@) == "!" \ || ( pattern $VAR(@) "^\\$5\\$[a-zA-Z0-9\./]*\\$[a-zA-Z0-9\./]{43}$" ) \ || ( pattern $VAR(@) "^\\$6\\$[a-zA-Z0-9\./]*\\$[a-zA-Z0-9\./]{86}$" )) \ ; "Not a valid encrypted password for user $VAR(../../@)" - -delete:expression: $VAR(../public-keys) != "" - ; "either user encrypted password or public keys must be set"
\ No newline at end of file diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.def index d813fb9e..245e7197 100644 --- a/templates/system/login/user/node.tag/authentication/public-keys/node.def +++ b/templates/system/login/user/node.tag/authentication/public-keys/node.def @@ -7,7 +7,3 @@ commit:expression: $VAR(./type/) != "" ; \ "Must configure public key type for $VAR(@)" commit:expression: $VAR(./key/) != "" ; \ "Must configure public key value for $VAR(@)" - -delete:expression: ($VAR(../encrypted-password) != "" && - $VAR(../encrypted-password/@) != "!") - ; "either user encrypted password or public keys must be set"
\ No newline at end of file |