summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-05-05 22:26:49 +0200
committervarac <varacanero@zeromail.org>2017-05-05 22:26:49 +0200
commit9556f3157717426825cfc901931da3db422c9adc (patch)
tree5979e5347021d6a2fa1577e00931d7a9d159e963
parentc6ba0259964a08b407f9b7ec53946834bdfa2cf0 (diff)
Use blackbox in amsterda
-rw-r--r--platform-workshop/README.md14
-rw-r--r--platform-workshop/slides.md14
2 files changed, 15 insertions, 13 deletions
diff --git a/platform-workshop/README.md b/platform-workshop/README.md
index 983c6c2..335ccb5 100644
--- a/platform-workshop/README.md
+++ b/platform-workshop/README.md
@@ -11,20 +11,22 @@
- keylookup for @leap.se keys doesn't work
- Until we have an RDNS entry for blackbox.workshop.bitmask.net, riseup won't accept mails
-# Present
+# Prepare presentation
-- Recreate blackbox.workshop.bitmask.net server from [portal.eclips.is](https://portal.eclips.is/portal/cloud/instance/console?id=1690):
- - Stop instance
- - [Reinstall](https://portal.eclips.is/portal/cloud/Instance/reinstall?id=1690)
+DNS is already setup for `workshop.bitmask.net`, currently for 37.218.245.94 (blackbox, Amsterdam).
+As fallback we can also use 37.218.240.130 (backblock-backup, hong kong)
+- Recreate blackbox.workshop.bitmask.net server from [portal.eclips.is](https://portal.eclips.is/portal/cloud/instance/console?id=1692):
+ - Stop instance
+ - [Reinstall](https://portal.eclips.is/portal/cloud/Instance/reinstall?id=1692)
Upload final slides and share URL https://leap.se/slides/platform-workshop
rsync -avz ~/leap/git/leap_presentations/platform-workshop/slides/ website@hare.leap.se:slides/platform-workshop
-DNS is already setup for `workshop.bitmask.net`
+Start fresh
- rm -rf ~/leap/workshop.bitmask.net ~/.leap/pixelated
+ rm -rf ~/leap/workshop.bitmask.net ~/.leap/pixelated ~/leap/workshop.bitmask.net
# Todo
diff --git a/platform-workshop/slides.md b/platform-workshop/slides.md
index fbcb49c..d0c4dc6 100644
--- a/platform-workshop/slides.md
+++ b/platform-workshop/slides.md
@@ -502,12 +502,12 @@ $ leap local status
```
-$ leap node add blackbox ip_address:37.218.240.130 \
+$ leap node add blackbox ip_address:37.218.245.94 \
services:webapp,couchdb,soledad,mx
```
```notes
-Use workshop IP: 37.218.240.130
+Use workshop IP: 37.218.245.94
```
---
@@ -594,12 +594,12 @@ and use the listed entries in our DNS provider.
These are for workshop.bitmask.net (in this workshop's case):
```
-@ IN A 37.218.240.130
-blackbox IN A 37.218.240.130
-api IN A 37.218.240.130
-nicknym IN A 37.218.240.130
+@ IN A 37.218.245.94
+blackbox IN A 37.218.245.94
+api IN A 37.218.245.94
+nicknym IN A 37.218.245.94
@ IN MX 10 blackbox
-@ IN TXT "v=spf1 MX ip4:37.218.240.130 -all"
+@ IN TXT "v=spf1 MX ip4:37.218.245.94 -all"
234072283e._domainkey IN TXT "v=DKIM1;h=sha256;k=rsa;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApdCDTAuRJJa0yx8T3Z7d" "f2NLE0oOvKysLqHqtvJk92Zf8RHYO6/RzpvJ5s51fPfOfyLnAjEzGs3gBL5GkWNV" "hLyMB9TzYnuQ9lmnz3ep3Hyh8U9yPVmNu1YZDrMYGaeoHE6FZXkmvrtBUOv3XAZw" "4BNQwdcHCa/Z9iWgMDtBx0h+56DRDTOrJvr7M/7qGxknBo0FnnQ/Qhw9GQjkTg0h" "UmFZjuvx3BmgN/9lCMkrjxC7qfADvGYMIYer3iPt0wI7cqAvgWN0a+7iqm2PU+aB" "wLPWOSmWsl3e6wzHW4jFS7EchilGXjHiGQ5WC9anRC6WWr3SomL/cxKZNCjTCfBy" "dwIDAQAB"
```