From 3e0b35e3e6d206afcca06441e1465736b36c042e Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Mon, 14 Jun 2021 19:30:29 +0200
Subject: [PATCH] installer: no default .cfg but therefore two examples that
 can be used as template

---
 pkg/de-p1st-installer/PKGBUILD                |  5 ++--
 pkg/de-p1st-installer/README.md               |  3 +-
 .../example-headless-docker.cfg               | 28 +++++++++++++++++++
 .../{installer.cfg => example-vbox.cfg}       |  2 +-
 4 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 pkg/de-p1st-installer/example-headless-docker.cfg
 rename pkg/de-p1st-installer/{installer.cfg => example-vbox.cfg} (96%)

diff --git a/pkg/de-p1st-installer/PKGBUILD b/pkg/de-p1st-installer/PKGBUILD
index 4bc7e21..f3cbe55 100644
--- a/pkg/de-p1st-installer/PKGBUILD
+++ b/pkg/de-p1st-installer/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=installer
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.1.6
+pkgver=0.1.7
 pkgrel=1
 pkgdesc="Bash script to install Arch Linux"
 arch=('any')
@@ -22,5 +22,6 @@ package() {
   install -Dm0644 lib/user-input.sh    "$pkgdir"/usr/lib/"${pkgname}"/user-input.sh
   install -Dm0644 lib/util.sh          "$pkgdir"/usr/lib/"${pkgname}"/util.sh
 
-  install -Dm0644 -o0 installer.cfg    "$pkgdir"/etc/"${pkgname}"/installer.cfg
+  install -Dm0644 -o0 example-vbox.cfg            "$pkgdir"/etc/"${pkgname}"/example-vbox.cfg
+  install -Dm0644 -o0 example-headless-docker.cfg "$pkgdir"/etc/"${pkgname}"/example-headless-docker.cfg
 }
diff --git a/pkg/de-p1st-installer/README.md b/pkg/de-p1st-installer/README.md
index 41739d5..d99c145 100644
--- a/pkg/de-p1st-installer/README.md
+++ b/pkg/de-p1st-installer/README.md
@@ -25,7 +25,8 @@ ls out/out_dir/*.iso
 4) Connect to target computer via `ssh`
   * See [build-iso/out/out_dir/ssh-host-fingerprints](../../build-iso/out/out_dir/ssh-host-fingerprints)
     for verification of the ssh fingerprint of the target computer
-5) Adjust `/etc/de-p1st-installer/installer.cfg` (or delete it for interactive mode)
+5) Copy and adjust one of the example configurations (`/etc/de-p1st-installer/*.cfg`) to `/etc/de-p1st-installer/installer.cfg`
+   * This step is optional. If skipped, then (most) of this can be entered interactively
 6) Run the installer:
 
 ```shell
diff --git a/pkg/de-p1st-installer/example-headless-docker.cfg b/pkg/de-p1st-installer/example-headless-docker.cfg
new file mode 100644
index 0000000..21e9e6b
--- /dev/null
+++ b/pkg/de-p1st-installer/example-headless-docker.cfg
@@ -0,0 +1,28 @@
+# Example config for a headless root server running docker
+
+FQDN=v2202012136854137045.happysrv.de
+STATIC_IP=45.83.105.88
+IPV6_CAPABLE=1
+HOSTNAME=p1st-arch-1
+USERNAME=yoda
+
+TARGET_BLOCK_DEVICE=/dev/sda
+BOOT_PART_SIZE=500  # MiB
+FS=BTRFS
+FS_CHOSEN_MOUNT_OPTIONS=('noatime')
+
+CPU_VENDOR=none
+BIOS_TYPE=uefi
+
+# If set to "1", then the data, boot and luks partitions
+# will be left mounted/opened after installation
+LEAVE_MOUNTED=0
+
+PACSTRAP_INTERACTIVE=1
+
+# to skip pacman selections
+ADDITIONAL_PKGS=('mkinitcpio' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder' 'qemu-guest-agent')
+# remote ssh access
+ADDITIONAL_PKGS=('de-p1st-ssh' 'de-p1st-ssh-key-yoda')
+# docker and docker-compose
+ADDITIONAL_PKGS=('docker' 'docker-compose')
diff --git a/pkg/de-p1st-installer/installer.cfg b/pkg/de-p1st-installer/example-vbox.cfg
similarity index 96%
rename from pkg/de-p1st-installer/installer.cfg
rename to pkg/de-p1st-installer/example-vbox.cfg
index a7b52fb..4c86a78 100644
--- a/pkg/de-p1st-installer/installer.cfg
+++ b/pkg/de-p1st-installer/example-vbox.cfg
@@ -1,4 +1,4 @@
-# Example config (for test in virtual machine)
+# Example config for testing in VirtualBox
 
 # FQDN=domain.name.of.this.host.de
 # STATIC_IP=123.456.789.012