summaryrefslogtreecommitdiff
path: root/server-build
diff options
context:
space:
mode:
authorHansjürg Wenger <hansjuerg.wenger@bfh.ch>2021-01-12 23:30:44 +0100
committerHansjürg Wenger <hansjuerg.wenger@bfh.ch>2021-01-12 23:30:44 +0100
commit88184af05d9377ce726ef32f7cda8ad3e956beb2 (patch)
tree311251da54f72dd4e2c4bbb2f56ef0d4e4c272f3 /server-build
parent42c8e91228e8d6488d9d0c1762ad913c797c68ca (diff)
downloadwoocommerce-taler-88184af05d9377ce726ef32f7cda8ad3e956beb2.tar.gz
woocommerce-taler-88184af05d9377ce726ef32f7cda8ad3e956beb2.tar.bz2
woocommerce-taler-88184af05d9377ce726ef32f7cda8ad3e956beb2.zip
modified client-build
Diffstat (limited to 'server-build')
-rw-r--r--server-build/my-simple-cdd/00-README2
-rwxr-xr-xserver-build/my-simple-cdd/03-run-system.sh11
-rw-r--r--server-build/my-simple-cdd/profiles/wootaler.preseed4
-rw-r--r--server-build/my-simple-cdd/ssh/root.cfg (renamed from server-build/my-simple-cdd/ssh.cfg)1
4 files changed, 10 insertions, 8 deletions
diff --git a/server-build/my-simple-cdd/00-README b/server-build/my-simple-cdd/00-README
index a836a3a..bf57334 100644
--- a/server-build/my-simple-cdd/00-README
+++ b/server-build/my-simple-cdd/00-README
@@ -56,7 +56,7 @@ d. Go into the Wordpress configuration for the OIDC plugin (which is NOT under W
Finally, login (as "root") with password "wootaler":
-$ ssh -F ./ssh.cfg localhost
+$ ssh -F ssh/root.cfg localhost
and run
diff --git a/server-build/my-simple-cdd/03-run-system.sh b/server-build/my-simple-cdd/03-run-system.sh
index da4cf78..737c02f 100755
--- a/server-build/my-simple-cdd/03-run-system.sh
+++ b/server-build/my-simple-cdd/03-run-system.sh
@@ -1,18 +1,19 @@
-#!/bin/sh
+#!/bin/bash
# Run QEMU with the talerwoo.img (create via setup-system.sh)
TARGET=talerwoo.img
+SSHDIR=./ssh
echo "start the system.."
# Run qemu
qemu-system-x86_64 -m 4G -enable-kvm -net nic,model=rtl8139 \
-net user,hostfwd=tcp::2222-:22,hostfwd=tcp::7776-:7776,hostfwd=tcp::9999-:80 \
- -display none -hda $TARGET > /dev/null 2>&1 &
+ -display none -hda $TARGET > /dev/null 2>&1- &
-echo ".. and wait some time until it is ready!"
+echo ".. and wait some time (20s) until it is ready!"
# wait for system to boot up
-sleep 15
+sleep 20
# login as root
echo "now login as 'root'"
-ssh -F ./ssh.cfg localhost
+ssh -F ${SSHDIR}/root.cfg localhost
diff --git a/server-build/my-simple-cdd/profiles/wootaler.preseed b/server-build/my-simple-cdd/profiles/wootaler.preseed
index e260e44..3b82ddb 100644
--- a/server-build/my-simple-cdd/profiles/wootaler.preseed
+++ b/server-build/my-simple-cdd/profiles/wootaler.preseed
@@ -68,8 +68,8 @@ d-i netcfg/choose_interface select auto
# Any hostname and domain names assigned from dhcp take precedence over
# values set here. However, setting the values still prevents the questions
# from being shown, even if values come from dhcp.
-d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string unassigned-domain
+d-i netcfg/get_hostname string wootaler
+d-i netcfg/get_domain string wootaler
# If you want to force a hostname, regardless of what either the DHCP
# server returns or what the reverse DNS entry for the IP is, uncomment
diff --git a/server-build/my-simple-cdd/ssh.cfg b/server-build/my-simple-cdd/ssh/root.cfg
index d269483..28992ee 100644
--- a/server-build/my-simple-cdd/ssh.cfg
+++ b/server-build/my-simple-cdd/ssh/root.cfg
@@ -4,3 +4,4 @@ Host localhost
LogLevel ERROR
StrictHostKeyChecking no
UserKnownHostsFile=/dev/null
+ IdentityFile=ssh/talerwoo.key