From 870adf892ac408855092458b5ba8f8505dc60255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?=
 <hector@molinero.dev>
Date: Thu, 6 Feb 2020 20:17:29 +0100
Subject: [PATCH] Install official and WireGuard packages in separate steps

---
 packer/build.pkr.hcl | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/packer/build.pkr.hcl b/packer/build.pkr.hcl
index 815736b..5ca794d 100644
--- a/packer/build.pkr.hcl
+++ b/packer/build.pkr.hcl
@@ -25,14 +25,30 @@ build {
       EOF
       ,
       <<EOF
-        printf 'deb http://ppa.launchpad.net/wireguard/wireguard/ubuntu/ bionic main\n' > /etc/apt/sources.list.d/wireguard.list
-        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E1B39B6EF6DDB96564797591AE33835F504A1A25
         apt-get update
-        apt-get upgrade -yo DPkg::options::=--force-confold
-        apt-get install -yo DPkg::options::=--force-confold dns-root-data fail2ban ufw unattended-upgrades unbound
-        apt-get install -yo DPkg::options::=--force-confold linux-headers-$(uname -r) openresolv wireguard
-        apt-get install -yo DPkg::options::=--force-confold htop iperf3 qrencode nano ssh-import-id
-        apt-get autoremove -y
+        apt-get dist-upgrade -yo DPkg::options::=--force-confold
+      EOF
+      ,
+      <<EOF
+        apt-get install -yo DPkg::options::=--force-confold \
+          dns-root-data \
+          fail2ban \
+          htop \
+          iperf3 \
+          linux-headers-"$(uname -r)" \
+          nano \
+          openresolv \
+          qrencode \
+          ssh-import-id \
+          ufw \
+          unattended-upgrades \
+          unbound
+      EOF
+      ,
+      <<EOF
+        printf 'deb http://ppa.launchpad.net/wireguard/wireguard/ubuntu/ $(lsb_release -cs) main\n' > /etc/apt/sources.list.d/wireguard.list
+        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E1B39B6EF6DDB96564797591AE33835F504A1A25
+        apt-get update && apt-get install -yo DPkg::options::=--force-confold wireguard
       EOF
       ,
       <<EOF
@@ -54,8 +70,8 @@ build {
       EOF
       ,
       <<EOF
-        groupadd -r ssh-user
-        usermod -aG ssh-user root
+        groupadd --system ssh-user
+        usermod --append --groups ssh-user root
         passwd -d root
       EOF
       ,