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

Conflicts:
	intro.tex
	server.tex

diff --git a/README.md b/README.md
index ec41dc8..7ea82f5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 SSH
 ===
 Presentiation about SSH for the [Linux User Group
-Nijmegen](https://http://www.linuxnijmegen.nl/)
+Nijmegen](http://www.linuxnijmegen.nl/)
 
 To compile you need at least:
 - [LaTeX](http://http://www.latex-project.org/)

diff --git a/conf.tex b/conf.tex
index 5233710..f37ceaf 100644 (file)
--- a/conf.tex
+++ b/conf.tex
@@ -1,4 +1,5 @@
 \begin{frame}[fragile]
+       \frametitle{Gebruikersniveau}
        \begin{lstlisting}
 Host nas
     HostName 192.168.0.102
@@ -9,16 +10,16 @@ Host github.com
     Identityfile ~/.ssh/github
 
 Host werk
-    User johndoe
-    HostName ssh.tunnel.werk.com
+    User frobnicator
+    HostName ssh.werk.nl
     ForwardX11 yes
     Port 2222
     Identityfile ~/.ssh/werk
 
 Host muziekserver
-    User gebruiker
+    User frobnicator
     HostName muziek.dyndns.com
-    IdentityFile ~/.ssh/mpi
+    IdentityFile ~/.ssh/muziek
     LocalForward 8123 localhost:8123
     AddressFamily inet
        \end{lstlisting}

diff --git a/ext.tex b/ext.tex
index e69de29..e758982 100644 (file)
--- a/ext.tex
+++ b/ext.tex
@@ -0,0 +1,32 @@
+\begin{frame}
+       \frametitle{SCP/FISH/SFTP}
+       Bestanden verplaatsen
+\end{frame}
+
+\begin{frame}
+       \frametitle{SSHFS}
+       Remote file systemen mounten
+\end{frame}
+
+\begin{frame}
+       \frametitle{AutoSSH}
+       Automatisch ssh verbindingen open houden
+\end{frame}
+
+\begin{frame}[fragile]
+       \frametitle{Even terug naar de truukjes: Hergebruik}
+       \begin{block}{Nut}
+               Snelheid en belasting netwerk\\
+               Werkt ook voor scp, sftp etc...
+       \end{block}
+       \begin{block}{Command line}
+               \lstinline{ssh -S /path/socket.socket frobnicator@foobarbaz.com}
+       \end{block}
+       \begin{block}{Config}
+               \begin{lstlisting}
+ControlPath /tmp/ssh-%r@%h:%p
+ControlMaster auto
+               \end{lstlisting}
+       \end{block}
+
+\end{frame}

diff --git a/img/xkcd.png b/img/xkcd.png
new file mode 100644 (file)
index 0000000..28f5f29
Binary files /dev/null and b/img/xkcd.png differ

diff --git a/intro.tex b/intro.tex
index e751127..f6e3d57 100644 (file)
--- a/intro.tex
+++ b/intro.tex
@@ -1,5 +1,6 @@
 \begin{frame}
        \frametitle{Introductie}
+<<<<<<< HEAD
        \begin{block}{Waarom}
                \begin{enumerate}
                                \pause
@@ -11,4 +12,18 @@
                \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 --git a/pres.tex b/pres.tex
index 65205fa..ab45b77 100644 (file)
--- a/pres.tex
+++ b/pres.tex
@@ -5,7 +5,10 @@
 
 \title[SSH]{Secure Shell(SSH)}
 \subtitle{Meer dan alleen remote shell}
-\author{Mart Lubbers}
+\author{Mart Lubbers\\
+mart@martlubbers.net\\
+https://github.com/dopefishh/ssh-pres
+}
 \date{\today}
 \subject{SSH}
 
@@ -46,8 +49,9 @@
        \section{Programma's die SSH gebruiken}
        \input{ext.tex}
 
-       \section{Samenvatting}
-       \input{samen.tex}
-
+       \section{Vragen}
+       \begin{frame}
+               \frametitle{Vragen}
+               \includegraphics[width=\linewidth]{./img/xkcd.png}
+       \end{frame}
 \end{document}
-

diff --git a/server.tex b/server.tex
index 45177bd..2597941 100644 (file)
--- a/server.tex
+++ b/server.tex
@@ -1,38 +1,39 @@
 \begin{frame}[fragile]
        \frametitle{Installeren}
-       \begin{block}{Verschillende smaken}
-               Openssh-server\\
-               Dropbear\\
-               ...
+       \begin{block}{Smaken}
+               \begin{enumerate}
+                       \item OpenSSH
+                       \item Dropbear
+                       \item lsh
+                       \item ...
+               \end{enumerate}
        \end{block}
+       \pause
        \begin{block}{Installeren}
                \begin{lstlisting}
-sudo apt-get install {openssh-server,dropbear}
-yum
-pacman
-zypper
-...
+# apt-get install openssh-server
+# pacman -S openssh
+# yum install openssh-server
+# zypper install openssh-server
                \end{lstlisting}
        \end{block}
 \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 --git a/truuk.tex b/truuk.tex
index 37f6ea6..d7e6f07 100644 (file)
--- a/truuk.tex
+++ b/truuk.tex
@@ -6,7 +6,7 @@
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -i ~/.ssh/keyfile user@server.nl}
+               \lstinline{ssh -i ~/.ssh/keyfile frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@ -20,14 +20,14 @@
        \begin{block}{\$ ssh-keygen}
                \begin{lstlisting}
 Generating public/private rsa key pair.
-Enter file in which to save the key (/home/user/.ssh/id_rsa):
-               /home/user/.ssh/github
+Enter file in which to save the key (/home/frobnicator/.ssh/id_rsa):
+               /home/frobnicator/.ssh/github
 Enter passphrase (empty for no passphrase): 
 Enter same passphrase again: 
-Your identification has been saved in /home/user/.ssh/github.
-Your public key has been saved in /home/user/.ssh/github.pub.
+Your identification has been saved in /home/frobnicator/.ssh/github.
+Your public key has been saved in /home/frobnicator/.ssh/github.pub.
 The key fingerprint is:
-92:92:6e:b8:3f:d5:76:e8:1b:73:ed:97:c4:e5:87:ba user@system
+92:92:6e:b8:3f:d5:76:e8:1b:73:ed:97:c4:e5:87:ba frobnicator@foobarbaz
 The key's randomart image is:
 +--[ RSA 2048]----+
 |                 |
@@ -54,8 +54,8 @@ suOAErDvInRDQbl2bjR0PGizL2t5lM9zE+mS0HHigteGLKma1NxVBBeam0CrodJN
 BcW55x3LR/2fLSujUqcloQNwLUpD5da6eGg9yPo1fEaAOK1ssHGA30o6nmDEZEHy
 PFgBtPwtDw5TPXPpzslaJx1u7CdeyzqpYsUycxzboy3GBcCsvG4nzD4C9vd0yk5o
 jlDeECul4mwyg7NuEjltaY89RzrSa8NtqtURyg/JFQW2IVGe+oBXeTL/eQRuo1Nj
-GhYyPm1VMVM+NvaYQZXxGfLpoDoP2V+deD+gP5DuC8WW4LSGnkHKhDEin0Yl mar
-t@valhalla
+GhYyPm1VMVM+NvaYQZXxGfLpoDoP2V+deD+gP5DuC8WW4LSGnkHKhDEin0Yl foo
+@foobarbaz
                \end{lstlisting}
        \end{block}
        \pause
@@ -76,6 +76,20 @@ d5DgKnWxgJPHnDjmwqTeX3A5S34m/qJKK67IF9WqedeHxeMKzMZYcZpcsFxdvHk/
        \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}
@@ -84,7 +98,7 @@ d5DgKnWxgJPHnDjmwqTeX3A5S34m/qJKK67IF9WqedeHxeMKzMZYcZpcsFxdvHk/
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -X user@server.nl}
+               \lstinline{ssh -X frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@ -103,8 +117,8 @@ d5DgKnWxgJPHnDjmwqTeX3A5S34m/qJKK67IF9WqedeHxeMKzMZYcZpcsFxdvHk/
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -L port:host:hostport}\\
-               \lstinline{ssh -R port:host:hostport}
+               \lstinline{ssh -L port:host:hostport frobnicator@foobarbaz.com}\\
+               \lstinline{ssh -R port:host:hostport frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@ -120,7 +134,7 @@ d5DgKnWxgJPHnDjmwqTeX3A5S34m/qJKK67IF9WqedeHxeMKzMZYcZpcsFxdvHk/
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -A user@system}
+               \lstinline{ssh -A frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@ -135,7 +149,7 @@ d5DgKnWxgJPHnDjmwqTeX3A5S34m/qJKK67IF9WqedeHxeMKzMZYcZpcsFxdvHk/
        \end{block}
        \pause
        \begin{block}{Command line vlag}
-               \lstinline{ssh -D port}
+               \lstinline{ssh -D port frobnicator@foobarbaz.com}
        \end{block}
        \pause
        \begin{block}{Config file}
@@ -152,3 +166,18 @@ d5DgKnWxgJPHnDjmwqTeX3A5S34m/qJKK67IF9WqedeHxeMKzMZYcZpcsFxdvHk/
        Edit - Preferences - Advanced - Network - Settings
        \includegraphics[width=200px]{./img/firefox_socks.png}
 \end{frame}
+
+\begin{frame}[fragile]
+       \frametitle{Compression}
+       \begin{block}{Nut}
+               Snelheid
+       \end{block}
+       \pause
+       \begin{block}{Command line vlag}
+               \lstinline{ssh -C frobnicator@foobarbaz.com}
+       \end{block}
+       \pause
+       \begin{block}{Config file}
+               \lstinline{Compression yes}
+       \end{block}
+\end{frame}