updates

Makefile

@@ -1,7 +1,4 @@
-all: slides.pdf
+all: slides
-slides.pdf: slides/slides.md slides/header.tex
-	docker run -v ${PWD}:/host pandoc make slides
-
 slides: slides/slides.md slides/header.tex
 	pandoc -t beamer \
 		slides/slides.md \

Makefile.bak

@@ -1,14 +0,0 @@
-slides.pdf: slides/slides.md slides/header.tex
-	pandoc -t beamer \
-	    slides/slides.md \
-	    --include-in-header slides/header.tex \
-	    --slide-level 3 \
-	    -V theme:Pittsburgh -o slides.pdf
-
-slides: slides.pdf
-
-clean:
-	rm -f slides.{aux,nav,log,out,pdf,tex,toc,snm}
-	rm -f slides/slides.{aux,nav,log,out,pdf,tex,toc,snm}
-
-.PHONY: slides clean

slides/slides.md

@@ -24,7 +24,7 @@
 
 ### Situation initiale
 
-\begin{centering}
+\centering{
 \begin{tikzpicture}[sibling distance = 5em, every node/.style
 = {shape=ellipse,
 draw, align=center, top color=white, bottom color = red!80}]
@@ -34,11 +34,11 @@ draw, align=center, top color=white, bottom color = red!80}]
 \draw[link] (a.north) -- (t.south west);
 \draw[link] (t.south east) -- (b.north);
 \end{tikzpicture}
-\end{centering}
+}
 
 ### Mangez des fruits
 
-\begin{centering}
+\centering{
 \begin{tikzpicture}[sibling distance = 5em, every node/.style
 = {shape=ellipse,
 draw, align=center, top color=white, bottom color = red!80}]
@@ -50,13 +50,13 @@ draw, align=center, top color=white, bottom color = red!80}]
 color=white,midway,above=.1cm] {\$};
 \draw[darrow] (t.south east) -- (b.north);
 \draw[arrow] (t.345) -- (b.30) node[shape=rectangle,draw=none,fill=none,bottom
-color=white,midway,above right=.1cm] {accords préalables \\ (transit ou peering)};
+color=white,midway,above right=.1cm] {accords \\ préalables};
 \end{tikzpicture}
-\end{centering}
+}
 
 ### De peer en peer
 
-\begin{centering}
+\centering{
 \begin{tikzpicture}[sibling distance = 5em, every node/.style
 = {shape=ellipse,
 draw, align=center, top color=white, bottom color = red!80}]
@@ -67,5 +67,25 @@ draw, align=center, top color=white, bottom color = red!80}]
 node[shape=rectangle,draw=none,fill=none,bottom color=white,midway,above=.1cm]
 {accords de peering};
 \end{tikzpicture}
-\end{centering}
+}
 
+### Les gestes qui sauvent
+
+- MPLS everywhere
+- Encapsulation de l'Ethernet pour le transport
+- Des grosses machines qui empilent des paquets
+
+###
+\centerline{\includegraphics[height=\paperheight]{resources/photos-infra/IMG_20160520_114325.jpg}}
+
+###
+\centerline{\includegraphics[height=\paperheight]{resources/photos-infra/IMG_20160520_114337}}
+
+### L'internet Français
+\centerline{\includegraphics[height=8.4cm]{resources/photos-infra/IMG_20160420_164835}}
+
+### Feux de signalisation
+
+- L'IXP fournit d'autres services
+    - Route Servers
+    - Monitoring