9 files changed, 280 insertions, 28 deletions
diff --git a/debian/changelog b/debian/changelog
index 2b24a8f9e..fba9d77d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
-vyos-smoketest (1.0.0) unstable; urgency=medium
+vyos-1x (1.0.0) unstable; urgency=medium
 
-  * Initial release
+  * Dummy changelog entry for vyos-1x repository
+    This is a internal VyOS package and the VyOS package process does not use
+    the debian package changelog for its changes, please refer to the
+    GitHub commitlog and the vyos release-notes for more details.
+    The correct verion number of this package is auto-generated by GIT
+    on build-time
 
- -- Daniil Baturin <daniil@baturin.org>  Tue, 02 Jul 2019 22:29:53 +0200
+ -- Runar Borge <runar@borge.nu>  Sat, 9 May 2020 22:00:00 +0100
diff --git a/debian/control b/debian/control
index ada46a4c1..65808de86 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,129 @@
-Source: vyos-smoketest
+Source: vyos-1x
 Section: contrib/net
 Priority: extra
 Maintainer: VyOS Package Maintainers <maintainers@vyos.net>
-Build-Depends: debhelper (>= 9),
-  quilt,
+Build-Depends:
+  debhelper (>= 9),
+  fakeroot,
+  libvyosconfig0 (>= 0.0.7),
   python3,
-  python3-setuptools,
-  quilt,
+  python3-coverage,
   python3-lxml,
   python3-nose,
-  python3-coverage
+  python3-setuptools,
+  python3-xmltodict,
+  quilt,
+  whois
 Standards-Version: 3.9.6
 
-Package: vyos-smoketest
+Package: vyos-1x
 Architecture: all
-Depends: python3,
+Depends:
+  accel-ppp,
+  beep,
+  bmon,
+  bsdmainutils,
+  conntrack,
+  conserver-client,
+  conserver-server,
+  crda,
+  cron,
+  dbus,
+  dropbear,
+  easy-rsa,
+  etherwake,
+  fastnetmon,
+  file,
+  frr,
+  frr-pythontools,
+  hostapd (>= 0.6.8),
+  hvinfo,
+  igmpproxy,
+  ipaddrcheck,
+  iperf,
+  iperf3,
+  iputils-arping,
+  isc-dhcp-client,
+  isc-dhcp-relay,
+  isc-dhcp-server,
+  iw,
+  keepalived (>=2.0.5),
+  lcdproc,
+  libatomic1,
+  libndp-tools,
+  libpam-radius-auth (>= 1.5.0),
+  libvyosconfig0,
+  lldpd,
+  lm-sensors,
+  lsscsi,
+  mdns-repeater,
+  mtr-tiny,
+  nftables (>= 0.9.3),
+  nginx-light,
+  ntp,
+  ntpdate,
+  ocserv,
+  openssh-server,
+  openvpn,
+  openvpn-auth-ldap,
+  openvpn-auth-radius,
+  pciutils,
+  pdns-recursor,
+  pmacct (>= 1.6.0),
+  pppoe,
+  procps,
+  python3,
+  python3-certbot-nginx,
   ${python3:Depends},
-  ${misc:Depends},
-  vyos-1x
+  python3-flask,
+  python3-hurry.filesize,
+  python3-isc-dhcp-leases,
+  python3-jinja2,
+  python3-jmespath,
+  python3-netaddr,
+  python3-netifaces,
+  python3-psutil,
+  python3-pystache,
+  python3-pyudev,
+  python3-six,
+  python3-tabulate,
+  python3-vici (>= 5.7.2),
+  python3-voluptuous,
+  python3-waitress,
+  python3-xmltodict,
+  python3-zmq,
+  radvd,
+  salt-minion,
+  snmp,
+  snmpd,
+  ssl-cert,
+  systemd,
+  tcpdump,
+  tcptraceroute,
+  telnet,
+  tftpd-hpa,
+  traceroute,
+  udp-broadcast-relay,
+  usb-modeswitch,
+  usbutils,
+  vyos-utils,
+  wide-dhcpv6-client,
+  wireguard,
+  wireless-regdb,
+  wpasupplicant (>= 0.6.7)
+Description: VyOS configuration scripts and data
+ VyOS configuration scripts, interface definitions, and everything
+
+Package: vyos-1x-vmware
+Architecture: amd64 i386
+Depends:
+ vyos-1x,
+ open-vm-tools
+Description: VyOS configuration scripts and data for VMware
+ Adds configuration files required for VyOS running on VMware hosts.
+
+Package: vyos-1x-smoketest
+Architecture: all
+Depends:
+ vyos-1x
 Description: VyOS build sanity checking toolkit
- VyOS build sanity checking toolkit
diff --git a/debian/copyright b/debian/copyright
index a3260a7a1..20704c47c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Daniil Baturin <daniil@baturin.org> on
-Tue, 02 Jul 2019 22:24:20 +0200
+Thu, 17 Aug 2017 20:17:04 -0400
 
-It's original content from the GIT repository <http://github.com/vyos/vyos-smoketest>
+It's original content from the GIT repository <http://github.com/vyos/vyos-1x>
 
 Upstream Author: 
 
@@ -9,13 +9,13 @@ Upstream Author:
 
 Copyright: 
 
-    Copyright (C) 2019 VyOS maintainers and contributors
+    Copyright (C) 2017 VyOS maintainers and contributors
     All Rights Reserved.
 
 License:
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
+it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
@@ -26,10 +26,10 @@ General Public License for more details.
 
 A copy of the GNU General Public License is available as
 `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
-or on the World Wide Web at `http://www.gnu.org/copyleft/lgpl.html'.
+or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
 You can also obtain it by writing to the Free Software Foundation,
 Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 MA 02110-1301, USA.
 
-The Debian packaging is (C) 2019, Daniil Baturin <daniil@baturin.org> and
+The Debian packaging is (C) 2017, Daniil Baturin <daniil@baturin.org> and
 is licensed under the GPL, see above.
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 000000000..6c5d67159
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,6 @@
+# It's FSH compliant!
+vyos-1x: file-in-unusual-dir usr/libexec/*
+vyos-1x: non-standard-dir-in-usr usr/libexec/
+
+# Nothing we can do about that right now
+vyos-1x: dir-or-file-in-opt
diff --git a/debian/rules b/debian/rules
index 526fb8537..58bafd333 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,101 @@
 #!/usr/bin/make -f
 
-DIR := debian/vyos-smoketest
-VYOS_BIN_DIR := usr/bin/
+DIR := debian/tmp
+VYOS_SBIN_DIR := usr/sbin
+VYOS_BIN_DIR := usr/bin
 VYOS_LIBEXEC_DIR := usr/libexec/vyos
-VYOS_DATA_DIR := /usr/share/vyos
-VYOS_CFG_TMPL_DIR := /opt/vyatta/share/vyatta-cfg/templates
-VYOS_OP_TMPL_DIR := /opt/vyatta/share/vyatta-op/templates
+VYOS_DATA_DIR := usr/share/vyos
+VYOS_CFG_TMPL_DIR := opt/vyatta/share/vyatta-cfg/templates
+VYOS_OP_TMPL_DIR := opt/vyatta/share/vyatta-op/templates
 
-MIGRATION_SCRIPTS_DIR := /opt/vyatta/etc/config-migrate/migrate/
+MIGRATION_SCRIPTS_DIR := opt/vyatta/etc/config-migrate/migrate
+SYSTEM_SCRIPTS_DIR := usr/libexec/vyos/system
+SERVICES_DIR := usr/libexec/vyos/services
 
 %:
 	dh $@ --with python3, --with quilt
 
+override_dh_gencontrol:
+	dh_gencontrol -- -v$(shell (git describe --tags --long --match 'vyos/*' --dirty 2>/dev/null || echo 0.0-no.git.tag) | sed -E 's%vyos/%%' | sed -E 's%-dirty%+dirty%')
+
 override_dh_auto_build:
 	make all
 
 override_dh_auto_install:
+	dh_auto_install
+
+	# convert the XML to dictionaries
+	env PYTHONPATH=python python3 python/vyos/xml/generate.py
+
+	cd python; python3 setup.py install --install-layout=deb --root ../$(DIR); cd ..
+
+	# Install scripts
+	mkdir -p $(DIR)/$(VYOS_SBIN_DIR)
+	mkdir -p $(DIR)/$(VYOS_BIN_DIR)
+	cp -r src/utils/* $(DIR)/$(VYOS_BIN_DIR)
+
+	# Install conf mode scripts
+	mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/conf_mode
+	cp -r src/conf_mode/* $(DIR)/$(VYOS_LIBEXEC_DIR)/conf_mode
+
+	# Install op mode scripts
+	mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/op_mode
+	cp -r src/op_mode/* $(DIR)/$(VYOS_LIBEXEC_DIR)/op_mode
+
+	# Install validators
+	mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/validators
+	cp -r src/validators/* $(DIR)/$(VYOS_LIBEXEC_DIR)/validators
+
+	# Install completion helpers
+	mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/completion
+	cp -r src/completion/* $(DIR)/$(VYOS_LIBEXEC_DIR)/completion
+
+	# Install helper scripts
+	cp -r src/helpers/* $(DIR)/$(VYOS_LIBEXEC_DIR)/
+
+	# Install migration scripts
+	mkdir -p $(DIR)/$(MIGRATION_SCRIPTS_DIR)
+	cp -r src/migration-scripts/* $(DIR)/$(MIGRATION_SCRIPTS_DIR)
+
+	# Install system scripts
+	mkdir -p $(DIR)/$(SYSTEM_SCRIPTS_DIR)
+	cp -r src/system/* $(DIR)/$(SYSTEM_SCRIPTS_DIR)
+
+	# Install system services
+	mkdir -p $(DIR)/$(SERVICES_DIR)
+	cp -r src/services/* $(DIR)/$(SERVICES_DIR)
+
+	# Install configuration command definitions
+	mkdir -p $(DIR)/$(VYOS_CFG_TMPL_DIR)
+	cp -r templates-cfg/* $(DIR)/$(VYOS_CFG_TMPL_DIR)
+
+	# Install operational command definitions
+	mkdir -p $(DIR)/$(VYOS_OP_TMPL_DIR)
+	cp -r templates-op/* $(DIR)/$(VYOS_OP_TMPL_DIR)
+
+	# Install data files
+	mkdir -p $(DIR)/$(VYOS_DATA_DIR)
+	cp -r data/* $(DIR)/$(VYOS_DATA_DIR)
+
+	# Install etc configuration files
+	mkdir -p $(DIR)/etc
+	cp -r src/etc/* $(DIR)/etc
+
+	# Install PAM configuration snippets
+	mkdir -p $(DIR)/usr/share/pam-configs
+	cp -r src/pam-configs/* $(DIR)/usr/share/pam-configs
+
+	# Install systemd service units
+	mkdir -p $(DIR)/lib/systemd/system
+	cp -r src/systemd/* $(DIR)/lib/systemd/system
+
+	# Make directory for generated configuration file
+	mkdir -p $(DIR)/etc/vyos
+
 	# Install smoke test scripts
 	mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/smoke/
-	cp -r scripts/* $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/smoke
+	cp -r smoketest/scripts/* $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/smoke
 
 	# Install system programs
 	mkdir -p $(DIR)/$(VYOS_BIN_DIR)
-	cp -r bin/* $(DIR)/$(VYOS_BIN_DIR)
+	cp -r smoketest/bin/* $(DIR)/$(VYOS_BIN_DIR)
diff --git a/debian/vyos-1x-smoketest.install b/debian/vyos-1x-smoketest.install
new file mode 100644
index 000000000..fdf949557
--- /dev/null
+++ b/debian/vyos-1x-smoketest.install
@@ -0,0 +1,2 @@
+usr/bin/vyos-smoketest
+usr/libexec/vyos/tests/smoke
diff --git a/debian/vyos-1x-vmware.install b/debian/vyos-1x-vmware.install
new file mode 100644
index 000000000..715015621
--- /dev/null
+++ b/debian/vyos-1x-vmware.install
@@ -0,0 +1 @@
+etc/vmware-tools
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install
new file mode 100644
index 000000000..6cd678442
--- /dev/null
+++ b/debian/vyos-1x.install
@@ -0,0 +1,23 @@
+etc/dhcp
+etc/ppp
+etc/rsyslog.d
+etc/systemd
+etc/sysctl.d
+etc/udev
+etc/vyos
+lib/
+opt/
+usr/bin/initial-setup
+usr/bin/vyos-config-file-query
+usr/bin/vyos-config-to-commands
+usr/bin/vyos-config-to-json
+usr/bin/vyos-hostsd-client
+usr/lib
+usr/libexec/vyos/completion
+usr/libexec/vyos/conf_mode
+usr/libexec/vyos/op_mode
+usr/libexec/vyos/services
+usr/libexec/vyos/system
+usr/libexec/vyos/validators
+usr/libexec/vyos/*.py
+usr/share
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
new file mode 100644
index 000000000..dc129cb54
--- /dev/null
+++ b/debian/vyos-1x.postinst
@@ -0,0 +1,32 @@
+#!/bin/sh -e
+if ! deb-systemd-helper --quiet was-enabled salt-minion.service; then
+    # Enables the unit on first installation, creates new
+    # symlinks on upgrades if the unit file has changed.
+    deb-systemd-helper disable salt-minion.service >/dev/null || true
+fi
+
+if [ -x "/etc/init.d/salt-minion" ]; then
+    update-rc.d -f salt-minion remove >/dev/null
+fi
+
+# Add minion user for salt-minion
+if ! grep -q '^minion' /etc/passwd; then
+    adduser --quiet --firstuid 100 --system --disabled-login --ingroup vyattacfg --gecos "salt minion user" --shell /bin/vbash minion
+    adduser --quiet minion frrvty
+    adduser --quiet minion sudo
+    adduser --quiet minion adm
+    adduser --quiet minion dip
+    adduser --quiet minion disk
+    adduser --quiet minion users
+fi
+
+# add hostsd group for vyos-hostsd
+if ! grep -q '^hostsd' /etc/group; then
+    addgroup --quiet --system hostsd
+fi
+
+# add dhcpd user for dhcp-server
+if ! grep -q '^dhcpd' /etc/passwd; then
+    adduser --quiet --system --disabled-login --no-create-home --home /run/dhcp-server dhcpd
+    adduser --quiet dhcpd hostsd
+fi