Commit 97151e0b authored by Nolan's avatar Nolan

Collection of minor fixes.

parent d26a753f
......@@ -59,7 +59,7 @@ upload-macos: start-vms $(BOUNDERY_SSHCONF)
scp -F $(BOUNDERY_SSHCONF) $(CLIENT_SRC)/macOS/*.dmg \
root@boundery.me:/root/data/sslnginx/html/clients/
upload-pczip: start-vms
upload-pczip: start-vms $(BOUNDERY_SSHCONF)
@test $(OS_SRC) || ( echo 'set OS_SRC' && false)
vagrant ssh boundery.me -c '[ -f /usr/local/share/ca-certificates/pebble.minica.crt ]'
make -C $(OS_SRC) pc_zip
......@@ -67,7 +67,7 @@ upload-pczip: start-vms
scp -F $(BOUNDERY_SSHCONF) $(OS_SRC)/build/amd64/images/pc.zip \
root@boundery.me:/root/data/sslnginx/html/images/
upload-rpi3zip: start-vms
upload-rpi3zip: start-vms $(BOUNDERY_SSHCONF)
@test $(OS_SRC) || ( echo 'set OS_SRC' && false)
vagrant ssh boundery.me -c '[ -f /usr/local/share/ca-certificates/pebble.minica.crt ]'
make -C $(OS_SRC) rpi3_zip
......@@ -90,6 +90,7 @@ server-serial:
@script/vboxmgr controlvm server_VBOXID changeuartmode1 server build/serial_cons.sock
@echo "Ctrl-o to exit"
@socat UNIX-CONNECT:build/serial_cons.sock STDIO,raw,echo=0,escape=0x0f
# XXX Perhaps wire serial console back to file? Even better if socat also updates file...
client-vnc:
@script/vboxmgr client_VBOXID
......
......@@ -127,6 +127,11 @@ Vagrant.configure("2") do |config|
client.vm.provision "install", type: "shell", run: "never", privileged: false, inline: <<-SHELL
#XXX Sanity check fakedns, other environment stuff?
if mount | grep -q ^/dev/sdb1; then
echo "/dev/sdb1 already mounted!" >&2
exit 92
fi
sudo /etc/rc.local #Refetch ssl root cert in case pebble restarted.
rm -rf boundery-linux-client*
......
......@@ -10,7 +10,7 @@ if [ -f /run/intercept.pid ]; then
rm /run/intercept.pid
fi
python3 -u /usr/local/sbin/intercept.py --all-qtypes --tcp -u 10.0.2.3 \
-f '*.boundery.me:30.0.0.150' \
-f '*.boundery.me.:30.0.0.150' \
-f 'boundery.me.:30.0.1.9' -f 'www.boundery.me.:30.0.1.9' \
-i 'acme-v02.api.letsencrypt.org. 60 IN A 30.0.0.1' \
-i 'acme-staging-v02.api.letsencrypt.org. 60 IN A 30.0.0.1' \
......
......@@ -60,7 +60,7 @@ click_here = d.find_element_by_tag_name('a')
click_here.click()
#Step 3 (boundery.me)
screenshot(d, 'step3')
#XXX Because we short circuit the dyndns NS forward to the pi, need to explicitly
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment