From cb3a7f980c59af02870d1039c02ddfc3912bb91f Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Thu, 20 May 2021 06:15:24 +0200
Subject: [PATCH] chore: cloudinit updates

* add sleep times
* add creating a call-sign file for ansible (waitpls waits for a certain
  file)
* use more bootcmd (runs early)
* switch to 'package_upgrade: true' everywhere (again)
---
 vms/cloudinit.host-attacker.cfg | 16 +++++++++++++++-
 vms/cloudinit.host-defender.cfg |  5 +++--
 vms/cloudinit.host-victim.cfg   |  4 ++++
 vms/cloudinit.router.cfg        |  3 ++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/vms/cloudinit.host-attacker.cfg b/vms/cloudinit.host-attacker.cfg
index 2afc5a5..dd9358e 100644
--- a/vms/cloudinit.host-attacker.cfg
+++ b/vms/cloudinit.host-attacker.cfg
@@ -1,6 +1,19 @@
 #cloud-config
 # vim: ft=yaml
 
+bootcmd:
+  - cat /etc/resolv.conf
+  - uname -r
+  - timedatectl set-ntp 1
+  - timedatectl set-timezone Europe/Bratislava
+  - systemctl disable --now dnf-makecache.timer
+  - systemctl stop systemd-resolved
+  - echo "nameserver 8.8.8.8" > /etc/resolv.conf
+  - dnf config-manager --set-disabled fedora-cisco-openh264
+  - dnf config-manager --set-enabled updates updates-testing
+  - sed -i "s/ext4 * defaults *1 1/ext4 noatime 0 0/" /etc/fstab
+  - sleep 10
+
 runcmd:
   - cat /etc/resolv.conf
   - uname -r
@@ -12,6 +25,7 @@ runcmd:
   - dnf distro-sync -y
   - dnf clean all
   - sed -i "s/ext4 * defaults *1 1/ext4 noatime 0 0/" /etc/fstab
+  - touch /.plsgo
 
 write_files:
   - content: |
@@ -87,5 +101,5 @@ packages:
   - tcpflow
   - tcptrack
 
-package_upgrade: false
+package_upgrade: true
 package_reboot_if_required: true
diff --git a/vms/cloudinit.host-defender.cfg b/vms/cloudinit.host-defender.cfg
index 713eebc..152a0fc 100644
--- a/vms/cloudinit.host-defender.cfg
+++ b/vms/cloudinit.host-defender.cfg
@@ -15,6 +15,7 @@ bootcmd:
   - sleep 10
 
 runcmd:
+  - sleep 10
   - cat /etc/resolv.conf
   - uname -r
   - dnf upgrade --refresh -y
@@ -96,7 +97,7 @@ packages:
   - tcpflow
   - tcptrack
   # fastnetmon/nDPI build requirements
-   - git
+  - git
   - make
   - cmake
   - automake
@@ -144,5 +145,5 @@ packages:
   - ncurses-libs
   - ncurses-static
 
-package_upgrade: false
+package_upgrade: true
 package_reboot_if_required: true
diff --git a/vms/cloudinit.host-victim.cfg b/vms/cloudinit.host-victim.cfg
index 4b43d5a..376c94f 100644
--- a/vms/cloudinit.host-victim.cfg
+++ b/vms/cloudinit.host-victim.cfg
@@ -1,6 +1,9 @@
 #cloud-config
 # vim: ft=yaml
 
+bootcmd:
+  - sleep 20
+
 runcmd:
   - cat /etc/resolv.conf
   - uname -r
@@ -8,6 +11,7 @@ runcmd:
   - timedatectl set-timezone Europe/Bratislava
   - dnf config-manager --set-enabled cr powertools
   - sed -i "s/xfs * defaults *0 0/xfs noatime 0 0/" /etc/fstab
+  - touch /.plsgo
 
 write_files:
   - content: |
diff --git a/vms/cloudinit.router.cfg b/vms/cloudinit.router.cfg
index 2bfd21e..7c45756 100644
--- a/vms/cloudinit.router.cfg
+++ b/vms/cloudinit.router.cfg
@@ -1,7 +1,8 @@
 #cloud-config
 # vim: ft=yaml
 
-runcmd:
+bootcmd:
+  - sleep 10
   - cat /etc/resolv.conf
   - uname -r
   - timedatectl set-ntp 1