Merge branch 'current' into lithiumlithium

Conflicts:
	debian/changelog
	scripts/snmp/vyatta-snmp-v3.pl
	scripts/snmp/vyatta-snmp.pl
	templates/interfaces/tunnel/node.def
	templates/system/sysctl/custom/node.def

4 files changed, 122 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index 15a8c152..d2199010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,94 @@
+vyatta-cfg-system (0.20.44+vyos2+current11) unstable; urgency=medium
+
+  * T588: Remove DNS forwarder restart command in favour if XML interface definition
+
+ -- Christian Poessinger <christian@poessinger.com>  Wed, 11 Apr 2018 20:35:32 +0200
+
+vyatta-cfg-system (0.20.44+vyos2+current10) unstable; urgency=medium
+
+  * T157: Remove "install system" command
+
+ -- Christian Poessinger <christian@poessinger.com>  Sat, 10 Mar 2018 18:34:00 +0100
+
+vyatta-cfg-system (0.20.44+vyos2+current9) unstable; urgency=medium
+
+  * T546: Add support for IPv6 address in 'service dns forwarding domain'
+  * T533: Rename "client" NTP option to "allow-clients"
+  * T522: Adjust rsyslog.conf to use the journald forwarding
+
+ -- Christian Poessinger <christian@poessinger.com>  Wed, 21 Feb 2018 11:28:46 +0100
+
+vyatta-cfg-system (0.20.44+vyos2+current8) unstable; urgency=medium
+
+  * T523: Only bind dnsmasq to configured interfaces
+  * T523: Use systemctl to stop/restart dnsmasq
+  * T523: Use new location for dnsmasq config files
+
+ -- Christian Poessinger <christian@poessinger.com>  Sun, 21 Jan 2018 17:16:04 +0100
+
+vyatta-cfg-system (0.20.44+vyos2+current7) unstable; urgency=medium
+
+  * T297: Fix DNS Forwarding server does not allow IPv6 address in name-server
+
+ -- Christian Poessinger <christian@poessinger.com>  Thu, 28 Dec 2017 00:39:04 +0100
+
+vyatta-cfg-system (0.20.44+vyos2+current6) unstable; urgency=medium
+
+  * T496: remove diagnostic partition for RAID1 installs
+
+ -- Christian Poessinger <christian@poessinger.com>  Wed, 27 Dec 2017 23:32:44 +0100
+
+vyatta-cfg-system (0.20.44+vyos2+current5) unstable; urgency=medium
+
+  * T488: GRUB can't boot from software RAID
+
+ -- Christian Poessinger <christian@poessinger.com>  Tue, 26 Dec 2017 14:40:54 +0100
+
+vyatta-cfg-system (0.20.44+vyos2+current4) unstable; urgency=medium
+
+  * T414: Remove telnetd service
+
+ -- Christian Poessinger <christian@poessinger.com>  Sat, 09 Dec 2017 15:29:45 +0100
+
+vyatta-cfg-system (0.20.44+vyos2+current3) unstable; urgency=medium
+
+  [ Kim Hagen ]
+  * Update 'is_live_cd_boot' and 'is_union_instal' functions to search on 'overlay' instead of 'overlayfs'
+
+  [ Seamus Caveney ]
+  * vyatta-cfg-system: add support for 6rd tunnel interfaces
+
+  [ Daniil Baturin ]
+  * Sanitize dependencies, use ISC DHCP client.
+
+ -- Daniil Baturin <daniil@baturin.org>  Wed, 27 Jan 2016 08:24:32 -0500
+
+vyatta-cfg-system (0.20.44+vyos2+current2) unstable; urgency=medium
+
+  * Update dependencies
+
+ -- Kim Hagen <kim.sidney@gmail.com>  Mon, 25 Jan 2016 03:47:13 -0500
+
+vyatta-cfg-system (0.20.44+vyos2+current1) unstable; urgency=medium
+
+  [ UnicronNL ]
+  * Remove fuse group, not needed in debian jessie
+
+  [ Thomas Jepp ]
+  * Dependency fixes for Jessie. Remove the dependency on vyatta-busybox, use the system busybox.
+  * Add missing runtime dependencies.
+
+  [ Kim Hagen ]
+
+ -- 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
@@ -12,7 +96,7 @@ 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
@@ -20,7 +104,7 @@ 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
diff --git a/debian/control b/debian/control
index cb0e0f59..12b27b1b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vyatta-cfg-system
 Section: contrib/net
 Priority: extra
 Maintainer: VyOS Package Maintainers <maintainers@vyos.net>
-Build-Depends: debhelper (>= 5), autotools-dev
+Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, cpio
 Standards-Version: 3.9.1
 
 Package: vyatta-cfg-system
@@ -20,32 +20,21 @@ Depends:  adduser,
  libpam-runtime (>= 1.0.1-5),
  vyatta-bash | bash (>= 3.1),
  sysv-rc,
- ntp (>= 4.2.4p6+vyatta-7),
  udev (>= 160-1),
  rsyslog | system-log-daemon,
- vyatta-busybox,
+ busybox,
  sudo,
- snmpd (>= 5.4.2.1-vyatta11),
- vyatta-keepalived (>= 1.1.15-1-vyatta-5),
  bridge-utils,
  ethtool,
- ssh (>= 1:5.1p1-5),
- openssh-server (>= 1:5.1p1-5),
  ed,
  ifupdown,
- tshark,
- iputils-arping,
  installation-report,
  laptop-detect,
- usbutils,
  mgetty,
  tasksel,
- snmp,
  tcpdump,
- dnsmasq (>= 2.45-1+lenny1),
  mdadm,
- ddclient (>= 3.8.2+vyos2+lithium6),
- dnsutils,
+ ddclient (>= 3.8.2+vyos2+current1),
  libio-socket-ssl-perl,
  vyatta-biosdevname,
  ipvsadm (>= 1:1.24-2.1),
@@ -53,11 +42,11 @@ Depends:  adduser,
  apt-transport-https,
  hostapd (>= 1:0.6.9-3),
  libcap2-bin (>= 2.19),
- vyatta-dhcp3-client (>= 4.1.8+vyos2+lithium3),
- vlan,
- iproute,
+ isc-dhcp-client,
+ iproute2,
  curl,
  parted,
+ libpam-cap,
  ${arch:Depends}
 Pre-Depends: bash-completion
 Suggests: util-linux (>= 2.13-5),
diff --git a/debian/vyatta-cfg-system.install b/debian/vyatta-cfg-system.install
new file mode 100644
index 00000000..240d5fc8
--- /dev/null
+++ b/debian/vyatta-cfg-system.install
@@ -0,0 +1 @@
+mibs usr/share/snmp
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 37c19275..fd27ebc4 100755
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -8,9 +8,12 @@ sbindir=@sbindir@
 
 # remove init of daemons that are controlled by Vyatta configuration process
 for init in ntp ssh snmpd openhpid logd \
-            ipvsadm dnsmasq ddclient radvd hostapd conntrackd
+            ipvsadm dnsmasq ddclient radvd \
+	    hostapd conntrackd keepalived \
+	    pdns-recursor
 do
   update-rc.d -f ${init} remove >/dev/null
+  systemctl disable ${init} >/dev/null
 done
 
 # remove extra call to clock setup only need one. this speeds up boot
@@ -187,7 +190,7 @@ if [ -e /etc/default/mdadm ]; then
 fi
 
 # Disable reboot on ctrl-alt-delete
-sed -i -e '/^ca/s/\/sbin\/shutdown .*$/\/bin\/echo "Ctrl\-Alt\-Del disabled."/' /etc/inittab
+ln -sf /dev/null /lib/systemd/system/ctrl-alt-del.target
 
 # remove unnecessary ddclient script in /etc/ppp/ip-up.d/
 # this logs unnecessary messages trying to start ddclient
@@ -217,6 +220,29 @@ update-rc.d vyos-intfwatchd start 2345
 # set ec2-vyos-init to start on boot
 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 vyattaop
+  adduser --quiet radius_user operator
+  adduser --quiet radius_user adm
+  adduser --quiet radius_user dip
+  adduser --quiet radius_user users
+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 vyattacfg
+  adduser --quiet radius_priv_user sudo
+  adduser --quiet radius_priv_user adm
+  adduser --quiet radius_priv_user dip
+  adduser --quiet radius_priv_user disk
+  adduser --quiet radius_priv_user users
+fi
+
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 4