summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-12-28 16:19:36 +0100
committervarac <varacanero@zeromail.org>2016-12-28 16:19:36 +0100
commitfce0bcdae199c6827401d60e50875bc188a726e3 (patch)
tree99fa3c6c59fba80e8e238c9277f697112519b7df
parentc2627475205473f3bb7cfdf9c5c41c6df71a03a0 (diff)
Pre-final platform workshop version for 33c3
-rw-r--r--platform-workshop/slides.md32
-rw-r--r--platform-workshop/todo.md1
2 files changed, 18 insertions, 15 deletions
diff --git a/platform-workshop/slides.md b/platform-workshop/slides.md
index 9d84058..687f3e9 100644
--- a/platform-workshop/slides.md
+++ b/platform-workshop/slides.md
@@ -232,7 +232,17 @@ echo 'class custom { include ::pixelated }' > files/puppet/modules/custom/manife
---
-# Option A: Add an existing remote server
+# Option A: Add your local vagrant node
+
+```
+$ leap node add --local wildebeest services:webapp,couchdb,soledad,mx
+$ leap local start wildebeest
+$ leap local status
+```
+
+---
+
+# Option B: Add an existing remote server
```
@@ -246,7 +256,7 @@ $ leap node add wildebeest ip_address:0.1.2.3 \
---
-# Option B: Create a new server in the cloud
+# Option C: Create a new server in the cloud
- Currently works only with AWS ec2
- `cloud.json` needed for AWS config and credentials
@@ -270,17 +280,6 @@ $ leap vm status
and help out with vagrant
```
-
----
-
-# Option C: Add your local vagrant node
-
-```
-$ leap node add --local wildebeest services:webapp,couchdb,soledad
-$ leap local start wildebeest
-$ leap local status
-```
-
---
# Time to deploy !
@@ -342,18 +341,21 @@ $ leap test
- Login at https://example.org:8080/
```notes
+Don't use the link to the Pixelated Inbox
+
Show:
- Mail to myself
- Mail to/from other workshop participants
-- Mail from outside (ssh cat)
+- Mail from outside (cat swaks -t varac@example.org -s IP)
...
```
---
# Try more
-- LEAP: https://mail.bitmask.net (email) and https://demo.bitmask.net (VPN)
+- LEAP: https://mail.bitmask.net
+- Bitmask: https://bitmask.net
- Pixelated: https://try.pixelated-project.org/ (no outbound mail)
---
diff --git a/platform-workshop/todo.md b/platform-workshop/todo.md
index f549854..f3a1482 100644
--- a/platform-workshop/todo.md
+++ b/platform-workshop/todo.md
@@ -25,6 +25,7 @@ copy paste foo
- leap compile hosts/zone should output pixelated entries
- Not signed/not encrypted mail
- Long waiting for mail to myself
+- Add
### Issues/for later