Merge branch 'management' into develop

2024-11-23 19:17:54 +00:00 · 2017-06-01 12:26:27 +02:00 · 2017-06-01 12:26:27 +02:00 · dbfa52c6ae
parent 43e93c8abf b16f432795
commit dbfa52c6ae
40 changed files with 64 additions and 32 deletions
--- a/chapter/aaa/radius.tex
+++ b/chapter/aaa/radius.tex
@ -0,0 +1 @@
+\section{RADIUS}
--- a/chapter/aaa/tacacsplus.tex
+++ b/chapter/aaa/tacacsplus.tex
@ -0,0 +1 @@
+\section{TACACS+}
--- a/chapter/internet.tex
+++ b/chapter/internet.tex
@ -1,11 +0,0 @@
-\chapter{The Internet {\footnotesize "Post cold-war modern times"}}
-
-\section{Service Providers}
-
-\section{IXP}
-
-\section{MPLS}
-
-\section{BGP}
-
-\section{eVPN}
--- a/chapter/layer2protocols.tex
+++ b/chapter/layer2protocols.tex
@ -1,7 +0,0 @@
-\chapter{Protocols Layer 2}
-
-\input{chapter/section/switchednetwork}
-
-\newpage
-
-\input{chapter/section/spanningtree}
--- a/chapter/layer3protocols.tex
+++ b/chapter/layer3protocols.tex
@ -1,11 +0,0 @@
-\chapter{Layer-2-to-Layer-3}
-
-\input{chapter/section/intervlanrouting}
-
-\chapter{DHCP}
-
-\input{chapter/section/dhcp}
-
-\chapter{Protocols Layer 3}
-
-\input{chapter/section/routednetwork}
--- a/commands.tex
+++ b/commands.tex
@ -16,6 +16,9 @@
 \end{figure}
 }

+\newcommand{\xkcd}[2]{\fig{xkcd/#1}{#1}{#2\\%
+        {\tiny\MakeUppercase{https://imgs.xkcd.com/comics/#1.png}}}}
+
 % Usage: \svg{<path-to-file>}{<label>}{<caption>}
 \newcommand{\svg}[3]{
    \begin{figure}[h]
--- a/img/coffee.png
+++ b/img/coffee.png
--- a/img/coffee2.jpg
+++ b/img/coffee2.jpg
--- a/img/coffee3.jpg
+++ b/img/coffee3.jpg
--- a/img/coffee4.png
+++ b/img/coffee4.png
--- a/img/coffee5.jpg
+++ b/img/coffee5.jpg
--- a/img/coffee6.jpg
+++ b/img/coffee6.jpg
--- a/img/coffee7.jpg
+++ b/img/coffee7.jpg
--- a/img/coffee8.jpg
+++ b/img/coffee8.jpg
--- a/img/coffeereligion.gif
+++ b/img/coffeereligion.gif
--- a/img/starbucks.jpg
+++ b/img/starbucks.jpg
--- a/img/xkcd/11th_grade.png
+++ b/img/xkcd/11th_grade.png
--- a/img/xkcd/alternate_currency.png
+++ b/img/xkcd/alternate_currency.png
--- a/img/xkcd/api.png
+++ b/img/xkcd/api.png
--- a/img/xkcd/background_screens.png
+++ b/img/xkcd/background_screens.png
--- a/img/xkcd/brakes.png
+++ b/img/xkcd/brakes.png
--- a/img/xkcd/converting_to_metric.png
+++ b/img/xkcd/converting_to_metric.png
--- a/img/xkcd/depth.png
+++ b/img/xkcd/depth.png
--- a/img/xkcd/frustration.png
+++ b/img/xkcd/frustration.png
--- a/img/xkcd/genetic_algorithms.png
+++ b/img/xkcd/genetic_algorithms.png
--- a/img/xkcd/hard_reboot.png
+++ b/img/xkcd/hard_reboot.png
--- a/img/xkcd/hats.png
+++ b/img/xkcd/hats.png
--- a/img/xkcd/insurance.png
+++ b/img/xkcd/insurance.png
--- a/img/xkcd/latitude.png
+++ b/img/xkcd/latitude.png
--- a/img/xkcd/legal_hacks.png
+++ b/img/xkcd/legal_hacks.png
--- a/img/xkcd/listen_to_yourself.png
+++ b/img/xkcd/listen_to_yourself.png
--- a/img/xkcd/operating_systems.png
+++ b/img/xkcd/operating_systems.png
--- a/img/xkcd/packages.png
+++ b/img/xkcd/packages.png
--- a/img/xkcd/parking.png
+++ b/img/xkcd/parking.png
--- a/img/xkcd/simultaneous.png
+++ b/img/xkcd/simultaneous.png
--- a/img/xkcd/smfw.png
+++ b/img/xkcd/smfw.png
--- a/img/xkcd/terminology.png
+++ b/img/xkcd/terminology.png
--- a/img/xkcd/twitter.png
+++ b/img/xkcd/twitter.png
--- a/img/xkcd/typewriter.png
+++ b/img/xkcd/typewriter.png
--- a/main.tex
+++ b/main.tex
@ -27,11 +27,67 @@
 	
 \include{chapter/baseconf}

-\include{chapter/layer2protocols}
+\chapter{Layer 2}

-\include{chapter/layer3protocols}
+\input{chapter/section/switchednetwork}

-\include{chapter/internet}
+\newpage
+
+\input{chapter/section/spanningtree}
+
+\chapter{L2 to L3}
+
+\input{chapter/section/intervlanrouting}
+
+\chapter{DHCP}
+
+\input{chapter/section/dhcp}
+
+\chapter{Triple A\tsq{s}}
+
+\myquote{}{Remember to log the details, too.}
+
+\xkcd{latitude}{Remember logging when necessary}
+
+\input{chapter/aaa/radius}
+
+\input{chapter/aaa/tacacsplus}
+
+\chapter{Network Time Protocol}
+
+\section{The old NTP from \tsq{85}}
+
+\section{Secure NTP}
+
+\chapter{Managemnt}
+
+\section{Network management}
+
+\subsection{Routers}
+
+\subsection{Switches}
+
+\subsection{Firewall}
+
+\section{Out-of-band management}
+
+\subsection{Console server}
+
+\chapter{Protocols Layer 3}
+
+\input{chapter/section/routednetwork}
+
+\chapter{The Internet {\footnotesize "Post cold-war modern times"}}
+
+\section{Service Providers}
+
+\section{IXP}
+
+\section{MPLS}
+
+\section{BGP}
+
+\section{eVPN}

 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                    %