From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 8 Jul 2014 13:28:16 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/ssh-pres
X-Git-Tag: 1.0~3
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=e089f81414c5d661914480e8ec0de354b1b93b33;p=linuxnijmegen-ssh.git

Merge branch 'master' of github.com:dopefishh/ssh-pres

Conflicts:
	intro.tex
	server.tex
---

e089f81414c5d661914480e8ec0de354b1b93b33
diff --cc intro.tex
index e751127,dd09fb8..f6e3d57
--- a/intro.tex
+++ b/intro.tex
@@@ -1,14 -1,15 +1,29 @@@
  \begin{frame}
  	\frametitle{Introductie}
++<<<<<<< HEAD
 +	\begin{block}{Waarom}
 +		\begin{enumerate}
 +				\pause
 +			\item{veiligheid \footnote{mits goed gebruikt}}
 +				\pause
 +			\item{beschikbaarheid}
 +				\pause
 +			\item{cross platform}
 +		\end{enumerate}
 +	\end{block}
 +	En natuurlijk al de handige truukjes die je er mee uit kunt halen...
++=======
+ 	\begin{block}{Wat is SSH}
+ 			\pause
+ 			\begin{enumerate}
+ 					\item remote shell
+ 					\item x forwarding
+ 					\item port forwarding
+ 					\item ...
+ 			\end{enumerate}
+ 	\end{block}
+ 	\pause
+ 	\begin{block}{Versleuteling}
+ 	\end{block}
++>>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
  \end{frame}
diff --cc server.tex
index 45177bd,6806116..2597941
--- a/server.tex
+++ b/server.tex
@@@ -17,22 -20,19 +20,20 @@@
  \end{frame}
  
  \begin{frame}[fragile]
- 	\frametitle{Configureren systeem breed}
- 	\begin{block}{/etc/ssh/sshd\_config}
- 		\lstinline{man sshd\_config}
- 	\end{block}
+ 	\frametitle{/etc/ssh/sshd\_config}
  	\begin{block}{Broodnodig}
- 		\lstinline{AllowUsers henk}
- 	\end{block}
- \end{frame}
- 
- \begin{frame}[fragile]
- 	\frametitle{Configureren per user}
- 	\begin{block}{\textasciitilde/.ssh/authorized\_keys}
- 		\lstinline{parameter1="waarde",parameter2="waarde", ... ,parameter2="waarde",ssh-rsa AAAAB3N...}
+ 		\lstinline{AllowUsers frobnicator}\\
  	\end{block}
- 	\begin{block}{Merk op}
- 		alles in \textasciitilde/.ssh/ moet alleen leesbaar zijn voor de user. 
- 		\lstinline{chmod 600} dus
+ 	\pause
+ 	\begin{block}{Verder}
+ 		\begin{enumerate}
+ 			\item PermitOpen
+ 			\item X11Forwarding
+ 			\item PermitRootLogin
+ 			\item ChrootDirectory
+ 			\item ...
+ 			\item \lstinline{$ man sshd_config}
+ 		\end{enumerate}
++>>>>>>> 045d7a2a20106057e9b1a2b7ce76c3ae174ab6b8
  	\end{block}
  \end{frame}
diff --cc truuk.tex
index 37f6ea6,bf50aca..d7e6f07
--- a/truuk.tex
+++ b/truuk.tex
@@@ -76,6 -76,16 +76,20 @@@ d5DgKnWxgJPHnDjmwqTeX3A5S34m/qJKK67IF9W
  	\end{block}
  \end{frame}
  
+ \begin{frame}[fragile]
+ 	\frametitle{Public key authentication}
+ 	\begin{block}{\textasciitilde/.ssh/authorized\_keys}
+ 		\begin{lstlisting}
+ option1="option1value",option2="option2value"...optionn="optionnvalue" ssh-rsa\
+ AAAB4N.....
+ 		\end{lstlisting}
+ 	\end{block}
++	\begin{block}{Merk op}
++		alles in \textasciitilde/.ssh/ moet alleen leesbaar zijn voor de user. 
++		\lstinline{chmod 600} dus
++	\end{block}
+ \end{frame}
+ 
  \begin{frame}[fragile]
  	\frametitle{X forwarding}
  	\begin{block}{Nut}