diff options
| -rw-r--r-- | debian/changelog | 25 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.def | 4 | ||||
| -rw-r--r-- | templates/system/login/user/node.def | 8 | ||||
| -rw-r--r-- | templates/system/sysctl/all/node.def | 5 | ||||
| -rw-r--r-- | templates/system/sysctl/all/node.tag/node.def | 1 | ||||
| -rw-r--r-- | templates/system/sysctl/all/node.tag/value/node.def | 8 | ||||
| -rw-r--r-- | templates/system/sysctl/custom/node.tag/node.def | 1 | ||||
| -rw-r--r-- | templates/system/sysctl/custom/node.tag/value/node.def | 5 | ||||
| -rw-r--r-- | templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def | 8 | ||||
| -rw-r--r-- | templates/system/sysctl/net.ipv4.ipfrag_time/node.def | 9 |
10 files changed, 41 insertions, 33 deletions
diff --git a/debian/changelog b/debian/changelog index a1ec904a..d2199010 100644 --- a/debian/changelog +++ b/debian/changelog @@ -82,6 +82,31 @@ vyatta-cfg-system (0.20.44+vyos2+current1) unstable; urgency=medium -- Kim Hagen <kim.sidney@gmail.com> Sun, 24 Jan 2016 15:04:10 -0500 +vyatta-cfg-system (0.20.44+vyos2+lithium43) unstable; urgency=low + + [ Alex Harpin ] + * vyatta-cfg-system: drop the sysctl all node as it's broken + * vyatta-cfg-system: tidy up of sysctl nodes, remove extraneous nodes + * vyatta-cfg-system: prevent deletion of all authentication for user + + -- Alex Harpin <development@landsofshadow.co.uk> Tue, 01 Dec 2015 23:03:42 +0000 + +vyatta-cfg-system (0.20.44+vyos2+lithium42) unstable; urgency=low + + [ Alex Harpin ] + * vyatta-cfg-system: add restart option to vyatta-snmp.pl + * vyatta-cfg-system: formatting changes for style consistency + + -- Alex Harpin <development@landsofshadow.co.uk> Sat, 21 Nov 2015 11:33:38 +0000 + +vyatta-cfg-system (0.20.44+vyos2+lithium41) unstable; urgency=low + + [ Alex Harpin ] + * vyatta-cfg-system: formatting changes for style consistency + * vyatta-cfg-system: add restart option to vyatta-dns-forwarding.pl + + -- Alex Harpin <development@landsofshadow.co.uk> Thu, 19 Nov 2015 22:25:54 +0000 + vyatta-cfg-system (0.20.44+vyos2+lithium41) unstable; urgency=low [ Alex Harpin ] diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index bd2c4255..1e50a1dd 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -57,9 +57,9 @@ create: else TTL="ttl 255" fi - if [ -n "$VAR(./parameters/ip/key/@)" ]; then + if [ -n "$VAR(./parameters/ip/key/@)" ]; then KEY="key $VAR(./parameters/ip/key/@)" - fi + fi if [ "$VAR(./encapsulation/@)" == "gre" ] && [ -z $VAR(./remote-ip/) ]; then ip tunnel add $VAR(@) local $LIP mode gre $KEY $TTL $TOS elif [ "$VAR(./encapsulation/@)" == "sit" ] && [ -n "$VAR(./6rd-prefix/@)" ]; then diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def index 451cc078..41a7e048 100644 --- a/templates/system/login/user/node.def +++ b/templates/system/login/user/node.def @@ -11,3 +11,11 @@ commit:expression: $VAR(@) == "" || commit:expression: $VAR(@) == "" || $VAR(authentication/encrypted-password) != "" || $VAR(authentication/encrypted-password/@) = "!" + +end: if [ ${COMMIT_ACTION} != 'DELETE' ] && + [ -z "$VAR(authentication/public-keys)" ] && + [[ -z "$VAR(authentication/encrypted-password)" || + "$VAR(authentication/encrypted-password/@)" = "!" ]]; then + echo "either user encrypted password or public keys must be set"; + exit 1; + fi diff --git a/templates/system/sysctl/all/node.def b/templates/system/sysctl/all/node.def deleted file mode 100644 index 47f08dbc..00000000 --- a/templates/system/sysctl/all/node.def +++ /dev/null @@ -1,5 +0,0 @@ -tag: -priority: 318 -type: txt -help: List all sysctl options (BROKEN: Does not list all values) -allowed: /sbin/sysctl -N -a 2>&- diff --git a/templates/system/sysctl/all/node.tag/node.def b/templates/system/sysctl/all/node.tag/node.def deleted file mode 100644 index b688551e..00000000 --- a/templates/system/sysctl/all/node.tag/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Value for sysctl option diff --git a/templates/system/sysctl/all/node.tag/value/node.def b/templates/system/sysctl/all/node.tag/value/node.def deleted file mode 100644 index ac4daa52..00000000 --- a/templates/system/sysctl/all/node.tag/value/node.def +++ /dev/null @@ -1,8 +0,0 @@ -priority: 319 # Failure barrier only - no ordering constraints - -type: txt -help: Configure sysctl option -val_help: <integer>; Set sysctl option - -update: sudo /opt/vyatta/sbin/vyatta_update_sysctl.pl --option $VAR(../@) $VAR(@) - diff --git a/templates/system/sysctl/custom/node.tag/node.def b/templates/system/sysctl/custom/node.tag/node.def deleted file mode 100644 index b688551e..00000000 --- a/templates/system/sysctl/custom/node.tag/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Value for sysctl option diff --git a/templates/system/sysctl/custom/node.tag/value/node.def b/templates/system/sysctl/custom/node.tag/value/node.def index 08a5f5a3..eefc0cbf 100644 --- a/templates/system/sysctl/custom/node.tag/value/node.def +++ b/templates/system/sysctl/custom/node.tag/value/node.def @@ -1,8 +1,7 @@ +type: txt priority: 319 # Failure barrier only - no ordering constraints -type: txt help: Configure sysctl option -val_help: <value>; Set sysctl option value +val_help: <value>; Set sysctl option to specified value update: sudo /opt/vyatta/sbin/vyatta_update_sysctl.pl --option $VAR(../@) $VAR(@) - diff --git a/templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def b/templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def index 22dba70d..a559a478 100644 --- a/templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def +++ b/templates/system/sysctl/net.ipv4.igmp_max_memberships/node.def @@ -1,12 +1,8 @@ -# -# Configuration template for offload settings -# - +type: u32 priority: 319 # Failure barrier only - no ordering constraints -type: u32 help: Configure net.ipv4.igmp_max_memberships option -val_help: <integer>; Set net.ipv4.igmp_max_memberships value +val_help: <integer>; Set net.ipv4.igmp_max_memberships to specified value update: sudo /opt/vyatta/sbin/vyatta_update_sysctl.pl --option net.ipv4.igmp_max_memberships $VAR(@) diff --git a/templates/system/sysctl/net.ipv4.ipfrag_time/node.def b/templates/system/sysctl/net.ipv4.ipfrag_time/node.def index ee390f44..671d6e01 100644 --- a/templates/system/sysctl/net.ipv4.ipfrag_time/node.def +++ b/templates/system/sysctl/net.ipv4.ipfrag_time/node.def @@ -1,12 +1,7 @@ -# -# Configuration template for offload settings -# - +type: u32 priority: 319 # Failure barrier only - no ordering constraints -type: u32 help: Configure net.ipv4.ipfrag_time option -val_help: <integer>; Set net.ipv4.ipfrag_time to specific value +val_help: <integer>; Set net.ipv4.ipfrag_time to specified value update: sudo /opt/vyatta/sbin/vyatta_update_sysctl.pl --option net.ipv4.ipfrag_time $VAR(@) - |