summaryrefslogtreecommitdiff
path: root/server-build/my-simple-cdd
diff options
context:
space:
mode:
Diffstat (limited to 'server-build/my-simple-cdd')
-rw-r--r--server-build/my-simple-cdd/README28
-rw-r--r--server-build/my-simple-cdd/README.md13
-rwxr-xr-xserver-build/my-simple-cdd/make-iso.sh5
-rw-r--r--server-build/my-simple-cdd/profiles/reclaim.packages4
-rwxr-xr-xserver-build/my-simple-cdd/profiles/wootaler.postinst21
5 files changed, 42 insertions, 29 deletions
diff --git a/server-build/my-simple-cdd/README b/server-build/my-simple-cdd/README
index e06f254..2cc2043 100644
--- a/server-build/my-simple-cdd/README
+++ b/server-build/my-simple-cdd/README
@@ -8,7 +8,8 @@ specifications.
Dependencies:
=============
-* qemu
+* debian-archive-keyring
+* qemu, qemu-system, qemu-kvm
* xorriso
* bsdtar
* simple-cdd
@@ -30,13 +31,30 @@ $ ./setup-system.sh
to run the Debian installer to create the 'talerwoo.img'.
+Before booting, make sure that your system is setup to
+route packages and performs NAT for the VM (otherwise
+the installation script that runs on first startup
+will fail):
+
+$ sudo echo 1 > /proc/sys/net/ipv4/ip_forward
+$ sudo iptables -t nat -A POSTROUTING -o wlp3s0 -j MASQUERADE
+
Finally, boot the final image using:
$ ./run-system.sh
+The root password will be set to "wootaler" initially.
+
+Upon first boot, you need to wait for a bit for the systemd
+service firstboot-wootaler.service to complete. You may
+want to check the logs:
+
+# journalctl -u firstboot-wootaler.service
+
+If the script fails due to say network errors, you
+should be able to simply re-run it using:
-Bugs:
-=====
+# firstboot-script.sh
-This is work in progress, the actual WooCommerce and Taler setup is still
-missing!!!
+(it will also re-run on each boot until it has
+succeeded).
diff --git a/server-build/my-simple-cdd/README.md b/server-build/my-simple-cdd/README.md
deleted file mode 100644
index a25d846..0000000
--- a/server-build/my-simple-cdd/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# README.md for using simple-cdd for WooTaler
-
-NOTE: Halted due to Debian Bug #956958
-
-Steps
-
-1 - Install simple-cdd and dependencies
-
-2 - mkdir ~/my-simple-cdd
-
-3 - cp profiles/ directory from repo
-
-4 - `~$ build-simple-cdd --verbose --profiles wootaler`
diff --git a/server-build/my-simple-cdd/make-iso.sh b/server-build/my-simple-cdd/make-iso.sh
index 31763bf..f24c6fe 100755
--- a/server-build/my-simple-cdd/make-iso.sh
+++ b/server-build/my-simple-cdd/make-iso.sh
@@ -9,12 +9,9 @@
# kernel parameters. Badly documented!).
# What does not yet work:
-# - Debian installer STILL asks for _one_ of the language options
-# (likely kernel parameter name wrong / outdated)
# - Debian installer asks for the 'wootaler' profile.
# (not sure which option to set in profiles/wootaler.preseed,
# or if using 'profiles' is the wrong approach entirely here)
-# - disk partitioning fails badly
set -eu
@@ -22,7 +19,7 @@ set -eu
export KERNEL_PARAMS="preseed/file=/cdrom/simple-cdd/default.preseed locale=en_US.UTF-8 keymap=us language=en country=US"
-build-simple-cdd --verbose --profiles wootaler --auto-profiles wootaler
+build-simple-cdd --verbose --profiles wootaler --auto-profiles wootaler --dist buster
# Use shell variable, in case the above changes in the future...
IMG=images/debian-10-amd64-CD-1.iso
diff --git a/server-build/my-simple-cdd/profiles/reclaim.packages b/server-build/my-simple-cdd/profiles/reclaim.packages
index 34ea1e0..42c551a 100644
--- a/server-build/my-simple-cdd/profiles/reclaim.packages
+++ b/server-build/my-simple-cdd/profiles/reclaim.packages
@@ -18,7 +18,7 @@ pkgconf
libltdl-dev
zlib1g-dev
libsodium-dev
-python3.4
+python3.8
texi2html
texinfo
-gnunet //??? 0.13.1?
+gnunet
diff --git a/server-build/my-simple-cdd/profiles/wootaler.postinst b/server-build/my-simple-cdd/profiles/wootaler.postinst
index 0b8f04b..8887fb9 100755
--- a/server-build/my-simple-cdd/profiles/wootaler.postinst
+++ b/server-build/my-simple-cdd/profiles/wootaler.postinst
@@ -20,10 +20,24 @@ cat > /usr/local/bin/firstboot-script.sh <<EOF
set -eu
+echo "Giving system time to complete setup"
+sleep 60
+
echo "## Launching WooCommerce-Taler installation ##"
-cd /tmp
-git clone git://git.taler.net/woocommerce-taler.git
+cd /root
+if test -x woocommerce-taler
+then
+ echo "already exists, skipping"
+else
+ git clone git://git.taler.net/woocommerce-taler.git
+fi
+if test -x gnu-taler-payment-for-woocommerce
+then
+ echo "already exists, skipping"
+else
+ git clone git://git.taler.net/gnu-taler-payment-for-woocommerce.git
+fi
# Get the necessary scripts
yes | tr y '\n' | woocommerce-taler/server-build/QEMU-autobuild/buildWooTalerServer.sh
@@ -32,9 +46,6 @@ yes | tr y '\n' | woocommerce-taler/server-build/QEMU-autobuild/buildWebstore.sh
yes | tr y '\n' | woocommerce-taler/server-build/QEMU-autobuild/buildReclaim.sh
-# Clean up
-# rm -rf /tmp/woocommerce-taler.git
-
# Remove self from boot sequence
rm /etc/systemd/system/firstboot-wootaler.service