Merge pull request #567 from devopsdays/update-content-2017_06_24__06_36_07

Updating exampleSite data

Author: mattstratton

exampleSite/content/events/2017-amsterdam/program.md

@@ -48,7 +48,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
     Opening Welcome <br />
-    <a href="/events/2017-amsterdam/program/kris-buytaert/">Kris Buytaert - 7 years of #devopsdays, 5 years in Amsterdam</a>
+    <a href="/events/2017-amsterdam/program/kris-buytaert/">Kris Buytaert - 7 years of #devopsdays, 5 years in Amsterdam</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -58,7 +59,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
     Keynote <br />
-    <a href="/events/2017-amsterdam/program/katherine-daniels/">Katherine Daniels - Building Bridges with Effective Devops</a>
+    <a href="/events/2017-amsterdam/program/katherine-daniels/">Katherine Daniels - Building Bridges with Effective Devops</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -67,7 +69,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>10:05-10:35</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <a href="/events/2017-amsterdam/program/matthew-slane/">Matthew Slane - Start-up Culture at Scale</a>
+    <a href="/events/2017-amsterdam/program/matthew-slane/">Matthew Slane - Start-up Culture at Scale</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -85,7 +88,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>10:50-11:20</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <a href="/events/2017-amsterdam/program/ilkka-turunen/">Ilkka Turunen - DevSecOps: Security at Devops Speed</a>
+    <a href="/events/2017-amsterdam/program/ilkka-turunen/">Ilkka Turunen - DevSecOps: Security at Devops Speed</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -94,7 +98,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>11:25-11:55</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <a href="/events/2017-amsterdam/program/hannah-foxwell/">Hannah Foxwell - Resilient Systems Require Resilient People</a>
+    <a href="/events/2017-amsterdam/program/hannah-foxwell/">Hannah Foxwell - Resilient Systems Require Resilient People</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -112,7 +117,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>13:00-13:30</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <a href="/events/2017-amsterdam/program/matthew-simons/">Matthew Simons - Terminal Velocity: Doing DevOps Right by Removing CLIs from Production Environments</a>
+    <a href="/events/2017-amsterdam/program/matthew-simons/">Matthew Simons - Terminal Velocity: Doing DevOps Right by Removing CLIs from Production Environments</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -121,7 +127,12 @@ heading = "devopsdays Amsterdam - Program"
     <time>13:40-14:15</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <strong>Ignites</strong>
+    <strong>Ignites</strong><br />
+    Integrating security into your devops: use a security automation pipeline - Jeroen	Willemsen<br />
+    DevOps is Gezellig - Jason Yee<br />
+    Evolvo Labor, or the Latin version of DevOps - Alessandro	Vozza<br />
+    Trials and Tribulations of an AWS Multiple Account Strategy	- Nick Brown<br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -131,7 +142,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
     <strong>Open Space &amp; HumanOps </strong><br />
-    Open Space Opening &amp; HumanOps Track explanation
+    Open Space Opening &amp; HumanOps Track explanation<br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -145,7 +157,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-3 col-md-offset-2 box-grey">
     <strong>HumanOps Track</strong><br />
-    <a href="/events/2017-amsterdam/program/bernd-erk/">Bernd Erk - How to make good and difficult decisions</a>
+    <a href="/events/2017-amsterdam/program/bernd-erk/">Bernd Erk - How to make good and difficult decisions</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -159,7 +172,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-3 col-md-offset-2 box-grey">
     <strong>HumanOps Track</strong><br />
-    <a href="/events/2017-amsterdam/program/david-mytton/">David Mytton - How to do HumanOps</a>
+    <a href="/events/2017-amsterdam/program/david-mytton/">David Mytton - How to do HumanOps</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -173,7 +187,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-3 col-md-offset-2 box-grey">
     <strong>HumanOps Track</strong><br />
-    <a href="/events/2017-amsterdam/program/mary-gouseti/">Mary Gouseti - Operations in Jip-en-Janekketaal.</a>
+    <a href="/events/2017-amsterdam/program/mary-gouseti/">Mary Gouseti - Operations in Jip-en-Janekketaal.</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -191,7 +206,9 @@ heading = "devopsdays Amsterdam - Program"
     <time>18:00-late</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <strong>Evening Event</strong>
+    <strong>Evening Event at Café-Restaurant Stork</strong><br />
+    Thank you so much Schuberg Philis for sponsoring the evening event!<br />
+    Location: <a href="https://goo.gl/maps/kSHNr5qnuS22">Gedempt Hamerkanaal 201, 1021 KP Amsterdam</a>
   </div>
 </div> <!-- end timeslot div -->
 
@@ -221,7 +238,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>09:30-09:40</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    Day 2 Welcome
+    Day 2 Welcome<br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -230,7 +248,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>09:45-10:15</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <a href="/events/2017-amsterdam/program/dirk-lehmann/">Dirk Lehmann - Trust as the foundation of DevOps</a>
+    <a href="/events/2017-amsterdam/program/dirk-lehmann/">Dirk Lehmann - Trust as the foundation of DevOps</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -239,7 +258,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>10:20-10:50</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <a href="/events/2017-amsterdam/program/neil-crawford/">Neil Crawford - The Canary and the Caterpillar</a>
+    <a href="/events/2017-amsterdam/program/neil-crawford/">Neil Crawford - The Canary and the Caterpillar</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -257,7 +277,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>11:05-11:35</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <a href="/events/2017-amsterdam/program/jody-wolfborn/">Jody Wolfborn - Adapt or Die: how DevOps can (and should!) save the world</a>
+    <a href="/events/2017-amsterdam/program/jody-wolfborn/">Jody Wolfborn - Adapt or Die: how DevOps can (and should!) save the world</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -266,7 +287,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>11:40-12:10</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <a href="/events/2017-amsterdam/program/zane-lackey/">Zane Lackey - Practical tips for defending web applications in the age of agile/DevOps</a>
+    <a href="/events/2017-amsterdam/program/zane-lackey/">Zane Lackey - Practical tips for defending web applications in the age of agile/DevOps</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -284,7 +306,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>13:15-13:45</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <a href="/events/2017-amsterdam/program/jason-yee/">Jason Yee - Data-driven Postmortems</a>
+    <a href="/events/2017-amsterdam/program/jason-yee/">Jason Yee - Data-driven Postmortems</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -293,7 +316,12 @@ heading = "devopsdays Amsterdam - Program"
     <time>13:50-14:15</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    <strong>Ignites</strong>
+    <strong>Ignites</strong><br />
+    In-line code documentation - Arnab Sinha<br />
+    Business = IT	- Pavel Chunyayev<br />
+    Pipelines: breaking the wall between Dev and Ops - Joep Weijers<br />
+    Devs on-call? Yes, it is possible! Implementing the new thinking of "on-call!" - Aaron Atwell<br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -303,7 +331,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
     <strong>Open Space &amp; Security </strong><br />
-    Open Space Opening &amp; Security Track explanation
+    Open Space Opening &amp; Security Track explanation<br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -317,7 +346,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-3 col-md-offset-2 box-grey">
     <strong>Security Track</strong><br />
-    <a href="/events/2017-amsterdam/program/eric-maxwell/">Eric Maxwell - Building security into your workflow with InSpec</a>
+    <a href="/events/2017-amsterdam/program/mandi-walls/">Mandi Walls - Building security into your workflow with InSpec</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -331,7 +361,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-3 col-md-offset-2 box-grey">
     <strong>Security Track</strong><br />
-    <a href="/events/2017-amsterdam/program/edward-van-deursen/">Edward van Deursen - GDPR in DevOps for Dummies</a>
+    <a href="/events/2017-amsterdam/program/edward-van-deursen/">Edward van Deursen - GDPR in DevOps for Dummies</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -345,7 +376,8 @@ heading = "devopsdays Amsterdam - Program"
   </div>
   <div class = "col-md-3 col-md-offset-2 box-grey">
     <strong>Security Track</strong><br />
-    <a href="/events/2017-amsterdam/program/peter-souter/">Peter Souter - Secret Management in the world of Infrastructure as Code</a>
+    <a href="/events/2017-amsterdam/program/peter-souter/">Peter Souter - Secret Management in the world of Infrastructure as Code</a><br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -354,7 +386,8 @@ heading = "devopsdays Amsterdam - Program"
     <time>17:00-17:15</time>
   </div>
   <div class = "col-md-6 col-md-offset-2 box">
-    Close 5th anniversary of devopsdays Amsterdam
+    Close 5th anniversary of devopsdays Amsterdam<br />
+    Location: Main Room
   </div>
 </div> <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->

exampleSite/content/events/2017-amsterdam/program/mandi-walls.md

@@ -0,0 +1,8 @@
++++
+Title = "Building security into your workflow with InSpec"
+Type = "talk"
+Speakers = ["mandi-walls"]
+aliases = ["/events/2017-amsterdam/program/mandi-walls/"]
++++
+
+InSpec is an open source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security, and policy requirements. Using a combination of command-line and remote-execution tools, InSpec can help you keep your infrastructure aligned with security and compliance guidelines on an ongoing basis, rather than waiting for and then remediating from arduous annual audits. InSpec’s flexibility makes it a key tool choice for incorporating security into a complete continuous delivery workflow, reducing the risk of new features and releases breaking established host-based security guidelines. This talk covers the basics of working with InSpec, writing tests to reflect your organization’s security guidelines, and managing InSpec as part of a high-velocity workflow.

exampleSite/content/events/2017-amsterdam/speakers/mandi-walls.md

@@ -0,0 +1,10 @@
++++
+Title = "Mandi Walls"
+Twitter = "lnxchk"
+Linkedin = "https://www.linkedin.com/in/mandiwalls"
+image = "mandi-walls.jpg"
+type = "speaker"
+linktitle = "mandi-walls"
++++
+
+Mandi Walls is the Technical Community Manager for Chef in EMEA, based in London. Mandi has been with Chef for several years, working with customers worldwide on their automation and DevOps journeys.

exampleSite/content/events/2017-amsterdam/workshop.md

@@ -54,25 +54,29 @@ tags = ["amsterdam","amsterdam-2017"]
   <div class = "col-md-3 box">
     <a href="/events/2017-amsterdam/workshop/monique-boon/">
     <strong>The hidden buttons in your organisation: what to influence, what to measure?</strong><br />
+    Location: Expo <br />
     Monique Boon &amp; Jan de Vries
   </a>
   </div>
-  <div class = "col-md-3 box-grey">
-    <a href="/events/2017-amsterdam/workshop/michael-heap/">
-    <strong>Meet Terraform</strong><br />
-    Michael Heap
-  </a>
-  </div>
   <div class = "col-md-3 box-lightorange">
     <a href="/events/2017-amsterdam/workshop/ken-mugrage/">
     <strong>Creating a Continuous Delivery Pipeline</strong><br />
+    Location: Small Room <br />
     Ken Mugrage
   </a>
   </div>
+  <div class = "col-md-3 box-grey">
+    <a href="/events/2017-amsterdam/workshop/arnab-sinha/">
+    <strong>Setup your own Ansible/Docker Workshop/Raising an Ansible Army</strong><br />
+    Location: Studio<br />
+    Arnab Sinha
+  </a>
+  </div>
   <div class = "col-md-3 box">
-    <a href="/events/2017-amsterdam/workshop/pablo-musa/">
+    <a href="/events/2017-amsterdam/workshop/philipp-krenn/">
     <strong>Awesome Logging Infrastructure Using The Elastic Stack</strong><br />
-    Pablo Musa &amp; Philipp Krenn
+    Location: Workspace<br />
+    Philipp Krenn
   </a>
   </div>
 </div>
@@ -96,30 +100,27 @@ tags = ["amsterdam","amsterdam-2017"]
   </div>
 </div>
 <div class = "row">
-  <div class = "col-md-3 box">
+  <div class = "col-md-4 box">
     <a href="/events/2017-amsterdam/workshop/andy-repton/">
     <strong>Introduction to Kubernetes</strong><br />
+    Location: Expo <br />
     Andy Repton
   </a>
   </div>
-  <div class = "col-md-3 box-grey">
+  <div class = "col-md-4 box-grey">
     <a href="/events/2017-amsterdam/workshop/hannah-foxwell/">
     <strong>HumanOps</strong><br />
+    Location: Small Room <br />
     Hannah Foxwell
   </a>
   </div>
-  <div class = "col-md-3 box-lightorange">
+  <div class = "col-md-4 box-lightorange">
     <a href="/events/2017-amsterdam/workshop/jeroen-willemsen/">
     <strong>Start security testing with the tests you already use!</strong><br />
+    Location: Studio<br />
     Jeroen Willemsen &amp; Nanne Baars
   </a>
   </div>
-  <div class = "col-md-3 box">
-    <a href="/events/2017-amsterdam/workshop/arnab-sinha/">
-    <strong>Setup your own Ansible/Docker Workshop/Raising an Ansible Army</strong><br />
-    Arnab Sinha
-  </a>
-  </div>
 </div>
 <!-- end timeslot div -->
 <!-- this div is repeated for each timeslot -->
@@ -142,27 +143,31 @@ tags = ["amsterdam","amsterdam-2017"]
 </div>
 <div class = "row">
   <div class = "col-md-3 box">
-    <a href="/events/2017-amsterdam/workshop/eric-maxwell/">
-    <strong>Habitat Workshop</strong><br />
-    Eric Maxwell
+    <a href="/events/2017-amsterdam/workshop/alessandro-vozza/">
+    <strong>Hands-on Openshift Developer Workshop (in Azure)</strong><br />
+    Location: Expo <br />
+    Alessandro Vozza & Samuel Terburg
   </a>
   </div>
   <div class = "col-md-3 box-grey">
     <a href="/events/2017-amsterdam/workshop/berry-kersten/">
     <strong>Experience 'The Phoenix Project', a real DevOps simulation</strong><br />
+    Location: Small Room <br />
     Berry Kersten &amp; Jan Schilt
   </a>
   </div>
   <div class = "col-md-3 box-lightorange">
     <a href="/events/2017-amsterdam/workshop/antons-kranga/">
     <strong>Build Serverless Architectures with AWS</strong><br />
+    Location: Studio<br />
     Antons Kranga
   </a>
   </div>
   <div class = "col-md-3 box">
-    <a href="/events/2017-amsterdam/workshop/alessandro-vozza/">
-    <strong>Hands-on Openshift Developer Workshop (in Azure)</strong><br />
-    Alessandro Vozza & Samuel Terburg
+    <a href="/events/2017-amsterdam/workshop/mandi-walls/">
+    <strong>Habitat Workshop</strong><br />
+    Location: Workspace<br />
+    Mandi Walls
   </a>
   </div>
 </div>
@@ -175,7 +180,9 @@ tags = ["amsterdam","amsterdam-2017"]
 </div>
 <div class = "row">
   <div class = "col-md-12 box centerstyle">
-    Evening Event
+    <strong>Evening Event at De Waag</strong><br />
+    Thank you OpsGenie for sponsoring the evening event!<br />
+    Location: <a href="https://goo.gl/maps/ryv3zzQQj8B2">Nieuwmarkt 4, 1012 CR, Amsterdam</a>
   </div>
 </div>
 <!-- end timeslot div -->