From be59ca04cd377cc12cf9c3264fd0d27757d15ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jake=20Buchholz=20G=C3=B6kt=C3=BCrk?= <tomalok@gmail.com>
Date: Wed, 13 Jul 2022 20:53:55 -0700
Subject: [PATCH] * move example tiny-cloud config to
 /lib/tiny-cloud/tiny-cloud.conf * installation of various cloud-specific
 configs will be handled by post-install scripts

---
 Makefile                                      | 20 ++++---------------
 README.md                                     |  4 ++--
 .../tiny-cloud/tiny-cloud.conf                |  1 +
 3 files changed, 7 insertions(+), 18 deletions(-)
 rename etc/conf.d/tiny-cloud.example => lib/tiny-cloud/tiny-cloud.conf (96%)

diff --git a/Makefile b/Makefile
index 69ac9da..84a29d4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,19 +4,18 @@ SUBPACKAGES = core network openrc aws azure gcp oci nocloud
 
 .PHONY: install $(SUBPACKAGES)
 
-# installs all subpackages, then replaces cloud-specific config with example
 install: $(SUBPACKAGES)
-	mv "$(PREFIX)"/etc/conf.d/tiny-cloud.example "$(PREFIX)"/etc/conf.d/tiny-cloud
+	install -Dm644 lib/tiny-cloud.conf \
+		"$(PREFIX)"/etc/conf.d/tiny-cloud
 
 core:
 	install -Dm755 -t "$(PREFIX)"/bin \
 		bin/imds
-	install -Dm644 -t "$(PREFIX)"/etc/conf.d \
-		etc/conf.d/tiny-cloud.example
 	install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud \
 		lib/tiny-cloud/common \
 		lib/tiny-cloud/init-* \
-		lib/tiny-cloud/mdev
+		lib/tiny-cloud/mdev \
+		lib/tiny-cloud/tiny-cloud.conf
 
 network:
 	install -Dm644 -t "$(PREFIX)"/etc/network/interfaces.d \
@@ -37,33 +36,22 @@ aws: conf_dir
 		lib/mdev/nvme-ebs-links
 	install -Dm644 -t "$(PREFIX)"/lib/tiny-cloud/aws \
 		lib/tiny-cloud/aws/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=aws/' \
-		-Ee 's/^#?HOTPLUG_MODULES=.*/HOTPLUG_MODULES="vnic_eth_hotplug nvme_ebs_links"/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 azure: conf_dir
 	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/azure \
 		lib/tiny-cloud/azure/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=azure/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 gcp: conf_dir
 	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/gcp \
 		lib/tiny-cloud/gcp/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=gcp/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 oci: conf_dir
 	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/oci \
 		lib/tiny-cloud/oci/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=oci/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 nocloud: conf_dir
 	install -Dm644 -t $(PREFIX)/lib/tiny-cloud/nocloud \
 		lib/tiny-cloud/nocloud/*
-	sed -Ee 's/^#?CLOUD=.*/CLOUD=nocloud/' \
-		etc/conf.d/tiny-cloud.example > "$(PREFIX)"/etc/conf.d/tiny-cloud
 
 conf_dir:
 	mkdir -p "$(PREFIX)"/etc/conf.d
diff --git a/README.md b/README.md
index cb06655..b18f1a0 100644
--- a/README.md
+++ b/README.md
@@ -82,8 +82,8 @@ rc-update add tiny-cloud-final default
 ## Configuration
 
 By default, Tiny Cloud expects configuration at `/etc/conf.d/tiny-cloud`,
-The stock [`etc/conf.d/tiny-cloud`](etc/conf.d/tiny-cloud) file contains
-details of all tuneable settings.
+The stock [lib/tiny-cloud/tiny-cloud.conf`](lib/tiny-cloud/tiny-cloud.conf)
+file contains details of all tuneable settings.
 
 _Because Tiny Cloud does not currently do auto-detection, you **MUST** set a
 configuration value for `CLOUD` indicating which cloud provider will be used.
diff --git a/etc/conf.d/tiny-cloud.example b/lib/tiny-cloud/tiny-cloud.conf
similarity index 96%
rename from etc/conf.d/tiny-cloud.example
rename to lib/tiny-cloud/tiny-cloud.conf
index 5cc8b59..5daf7ab 100644
--- a/etc/conf.d/tiny-cloud.example
+++ b/lib/tiny-cloud/tiny-cloud.conf
@@ -1,4 +1,5 @@
 # Tiny Cloud configuration
+# /etc/conf.d/tiny-cloud
 
 # REQUIRED: The instance's cloud provider
 # valid: aws, azure, gcp, oci, nocloud