Making progress here...

author: varac <varacanero@zeromail.org> 2017-05-05 17:46:15 +0200
committer: varac <varacanero@zeromail.org> 2017-05-05 17:46:15 +0200
commit: 4a132e3bfb5152a9b8b187a3a90e3a817fcb3c7a (patch)
tree: 1f637ffcd8b4a0a788b1b3bdea5f0765796d5179
parent: 8dc82bd2c475136225c3d7689524bef235ab9797 (diff)
12 files changed, 590 insertions, 120 deletions
diff --git a/platform-workshop/README.md b/platform-workshop/README.md
index 55b53eb..7f6ac7d 100644
--- a/platform-workshop/README.md
+++ b/platform-workshop/README.md
@@ -6,34 +6,49 @@
     reveal-ck generate
 
 
+# Known Issues / Things to be aware of during presentation
+
+- keylookup for @leap.se keys doesn't work
+
+# Present
+
+    rm -rf ~/leap/workshop.bitmask.net
+
+- Recreate workshop.bitmask.net server fro portal.eclips.is
+- Make sure DNS entries work
+- 
+
+
+
 # Todo
 
-## Issues
+HDMI beamer ??
 
-    May 04 14:26:15    - [wildebeest] Error: Could not set 'file' on ensure: No such file or directory @ dir_s_rmdir - /etc/systemd/system/apache2.service.d/autorestart.conf20170504-20145-1i4pf7u.lock at 21:/srv/leap/puppet/modules/systemd/manifests/unit_file.pp
+- Upload final slides and share URL https://leap.se/slides/Platform-Workshop
+- Create server with 2. IP
+- Change linux-kernel to "Linux LTS latest"
+- Create/update DNS entries for workshop.bitmask.net
 
-- keylookup for @leap.se keys doesn't work
 
-### Issues/for later
+    May 04 14:26:15    - [wildebeest] Error: Could not set 'file' on ensure: No such file or directory @ dir_s_rmdir - /etc/systemd/system/apache2.service.d/autorestart.conf20170504-20145-1i4pf7u.lock at 21:/srv/leap/puppet/modules/systemd/manifests/unit_file.pp
 
-- figure out vertical slides
-- net-ssh agent error
-- update LEAP/jessie so `leap node init` doesnt take so long
+- net-ssh agent error ????? 
+ 
+- Make new images for Bitmask-dev
  
-- explain ssl certs foo
 - copy paste foo
 
-## CSS
+## Nice to have 
 
-- make headers smaller
-- make code block font bigger
-
-## Images
-
-- for Bitmask
+- update LEAP/jessie so `leap node init` doesnt take so long
 - where's the Bitmask gif elijah did a while ago ?
+- Include images of gpg keys for e.snowden and other fun stuff
+- figure out vertical slides with reveal-ck
+- Use custom header/footer for all slides
+- Add Avatar
+- explain ssl certs foo better
+
 
 ## Update Docuementation
 
 - https://leap.se/en/docs/platform/guide/virtual-machines  `leap vm start mynode` not needed anymore
-- Pixelated: https://github.com/pixelated/puppet-pixelated#2-adding-pixelated-to-your-existing-leap-configuration use service instead of custom class
diff --git a/platform-workshop/css/custom.css b/platform-workshop/css/custom.css
index c176486..6189395 100644
--- a/platform-workshop/css/custom.css
+++ b/platform-workshop/css/custom.css
@@ -1,10 +1,10 @@
 .reveal h2 {
-	font-size:2.07em;
+	font-size:1.8em;
 	hyphens: auto;
 }
 
 .reveal h1 {
-	font-size: 2.55em;
+	font-size: 2.0em;
 }
 
 .reveal code {
@@ -16,4 +16,3 @@
 	width: 99%;
 	margin: 20px auto;
 }
-
diff --git a/platform-workshop/images/bitmask-dev-demo1.png b/platform-workshop/images/bitmask-dev-demo1.png
new file mode 100644
index 0000000..05b2034
--- /dev/null
+++ b/platform-workshop/images/bitmask-dev-demo1.png
diff --git a/platform-workshop/images/bitmask-dev-initial.png b/platform-workshop/images/bitmask-dev-initial.png
new file mode 100644
index 0000000..02335de
--- /dev/null
+++ b/platform-workshop/images/bitmask-dev-initial.png
diff --git a/platform-workshop/images/bitmask-dev-mail1.png b/platform-workshop/images/bitmask-dev-mail1.png
new file mode 100644
index 0000000..551cdda
--- /dev/null
+++ b/platform-workshop/images/bitmask-dev-mail1.png
diff --git a/platform-workshop/images/bitmask-hex.svg b/platform-workshop/images/bitmask-hex.svg
new file mode 100644
index 0000000..500ff8a
--- /dev/null
+++ b/platform-workshop/images/bitmask-hex.svg
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="180"
+   height="180"
+   id="svg3076"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="bitmask-hex.svg"
+   inkscape:export-filename="/home/elijah/leap/leap_assets/source/stickers/bitmask-hex.png"
+   inkscape:export-xdpi="600"
+   inkscape:export-ydpi="600">
+  <defs
+     id="defs3078">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3159">
+      <g
+         style="fill:none;stroke:#006082;stroke-width:31.77269936;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         id="g3161"
+         transform="matrix(0.6987131,0,0,0.6987131,-78.646361,-52.805193)">
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#006082;fill-opacity:1;stroke:none;stroke-width:22.20000076;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           d="m 278.28751,285.55576 -11.21875,0.125 c -16.33799,0.18876 -35.43079,3.64775 -48.84375,17.25 -26.364,26.73607 -32.91414,67.45937 -31.40625,101.9375 2.03445,46.51772 21.53824,93.17387 51.28125,128.53125 20.69424,24.60055 50.34517,51.04821 86.53125,52.21875 28.80499,0.93178 49.7747,-20.70739 66.84375,-34 14.22825,-11.08034 33.86145,-24.04072 51.59375,-31.4375 17.0467,-7.1108 34.85246,-7.21617 34.21875,-7.21875 l 0.0312,0 0.0625,0 0.0312,0 c -0.16965,5.1e-4 17.2016,0.10729 34.25,7.21875 17.72836,7.39514 37.32827,20.3525 51.5625,31.4375 17.07402,13.29649 38.06968,34.93179 66.875,34 36.18608,-1.17054 65.83701,-27.6182 86.53125,-52.21875 29.74301,-35.35738 49.2468,-82.01353 51.28125,-128.53125 1.50789,-34.47813 -5.04224,-75.20143 -31.40625,-101.9375 -14.31952,-14.52161 -35.00767,-17.52645 -52.09375,-17.21875 -30.44885,0.54835 -54.3266,17.12605 -78.40625,27.34375 -35.97307,15.26442 -58.60927,33.089 -90.875,42.9375 -15.59991,4.76158 -25.34249,3.77253 -37.15625,3.96875 -0.48134,-0.0127 -0.42021,-0.003 -0.5,0 -0.0399,0.002 -0.3107,-0.002 -0.25,0 -0.0108,-2.1e-4 -0.0204,2.1e-4 -0.0312,0 -12.03376,-0.23364 -21.77727,0.85894 -37.59375,-3.96875 -32.26573,-9.8485 -54.90193,-27.67308 -90.875,-42.9375 -21.91783,-9.30038 -43.75001,-23.72976 -70.4375,-26.6875 l 0,-0.8125 z m 12.125,109.15625 c 17.37009,-0.31472 36.71128,6.52981 55.875,13.53125 14.81121,5.41127 29.02735,15.65317 45.09375,25.09375 5.88038,3.4553 11.12945,6.87537 18,11.21875 -3.34103,2.83649 -6.57004,5.62753 -10.96875,9 -12.59562,9.65701 -28.90684,19.70424 -39,22.0625 -29.76308,6.95412 -52.56809,2.47169 -79.75,-19.25 -5.78601,-4.62373 -15.92397,-18.36952 -23.34375,-30.375 -3.24397,-5.24887 -5.84449,-9.82258 -8.03125,-13.71875 2.542,-1.66751 5.0341,-3.34504 8.34375,-5.3125 9.27056,-5.51099 21.18825,-10.95207 26.46875,-11.6875 2.38753,-0.33252 4.80103,-0.517 7.3125,-0.5625 z m 372,0 c 3.16744,-0.0296 6.24552,0.14841 9.21875,0.5625 5.2805,0.73543 17.19819,6.17651 26.46875,11.6875 3.30965,1.96746 5.80175,3.64499 8.34375,5.3125 -2.18676,3.89617 -4.78728,8.46988 -8.03125,13.71875 -7.41978,12.00548 -17.55774,25.75127 -23.34375,30.375 -27.17889,21.71928 -50.01971,26.20376 -79.78125,19.25 -10.09225,-2.35805 -26.38134,-12.40603 -38.96875,-22.0625 -4.40014,-3.37558 -7.62824,-6.16178 -10.96875,-9 6.87055,-4.34338 12.11962,-7.76345 18,-11.21875 16.0664,-9.44058 30.28254,-19.68248 45.09375,-25.09375 18.47767,-6.7508 37.09414,-13.37374 53.96875,-13.53125 z"
+           id="path3163"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccssssssccccsssssssssccccsscccssscsssscssscsscsssscssc" />
+      </g>
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4055-4"
+       id="linearGradient3821"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,512,0)"
+       x1="456"
+       y1="160"
+       x2="360"
+       y2="216" />
+    <linearGradient
+       id="linearGradient4055-4">
+      <stop
+         id="stop4057-6"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop4059-2"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4141-7"
+       id="radialGradient3823"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3716765,0.0039729,-0.00294998,1.1635062,-93.675296,-62.76795)"
+       cx="256"
+       cy="211.69231"
+       fx="256"
+       fy="211.69231"
+       r="64" />
+    <linearGradient
+       id="linearGradient4141-7">
+      <stop
+         id="stop4143-9"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4145-7"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4038-5"
+       id="radialGradient3825"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7777373,0,-6.9715088e-8,1.4057042,56.899268,-12.013064)"
+       cx="256"
+       cy="241.88095"
+       fx="256"
+       fy="241.88095"
+       r="64" />
+    <linearGradient
+       id="linearGradient4038-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4040-2" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop4042-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4020-4"
+       id="linearGradient3827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0139304,0,0,1,-6.4637045,0)"
+       x1="456"
+       y1="160"
+       x2="360"
+       y2="216" />
+    <linearGradient
+       id="linearGradient4020-4">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4022-5" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1"
+         id="stop4024-2" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6353">
+      <rect
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         id="rect6355"
+         width="22.25"
+         height="18.75"
+         x="-77.25"
+         y="14.750001" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3052">
+      <path
+         transform="matrix(-5.149756,8.2565313,-8.2565313,-5.149756,1350.9775,-260.1413)"
+         d="m 83.337588,172.07845 -69.248885,-39.98086 -2e-6,-79.96172 69.248882,-39.980864 69.248887,39.98086 0,79.961724 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="true"
+         sodipodi:arg2="2.0943951"
+         sodipodi:arg1="1.5707963"
+         sodipodi:r2="69.248886"
+         sodipodi:r1="79.961723"
+         sodipodi:cy="92.11673"
+         sodipodi:cx="83.337585"
+         sodipodi:sides="6"
+         id="path3054"
+         style="fill:#000000;fill-opacity:1;stroke:none;display:inline"
+         sodipodi:type="star" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="19.292056"
+     inkscape:cy="67.049134"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     units="cm"
+     inkscape:window-width="1867"
+     inkscape:window-height="1056"
+     inkscape:window-x="53"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3081">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="sticker"
+     style="display:inline">
+    <path
+       sodipodi:type="star"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path3084"
+       sodipodi:sides="6"
+       sodipodi:cx="83.337585"
+       sodipodi:cy="92.11673"
+       sodipodi:r1="79.961723"
+       sodipodi:r2="69.248886"
+       sodipodi:arg1="1.5707963"
+       sodipodi:arg2="2.0943951"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 83.337588,172.07845 -69.248885,-39.98086 -2e-6,-79.96172 69.248882,-39.980864 69.248887,39.98086 0,79.961724 z"
+       transform="matrix(1.1255385,0,0,1.1255385,-3.7996609,-13.680926)" />
+    <g
+       style="opacity:0.66;filter:url(#filter3954)"
+       id="g3058"
+       clip-path="url(#clipPath3052)"
+       transform="matrix(-0.0612127,-0.09814146,0.09814146,-0.0612127,104.42796,102.98202)">
+      <path
+         style="fill:#a0522d;fill-opacity:1;stroke:none"
+         d="m -893.53125,-472.09375 c -24.62091,93.60523 -49.2745,187.20196 -73.875,280.8125 365.68864,46.44926 731.37481,92.918179 1097.0625,139.375 10.87705,0.607379 -1.18755,-5.160184 -5.4792,-6.462019 C -214.85892,-197.02171 -553.91262,-335.63224 -892.9375,-474.3125 c -0.19792,0.73958 -0.39583,1.47917 -0.59375,2.21875 z"
+         id="path4133"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffa500;fill-opacity:1;stroke:none"
+         d="m -966.90625,-192.96875 c 0.42369,96.791674 0.87447,193.58328819 1.28125,290.375 365.27039,-49.774105 730.54174,-99.5411213 1095.8125,-149.3125 10.63187,-2.231077 -2.53003,-4.678487 -6.97543,-4.819744 C -240.15954,-102.9094 -603.54044,-149.02293 -966.90625,-195.25 c 0,0.76042 0,1.52083 0,2.28125 z"
+         id="path4135"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#f0e68c;fill-opacity:1;stroke:none"
+         d="m -963.90625,93.15625 c -4.84463,1.385332 1.92079,10.52944 1.76607,15.04144 24.3374,89.19479 48.6827,178.38743 73.01518,267.58356 339.94916,-142.57611 679.87306,-285.21301 1019.8125,-427.8125 9.73812,-4.91182 -3.62232,-3.891366 -7.99841,-2.867442 C -239.50936,-5.5470445 -601.7078,43.804603 -963.90625,93.15625 z"
+         id="path4137"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#9acd32;fill-opacity:1;stroke:none"
+         d="m 129.125,-55.71875 c -339.92748,142.603213 -679.85177,285.21406 -1019.78125,427.8125 49.15191,84.26723 98.32452,168.52271 147.4375,252.8125 291.47568,-225.69295 582.89121,-451.46437 874.34375,-677.1875 3.53322,-4.634438 5.48019,-4.842875 -2,-3.4375 z"
+         id="path4139"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#228b22;fill-opacity:1;stroke:none"
+         d="M 128.6875,-55.46875 C -162.76003,170.27133 -454.21065,396.00743 -745.65625,621.75 c 69.31591,68.65261 138.61637,137.3211 207.90625,206 223.07979,-293.47144 446.167258,-586.93705 669.25,-880.40625 2.19134,-5.370076 4.05823,-6.097601 -2.8125,-2.8125 z"
+         id="path4141"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#3cb371;fill-opacity:1;stroke:none"
+         d="m 128.3125,-55.09375 c -223.082742,293.4692 -446.17021,586.93481 -669.25,880.40625 84.68361,48.44884 169.40598,96.83153 254.125,145.21875 C -147.33493,629.29507 -7.7636231,288.09666 131.75,-53.125 c 0.70987,-5.745823 2.33604,-6.953044 -3.4375,-1.96875 z"
+         id="path4143"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#7fffd4;fill-opacity:1;stroke:none"
+         d="M 128.0625,-54.625 C -11.474121,286.58111 -150.96778,627.80499 -290.53125,969 -196.19137,993.83743 -101.8493,1018.6672 -7.5,1043.4688 38.949278,677.76969 85.418176,312.07311 131.875,-53.625 c -0.78696,-5.739317 0.47257,-7.323547 -3.8125,-1 z"
+         id="path4145"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#008080;fill-opacity:1;stroke:none"
+         d="M 127.9375,-54.125 C 81.460014,311.57176 35.052415,677.2778 -11.46875,1042.9688 c 97.552139,-0.4133 195.10411,-0.8993 292.65625,-1.3126 C 231.41339,676.38586 181.64638,311.11451 131.875,-54.15625 c -2.25476,-5.313952 -1.41653,-7.182336 -3.9375,0.03125 z"
+         id="path4147"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#b0e0e6;fill-opacity:1;stroke:none"
+         d="m 127.9375,-53.59375 c 49.75212,365.2615 99.5706,730.51433 149.28125,1095.78125 94.1206,-25.6444 188.22672,-51.34235 282.34375,-77 C 416.98634,625.22794 274.3495,285.29361 131.75,-54.65625 c -3.56654,-4.629205 -3.25129,-6.532593 -3.8125,1.0625 z"
+         id="path4149"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#87ceeb;fill-opacity:1;stroke:none"
+         d="M 128.0625,-53.09375 C 270.66572,286.84415 413.27651,626.77887 555.875,966.71875 640.14248,917.55685 724.39747,868.37297 808.6875,819.25 582.99455,527.77432 357.22313,236.35879 131.5,-55.09375 c -4.63444,-3.533224 -4.84287,-5.480195 -3.4375,2 z"
+         id="path4151"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#4682b4;fill-opacity:1;stroke:none"
+         d="M 128.3125,-52.65625 C 354.05258,238.79128 579.78868,530.2419 805.53125,821.6875 874.18357,752.38172 942.85264,683.09225 1011.5312,613.8125 718.05975,390.72238 424.59421,167.6244 131.125,-55.46875 c -5.37008,-2.191343 -6.0976,-4.058231 -2.8125,2.8125 z"
+         id="path4153"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#1e90ff;fill-opacity:1;stroke:none"
+         d="M 128.6875,-52.28125 C 422.15671,170.8119 715.62225,393.90988 1009.0938,617 1057.5426,532.31639 1105.9253,447.59402 1154.3125,362.875 813.07627,223.38712 471.87791,83.805271 130.65625,-55.71875 c -5.74582,-0.709872 -6.95304,-2.336039 -1.96875,3.4375 z"
+         id="path4155"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#6495ed;fill-opacity:1;stroke:none"
+         d="m 124.625,-55.25 c 11.49661,7.65285 25.36314,10.997479 37.85265,16.845365 C 492.57663,96.600179 822.69332,231.56217 1152.7812,366.59375 1177.6187,272.25387 1202.4485,177.9118 1227.25,83.5625 861.55093,37.102931 495.85436,-9.3765303 130.15625,-55.84375 c -1.84375,0.197917 -3.6875,0.395833 -5.53125,0.59375 z"
+         id="path4157"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#191970;fill-opacity:1;stroke:none"
+         d="M 1223.1562,-204.8125 C 858.64583,-155.15625 494.13542,-105.5 129.625,-55.84375 c -10.63187,2.231074 2.53003,4.678443 6.97541,4.819915 C 499.98245,-4.8300921 863.37376,41.293933 1226.75,87.53125 c -0.4132,-97.552139 -0.8993,-195.10411 -1.3125,-292.65625 -0.7604,0.10417 -1.5208,0.20833 -2.2813,0.3125 z"
+         id="path4159"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#0000cd;fill-opacity:1;stroke:none"
+         d="m 1146.8438,-482.65625 c -339.23963,142.3125 -678.47922,284.625 -1017.7188,426.9375 -9.73812,4.911818 3.62232,3.891314 7.99844,2.867636 362.94952,-49.426776 725.89039,-98.919726 1088.84536,-148.305136 -25.6446,-94.13097 -51.3423,-188.24759 -77,-282.375 -0.7084,0.29167 -1.4167,0.58333 -2.125,0.875 z"
+         id="path4161"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#483d8b;fill-opacity:1;stroke:none"
+         d="m 1001.2188,-731.25 c -290.8438,225.26042 -581.68755,450.52083 -872.5313,675.78125 -8.13254,7.260714 4.48572,2.868522 8.45502,0.729592 C 474.92874,-196.43974 812.71179,-338.1479 1150.5,-479.84375 c -49.1616,-84.25721 -98.346,-168.50149 -147.4688,-252.78125 -0.6041,0.45833 -1.2083,0.91667 -1.8124,1.375 z"
+         id="path4163"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#9370db;fill-opacity:1;stroke:none"
+         d="m 796.21875,-933.6875 c -222.63542,292.86458 -445.27083,585.72917 -667.90625,878.59375 -5.96653,9.105122 5.0779,1.617225 8.34673,-1.473796 C 426.262,-280.86846 715.86796,-505.16528 1005.4688,-729.46875 936.16268,-798.1312 866.87379,-866.81126 797.59375,-935.5 c -0.45833,0.60417 -0.91667,1.20833 -1.375,1.8125 z"
+         id="path4165"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#8b008b;fill-opacity:1;stroke:none"
+         d="m 545.8125,-1076.125 c -139.25,340.5 -278.5,681 -417.75,1021.5 -3.38129,10.347457 5.30671,0.210302 7.67379,-3.603851 221.68105,-291.611679 443.36693,-583.219679 665.04496,-874.833649 -84.68336,-48.43885 -169.40623,-96.8103 -254.125,-145.1875 -0.28125,0.7083 -0.5625,1.4167 -0.84375,2.125 z"
+         id="path4167"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#da70d6;fill-opacity:1;stroke:none"
+         d="m 267.0625,-1148.9375 c -46.375,364.9375 -92.75,729.875 -139.125,1094.8125 -0.60738,10.87705 5.16014,-1.187573 6.46219,-5.479132 C 273.06347,-398.64013 411.68449,-737.6938 550.375,-1076.7188 c -94.33988,-24.8374 -188.68195,-49.6672 -283.03125,-74.4687 -0.0937,0.75 -0.1875,1.5 -0.28125,2.25 z"
+         id="path4169"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#c71585;fill-opacity:1;stroke:none"
+         d="m -19.09375,-1149.4062 c -4.991747,0.7569 0.531179,10.6955 -0.213642,15.1622 49.081631,360.21674 98.163261,720.43349 147.244892,1080.65025 2.23107,10.631869 4.67844,-2.530033 4.81994,-6.975406 46.19373,-363.371624 92.31777,-726.752514 138.55506,-1090.118344 -96.80212,0.4068 -193.604166,0.8576 -290.40625,1.2813 z"
+         id="path4171"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#db7093;fill-opacity:1;stroke:none"
+         d="m -19.625,-1149.3438 c -93.37527,25.4782 -186.74839,50.9643 -280.125,76.4376 142.57611,339.94911 285.21301,679.87301 427.8125,1019.81245 4.91182,9.738119 3.89137,-3.622323 2.86744,-7.998411 C 81.492839,-424.04169 31.989382,-786.98255 -17.40625,-1149.9375 c -0.739583,0.1979 -1.479167,0.3958 -2.21875,0.5937 z"
+         id="path4173"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffb6c1;fill-opacity:1;stroke:none"
+         d="m -298.03125,-1073.2812 c -83.60755,48.7545 -167.18809,97.55584 -250.8125,146.2812 225.68262,291.47562 451.443523,582.89122 677.15625,874.34375 7.26071,8.132539 2.86854,-4.485725 0.72952,-8.454987 C -12.658532,-398.88706 -154.36672,-736.65968 -296.0625,-1074.4375 c -0.65625,0.3854 -1.3125,0.7708 -1.96875,1.1563 z"
+         id="path4175"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#b22222;fill-opacity:1;stroke:none"
+         d="m -547.28125,-927.8125 c -68.1483,68.75797 -136.27692,137.53551 -204.4375,206.28125 293.47144,223.07979 586.93705,446.16726 880.40625,669.25 9.10512,5.966533 1.61723,-5.0779 -1.4738,-8.346727 C -97.087209,-350.23075 -321.38403,-639.83671 -545.6875,-929.4375 c -0.53125,0.54167 -1.0625,1.08333 -1.59375,1.625 z"
+         id="path4177"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ff6347;fill-opacity:1;stroke:none"
+         d="m -750.4375,-722.75 c -48.00599,84.05459 -96.04734,168.08914 -144.03125,252.15625 341.22578,139.47753 682.41376,279.04888 1023.625,418.5625 10.34746,3.381284 0.21033,-5.306745 -3.60395,-7.673661 -291.61163,-221.670689 -583.21967,-443.346109 -874.83355,-665.013839 -0.38542,0.65625 -0.77083,1.3125 -1.15625,1.96875 z"
+         id="path4179"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       style="display:inline"
+       id="mask_group"
+       transform="matrix(2.2272065,0,0,2.2272065,19.176795,17.062027)">
+      <g
+         style="fill:none;stroke:none;display:inline"
+         id="eyes"
+         transform="matrix(0.09628644,0,0,0.09628644,-13.900612,-8.2957126)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3911"
+           d="m 290.22501,383.61826 c 20.26573,-0.36718 40.73803,7.19583 59.875,14.1875 16.78643,6.13291 31.49775,16.91475 46.90625,25.96875 10.4842,6.16049 30.96875,19.28125 30.96875,19.28125 0,0 -38.82581,37.01847 -66.03125,43.375 -32.32466,7.55263 -60.041,1.91037 -89.21875,-21.40625 -16.83219,-13.45099 -39.0625,-56.3125 -39.0625,-56.3125 0,0 30.15123,-21.96471 47.90625,-24.4375 2.88277,-0.40149 5.76115,-0.6038 8.65625,-0.65625 z"
+           style="fill:none;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3905"
+           d="m 662.31876,383.61826 c 3.62101,-0.0338 7.24028,0.15439 10.84375,0.65625 17.75502,2.47279 47.90625,24.4375 47.90625,24.4375 0,0 -22.23031,42.86151 -39.0625,56.3125 -29.17775,23.31662 -56.92534,28.95888 -89.25,21.40625 -27.20544,-6.35653 -66,-43.375 -66,-43.375 0,0 20.48455,-13.12076 30.96875,-19.28125 15.4085,-9.054 30.11982,-19.83584 46.90625,-25.96875 18.4535,-6.74197 38.13407,-14.00499 57.6875,-14.1875 z"
+           style="fill:none;stroke:none" />
+      </g>
+      <g
+         transform="matrix(0.09628644,0,0,0.09628644,-13.900612,-8.2957126)"
+         id="outline"
+         style="fill:none;stroke:#000000;stroke-width:34.52383041;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3871"
+           transform="translate(97.225014,196.27451)"
+           d="m 169.96875,100.5 c -14.66639,0.16945 -30.93901,3.67114 -41.0625,13.9375 -22.89313,23.21621 -29.64336,61.08236 -28.21875,93.65625 1.91143,43.70495 20.52619,88.39789 48.6875,121.875 19.75254,23.48109 47.70677,47.2892 78.375,48.28125 22.51282,0.72824 41.91608,-17.81666 59.6875,-31.65625 14.782,-11.51158 34.87713,-24.90852 54.125,-32.9375 19.40436,-8.09426 38.18432,-8.06391 38.53125,-8.0625 0,0 0.0595,10e-6 0.0625,0 0.33473,-10e-4 19.15169,-0.0344 38.5625,8.0625 19.24787,8.02898 39.31175,21.42592 54.09375,32.9375 17.77142,13.83959 37.20593,32.38449 59.71875,31.65625 30.66823,-0.99205 58.62246,-24.80016 78.375,-48.28125 28.16131,-33.47711 46.77607,-78.17005 48.6875,-121.875 1.42461,-32.57389 -5.32562,-70.44004 -28.21875,-93.65625 -10.79839,-10.95078 -28.62313,-14.18317 -44,-13.90625 -26.27537,0.47319 -48.88701,15.70649 -74.25,26.46875 -34.56835,14.66836 -57.60153,32.85381 -91.96875,43.34375 -17.59464,5.37044 -29.55939,4.21929 -40.6875,4.4375 -0.22725,-0.006 -0.4596,0.004 -0.6875,0 -11.12811,-0.21821 -23.06161,0.93294 -40.65625,-4.4375 C 304.75778,159.85381 281.7246,141.66836 247.15625,127 221.79326,116.23774 199.15037,101.00444 172.875,100.53125 c -0.96105,-0.0173 -1.92849,-0.0426 -2.90625,-0.0312 z M 193,187.34375 c 20.26573,-0.36718 40.73803,7.19583 59.875,14.1875 16.78643,6.13291 31.49775,16.91475 46.90625,25.96875 10.4842,6.16049 30.96875,19.28125 30.96875,19.28125 0,0 -38.82581,37.01847 -66.03125,43.375 -32.32466,7.55263 -60.041,1.91037 -89.21875,-21.40625 -16.83219,-13.45099 -39.0625,-56.3125 -39.0625,-56.3125 0,0 30.15123,-21.96471 47.90625,-24.4375 2.88277,-0.40149 5.76115,-0.6038 8.65625,-0.65625 z m 372.09375,0 c 3.62101,-0.0338 7.24028,0.15439 10.84375,0.65625 17.75502,2.47279 47.90625,24.4375 47.90625,24.4375 0,0 -22.23031,42.86151 -39.0625,56.3125 -29.17775,23.31662 -56.92534,28.95888 -89.25,21.40625 -27.20544,-6.35653 -66,-43.375 -66,-43.375 0,0 20.48455,-13.12076 30.96875,-19.28125 15.4085,-9.054 30.11982,-19.83584 46.90625,-25.96875 18.4535,-6.74197 38.13407,-14.00499 57.6875,-14.1875 z"
+           style="fill:none;stroke:#000000;stroke-width:34.52383041;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="mask"
+         d="m 12.102284,20.301441 c -1.480584,-0.02666 -3.1790105,0.289339 -4.2187498,1.34375 -2.2042975,2.235407 -2.8559206,5.863576 -2.71875,9 0.1840448,4.208194 1.975948,8.526608 4.6875004,11.75 1.9019014,2.260911 4.5783144,4.529479 7.5312494,4.625 2.167679,0.07012 4.038854,-1.698685 5.75,-3.03125 1.423307,-1.108409 3.365441,-2.414418 5.21875,-3.1875 1.885814,-0.786641 3.71875,-0.75 3.71875,-0.75 0,0 1.832936,-0.03664 3.71875,0.75 1.853309,0.773082 3.764193,2.079091 5.1875,3.1875 1.711146,1.332565 3.582321,3.10137 5.75,3.03125 2.952935,-0.09552 5.660598,-2.364089 7.5625,-4.625 2.711552,-3.223392 4.503455,-7.541806 4.6875,-11.75 0.13717,-3.136424 -0.514452,-6.764593 -2.71875,-9 -1.039739,-1.054411 -2.769416,-1.37041 -4.25,-1.34375 -2.529962,0.04556 -4.714138,1.49499 -7.15625,2.53125 -3.328463,1.412364 -5.534652,3.177461 -8.84375,4.1875 -1.697948,0.518262 -2.832701,0.375 -3.9375,0.375 -1.104799,0 -2.270802,0.143262 -3.96875,-0.375 -3.309098,-1.010039 -5.515287,-2.775136 -8.84375,-4.1875 -2.442112,-1.03626 -4.626288,-2.485688 -7.15625,-2.53125 z m 1.9375,8.34375 c 1.951314,-0.03535 3.938619,0.701798 5.78125,1.375 1.616305,0.590516 3.01637,1.628222 4.5,2.5 1.009486,0.593172 3,1.84375 3,1.84375 0,0 -3.755485,3.575452 -6.375,4.1875 -3.112427,0.727216 -5.784328,0.182574 -8.59375,-2.0625 -1.620711,-1.295148 -3.7499996,-5.4375 -3.7499996,-5.4375 0,0 2.9154316,-2.105654 4.6249996,-2.34375 0.277572,-0.03866 0.533741,-0.05745 0.8125,-0.0625 z m 36.03125,0 c 0.278759,0.0051 0.566178,0.02384 0.84375,0.0625 1.709568,0.238096 4.625,2.34375 4.625,2.34375 0,0 -2.160539,4.142352 -3.78125,5.4375 -2.809422,2.245074 -5.481323,2.789716 -8.59375,2.0625 -2.619515,-0.612048 -6.34375,-4.1875 -6.34375,-4.1875 0,0 1.959264,-1.250578 2.96875,-1.84375 1.48363,-0.871778 2.914945,-1.909484 4.53125,-2.5 1.842631,-0.673202 3.798686,-1.410354 5.75,-1.375 z"
+         style="fill:#696969;fill-opacity:1;stroke:none" />
+      <g
+         style="opacity:0.67181468;display:inline"
+         id="lighting"
+         transform="matrix(0.13438556,0,0,0.14315672,-2.2397211,-2.3907393)"
+         clip-path="url(#clipPath3159)">
+        <path
+           style="fill:url(#linearGradient3821);fill-opacity:1;stroke:none"
+           d="M 48,144 200,144 96,360 56,296 z"
+           id="path4032"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="124.25651"
+           x="117.88771"
+           height="174.15863"
+           width="274.72458"
+           id="rect4036"
+           style="opacity:0.50193092;fill:url(#radialGradient3823);fill-opacity:1;stroke:none" />
+        <rect
+           style="opacity:0.49420848;fill:url(#radialGradient3825);fill-opacity:1;stroke:none"
+           id="rect4048"
+           width="176"
+           height="150.58582"
+           x="168"
+           y="225.41418" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4018"
+           d="m 464,144 -154.11742,0 105.44876,216 40.55722,-64 z"
+           style="fill:url(#linearGradient3827);fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/platform-workshop/images/pgp.png b/platform-workshop/images/pgp.png
new file mode 100644
index 0000000..9591cd4
--- /dev/null
+++ b/platform-workshop/images/pgp.png
diff --git a/platform-workshop/images/pixelated-user-agent.png b/platform-workshop/images/pixelated-user-agent.png
new file mode 100644
index 0000000..3dec49b
--- /dev/null
+++ b/platform-workshop/images/pixelated-user-agent.png
diff --git a/platform-workshop/images/pizarra.jpg b/platform-workshop/images/pizarra.jpg
new file mode 100644
index 0000000..54d5868
--- /dev/null
+++ b/platform-workshop/images/pizarra.jpg
diff --git a/platform-workshop/images/schema.jpg b/platform-workshop/images/schema.jpg
new file mode 100644
index 0000000..36cd03f
--- /dev/null
+++ b/platform-workshop/images/schema.jpg
diff --git a/platform-workshop/slides.md b/platform-workshop/slides.md
index d944216..6925d9d 100644
--- a/platform-workshop/slides.md
+++ b/platform-workshop/slides.md
@@ -1,33 +1,33 @@
-## LEAP Encryption Access Project
-### Platform Workshop
-#### While you wait
+<img src="./images/kid-jumping.svg" width="20%" height="20%">
 
-If you want to use `Vagrant` during this session
-please start right away with downloading the
-`LEAP/jessie` vagrantbox:
+# LEAP Provider installation workshop
 
-:thumbsup:
+If you want to use Vagrant during this session
+please start right away with downloading the
+"LEAP/jessie" vagrantbox:
 
-### vagrant box add LEAP/jessie
+```
+vagrant box add LEAP/jessie
+```
 
 ---
 
 <img src="./images/kid-jumping.svg" width="20%" height="20%">
 
-## LEAP Encryption Access Project
-### Provider Installation Workshop
+# LEAP Encryption Access Project
+## Provider installation workshop
 
-Varac (LEAP, Pixelated)
+by Varac (LEAP, Pixelated)
 
 ```notes
+Introduction:
+  - working for LEAP since its start in 2012
+  - The last 3 years for Pixelated, with build on LEAP
 ```
 
 ---
 
-## LEAP Encryption Access Project
-### Provider Installation Workshop
-
-### What to expect
+# What to expect
 
 - Short introduction to LEAP
 - Install LEAP provider that offers encrypted email (for real or for locally using vagrant)
@@ -39,7 +39,7 @@ Varac (LEAP, Pixelated)
 ```
 
 ---
-## Prerequisites
+# Prerequisites
 
 
 - Have a working (!) Vagrant setup
@@ -56,20 +56,35 @@ Varac (LEAP, Pixelated)
 
 ---
 
-## Overview 
+# Goals
 
 - "Provider in a box"
 - Make encryption as easy to use as possible
 - Strict client encryption
 
+---
+
+# Increase User experience
+
+<img src="./images/pizarra.jpg" width="100%" height="100%">
+
+---
+
+# Protect the provider
+
+<video width="800" controls="controls" loop src="../video/fbi.mp4"></video>
+
+---
+
+# What we have
+
 - Bitmask client: A client that works smoothly with any LEAP provider.
 - LEAP Platform:  A toolkit to make it easy for you to run a federated service provider.
 - New protocols:  So that users don't need to trust the provider.
 
-
 ---
 
-## Current Services: VPN
+# Current Services: VPN
 
 - Route all your internet traffic through an encrypted channel.
 - Prevent eavesdropping (thiefs in the public network, police, ...).
@@ -78,7 +93,7 @@ Varac (LEAP, Pixelated)
 
 ---
 
-## Current Services: email
+# Current Services: email
 
 - Transparent end-to-end encryption using OpenPGP.
 - Automatic key discovery and validation.
@@ -88,26 +103,43 @@ Varac (LEAP, Pixelated)
 
 ---
 
-## Bitmask client
+# Bitmask client
 
-- currently available for Android (VPN) and Linux (VPN + Email)
-- Windows and Mac OS coming soon
+<img src="./images/bitmask-hex.svg" width="20%" height="20%">
 
-![Image-Absolute](https://rawgit.com/leapcode/leap_presentations/master/rgsoc2016_leap_overview/images/bitmask-icon.png)
+- Currently available for Android (VPN) and Linux (VPN + Email)
+- Windows and MacOS coming soon (with your help even faster!)
+- Formerly Python 2, Twisted and QT
+- Rewritten with Python 2, Twisted and Javascript (React)
+
+---
+
+# Bitmask client
+## Encrypted Mail
+
+
+<img src="./images/bitmask-dev-mail1.png" width="100%" height="100%">
+
+---
+
+# Bitmask Mail
 
-## Bitmask client
+<img src="./images/bitmask-dev-mail2.png" width="50%" height="50%">
 
-![Image-Absolute](https://rawgit.com/leapcode/leap_presentations/master/rgsoc2016_leap_overview/images/bitmask.png)
+
+```notes
+Integrated Mailclient using the Pixelated Useragent
+```
 
 ---
 
-## Bitmask Mail
+# Key management
 
-![Image-Absolute](https://rawgit.com/leapcode/leap_presentations/master/rgsoc2016_leap_overview/images/bitmask_mail.png)
+- Automated keylookup and validation.
 
 ---
 
-## LEAP Platform
+# LEAP Platform
 
 - Configuration Management using puppet
 - Installs and configures the servers
@@ -115,16 +147,16 @@ Varac (LEAP, Pixelated)
 
 ---
 
-## LEAP Platform Example: Setup single node email provider
+# LEAP Platform Example: Setup single node email provider
 
 ```
 sudo gem install leap_cli
-leap new example --domain example.org
+leap new example --domain workshop.bitmask.net
 cd example
 leap add-user --self
 leap cert ca
 leap cert csr
-leap node add blackbox \
+leap node add workshop \
   services:couchdb,webapp,soledad,mx ip_address:1.1.1.3
 leap init node
 leap deploy
@@ -132,7 +164,7 @@ leap deploy
 
 ---
 
-## LEAP Platform: Install and configure the server(s)
+# LEAP Platform: Install and configure the server(s)
 
 - Email: Postfix, spamassassin, clamav
 - Database: couchdb, stunnel
@@ -146,7 +178,7 @@ leap deploy
 
 ---
 
-## Server-side techstack
+# Server-side techstack
 
 - PLatform: Puppet
 - leap_cli: ruby
@@ -155,28 +187,21 @@ leap deploy
 
 ---
 
-## Client-side techstack
+# Client-side techstack
 
 - Bitmask client: Python 2, Twisted, React JS
 - Bitmask Mail (a.k.a. Pixelated Useragent): Python 2, Twisted, FlightJS
 
 ---
 
-## Soledad
+# Soledad
 
 - Acronym for "Synchronization Of Locally Encrypted Data Among Devices"
 - Searchable client-encrypted synchronized database
 
 ---
 
-
-## Key management
-
-- Automated keylookup and validation.
-
----
-
-## LEAP Webapp
+# LEAP Webapp
 
 - API for user registration and authentication
 - User Management
@@ -186,37 +211,27 @@ leap deploy
 
 ---
 
-## LEAP Webapp Main Page
+# LEAP Webapp Main Page
 
-![Image-Absolute](https://rawgit.com/leapcode/leap_presentations/master/rgsoc2016_leap_overview/images/leap-webapp1.png)
+<img src="./images/leap-webapp1.png" width="100%" height="100%">
 
 
 ---
 
-## LEAP Webapp Account Management
+# LEAP Webapp Account Management
 
-![Image-Absolute](https://rawgit.com/leapcode/leap_presentations/master/rgsoc2016_leap_overview/images/leap-webapp2.png)
+<img src="./images/leap-webapp2.png" width="100%" height="100%">
 
 ---
 
-## LEAP Encryption Access Project
-### Platform Workshop
-
----
+# LEAP Encryption Access Project
+## Platform Workshop
 
-## Bitmask Client
-
-<img src="./images/bitmask-dev-201612.png" width="50%" height="50%">
-
-- Formerly Python/Twisted
-- Currently rewritten with Python/Javascript
-- Only for Ubuntu/Debian Linux (VPN+Email) or Android (VPN)
-- Windows and MacOS coming soon (with your help even faster!)
 
 ---
 
 
-## Where to deploy to
+# Where to deploy to
 
 
 Vagrant         | Remote Server
@@ -230,12 +245,12 @@ Requires Vagrant >= 1.5 and Virtualbox or other hypervisor | Physical or paravir
 
 These slides: https://leap.se/slides/33c3/
 
-## Vagrant
+# Vagrant
 
 - https://leap.se/en/docs/platform/tutorials/vagrant
 
 
-## Single node email provider
+# Single node email provider
 
 - https://leap.se/en/docs/platform/tutorials/quick-start
 - https://leap.se/en/docs/platform/tutorials/single-node-email
@@ -244,16 +259,22 @@ These slides: https://leap.se/slides/33c3/
 
 # Install prerequisites
 
-- Install leap-cli on your workstation/laptop, NOT on the server !
+- Install leap-cli and manage your provider config on your workstation/laptop, NOT on the server 
+
+```notes
+- The Provider config contains secret key material which should not reside on the server for security reasons.
+```
+
+---
 
-## Debian & Ubuntu
+# Debian & Ubuntu
 
 ```
 $ sudo apt install git ruby ruby-dev rsync \
     openssh-client openssl rake make bzip2
 ```
 
-## Mac OS
+# Mac OS
 
 ```
 $ brew install ruby-install
@@ -266,7 +287,7 @@ $ ruby-install ruby
 
 ---
 
-## Install the LEAP command-line utility
+# Install the LEAP command-line utility
 
 
 ```
@@ -282,24 +303,32 @@ leap 1.9, ruby 2.3.3
 
 # Prepare provider config
 
-Use `example.org` for testing, or pick your own domain.
+Use `workshop.bitmask.net` for testing, or pick your own domain.
 
 ```
-$ mkdir -p ~/leap/example.org
-$ cd ~/leap/example.org
+$ mkdir -p ~/leap/workshop.bitmask.net
+$ cd ~/leap/workshop.bitmask.net
 ```
 
 ---
 
-# Checkout stable version of platform
+# leap_platform master branch build status
 
 Leap Platform Build Status: [![Build Status](https://0xacab.org/leap/platform/badges/master/build.svg)](https://0xacab.org/leap/platform/commits/master)
-If the last build failed, we need to checkout the last stable version of the leap_platform:
+
+see https://0xacab.org/leap/platform/
+
+---
+
+
+# Optional: Use latest release tag for stable version
+
+If the build status of current leap_platform:master failed we need to checkout the last stable version of the leap_platform:
+
 
 ```
-git clone https://0xacab.org/leap/platform.git \
+git clone -b version/0.9.x https://leap.se/git/leap_platform \
   ../leap_platform
-git checkout -b 0.9.0 0.9.0
 ```
 
 ```notes
@@ -311,13 +340,13 @@ git checkout -b 0.9.0 0.9.0
 # Create provider config
 
 ```
-$ leap new .
+$ leap new --domain workshop.bitmask.net .
 
-  The primary domain of the provider: |example.org|
-  The name of the provider: |Example|
-  File path of the leap_platform directory: |/home/varac/leap_platform|
-  Default email address contacts: |root@example.org|
-  The platform directory "/home/varac/leap/leap_platform" does not exist.
+  The name of the provider: |Example| Workshop demo
+  File path of the leap_platform directory: |/home/varac/dev/projects/leap/leap_platform| 
+  Default email address contacts: |root@workshop.bitmask.net| 
+
+  The platform directory "/home/varac/dev/projects/leap/leap_platform" does not exist.
   Do you want me to create it by cloning from the
   git repository https://leap.se/git/leap_platform.git? y
   ...
@@ -334,7 +363,7 @@ Just accept the default values
 
 
 ```
-$ leap add-user varac --self
+$ leap add-user $user --self
 ```
 
 ---
@@ -348,15 +377,19 @@ $ leap cert ca
 $ leap cert csr
 ```
 
+```notes
+Later on we can deploy proper LE certs
+```
+
 ---
 
 # Option A: Add your local vagrant node
 
 ```
-$ leap node add --local wildebeest services:webapp,couchdb,soledad,mx
+$ leap node add --local blackbox services:webapp,couchdb,soledad,mx
 $ leap list
 
-$ leap local start wildebeest
+$ leap local start blackbox
 $ leap local status
 ```
 
@@ -366,12 +399,12 @@ $ leap local status
 
 
 ```
-$ leap node add wildebeest ip_address:0.1.2.3 \
+$ leap node add blackbox ip_address:37.218.240.130 \
   services:webapp,couchdb,soledad,mx
 ```
 
 ```notes
-
+Use workshop IP: 37.218.240.130
 ```
 
 ---
@@ -383,7 +416,7 @@ $ leap node add wildebeest ip_address:0.1.2.3 \
 - https://leap.se/en/docs/platform/guide/virtual-machines for details
 
 ```
-$ leap vm add wildebeest services:webapp,couchdb,soledad,mx
+$ leap vm add blackbox services:webapp,couchdb,soledad,mx
 $ leap vm status
 ```
 
@@ -408,28 +441,29 @@ $ leap vm status
 ```
 $ leap list
 
-$ leap node init wildebeest
-$ leap deploy wildebeest
+$ leap node init blackbox
+$ leap deploy blackbox 
 ```
 
 ```notes
 
-    unbuffer leap node init wildebeest | ts
-    unbuffer leap deploy wildebeest | ts
+    unbuffer leap node init blackbox | ts
+    unbuffer leap deploy blackbox | ts
 
-- Takes ~10 min to finish on AWS
+- Takes ~10 min to finish on AWS, 15 min on Greenhost
 - We'll setup DNS meanwhile
 ```
 
 ---
 
-# Setup DNS
 
-We are using a fake domain here, so we need to override our DNS resolution.
+# Option A: Fake DNS for Vagrant
+
+We are using a domain here without proper DNS, so we need to override our DNS resolution.
 
 - Open another terminal and:
 ```
-cd ~/leap/example.org
+cd ~/leap/workshop.bitmask.net
 leap compile hosts
 ```
 
@@ -443,13 +477,32 @@ see [Quick start tutorial/Setup DNS](https://leap.se/en/docs/platform/tutorials/
 
 ---
 
-# Questions so far ?
+# Option B: Setup DNS for real
 
-```notes
-- Time for Q&A, explain more about platform
-- We'll wait until deploy finishes
+In case of a real provider with proper domain and DNS, we need to setup DNS:
+
+```
+leap compile zone
 ```
 
+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 MX 10  blackbox
+@                     IN TXT    "v=spf1 MX ip4:37.218.240.130 -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"
+```
+
+---
+
+# Questions ?
+
 ---
 
 # Test if things work correctly
@@ -462,7 +515,8 @@ $ leap test
 
 # Use Bitmask
 
-- Register a user at https://example.org (accept self-signed provider cert)
+- Download latest Bitmask build from https://bitmask.net/en/install/linux#latest-builds
+- Register a user at https://workshop.bitmask.net (accept self-signed provider cert)
 
 ```notes
 
@@ -470,12 +524,12 @@ Show:
 
 - Mail to myself
 - Mail to/from other workshop participants
-- Mail from outside (cat swaks -t varac@example.org -s IP)
+- Mail from outside (cat swaks -t varac@workshop.bitmask.net -s IP)
 ...
 ```
 ---
 
-## Pixelated
+# Pixelated
 
 - Encrypted Webmail on top of LEAP
 - No installation hassle
diff --git a/platform-workshop/video/fbi.mp4 b/platform-workshop/video/fbi.mp4
new file mode 100644
index 0000000..659fb9b
--- /dev/null
+++ b/platform-workshop/video/fbi.mp4
author	varac <varacanero@zeromail.org>	2017-05-05 17:46:15 +0200
committer	varac <varacanero@zeromail.org>	2017-05-05 17:46:15 +0200
commit	4a132e3bfb5152a9b8b187a3a90e3a817fcb3c7a (patch)
tree	1f637ffcd8b4a0a788b1b3bdea5f0765796d5179
parent	8dc82bd2c475136225c3d7689524bef235ab9797 (diff)