diff --git a/beamer-skel/img/logo-cadoles-01.png b/beamer-skel/img/logo-cadoles-01.png index d894b3f..de8ddc0 100644 Binary files a/beamer-skel/img/logo-cadoles-01.png and b/beamer-skel/img/logo-cadoles-01.png differ diff --git a/modules_EOLE_envole/commun/01-nouveaute24.tex b/modules_EOLE_envole/commun/01-nouveaute24.tex index a066f10..17beef9 100644 --- a/modules_EOLE_envole/commun/01-nouveaute24.tex +++ b/modules_EOLE_envole/commun/01-nouveaute24.tex @@ -2,7 +2,7 @@ \frametitle{Nouveautés 2.4} \begin{itemize} \item Basé sur la distribution Precise Pangolin (12.04) ; - \item support jusqu'en 2017 ; + \item support jusqu'en \textbf{2017} ; \item réorganisation reconfigure/instance ; \item nouveau cœur : tiramisu ; \item plus d'informations dans les dictionnaires ; @@ -11,6 +11,12 @@ \item géré dans les dictionnaires ; \item filtrage des flux entrants uniquement ; \end{itemize} + \end{itemize} +\end{frame} + +\begin{frame} + \frametitle{Nouveautés 2.4} + \begin{itemize} \item gen\_config : \begin{itemize} \item interface web ; diff --git a/modules_EOLE_envole/commun/01-nouveaute26.tex b/modules_EOLE_envole/commun/01-nouveaute26.tex index e69de29..8dc54f1 100644 --- a/modules_EOLE_envole/commun/01-nouveaute26.tex +++ b/modules_EOLE_envole/commun/01-nouveaute26.tex @@ -0,0 +1,22 @@ +\begin{frame} + \frametitle{Nouveautés 2.6} + \begin{itemize} + \item Basé sur la distribution Xenial Xerus (16.04) ; + \item support jusqu'en 2021 ; + \item peu de changement dans le coeur ; + \end{itemize} +\end{frame} + +\begin{frame} + \frametitle{Modules disponibles en 2.6.0} + \begin{itemize} + \item Eclair + \item Hapy \& Hapy Node + \item Horus + \item Scribe + \item Seth + \item Shpynx + \item Zéphir + \end{itemize} +\end{frame} + diff --git a/modules_EOLE_envole/tronc-commun-1.tex b/modules_EOLE_envole/tronc-commun-1.tex index a94c629..043951a 100644 --- a/modules_EOLE_envole/tronc-commun-1.tex +++ b/modules_EOLE_envole/tronc-commun-1.tex @@ -24,16 +24,17 @@ pdfkeywords={distribution, GNU, linux, eole, éducation, nationale, ubuntu}, pdfauthor={Emmanuel Garette}, pdflang={fr-FR}, - pdfcopyright={Copyright © 2011-2016 Cadoles}, % Nécessite XeTeX + pdfcopyright={Copyright © 2011-2016 Cadoles}, pdflicenseurl={http://creativecommons.org/licenses/by-nc-sa/2.0/fr/}, } %\usecolortheme{crane} \definecolor{UniBlue}{RGB}{83,121,180} +\definecolor{CadolesBlue}{RGB}{7,142,181} \definecolor{CleanWhite}{RGB}{255,255,255} \definecolor{DirtyWhite}{RGB}{105,105,105} -\setbeamercolor{title}{fg=UniBlue} -\setbeamercolor{frametitle}{fg=CleanWhite} -\setbeamercolor{structure}{fg=UniBlue} +\setbeamercolor{title}{fg=CadolesBlue} +\setbeamercolor{frametitle}{fg=CadolesBlue} +\setbeamercolor{structure}{fg=CadolesBlue} \newcommand{\eolesmall}{ \begin{minipage}[c]{0.10\textwidth} \includegraphics[width=1cm]{beamer-skel/img/logo-eole.png} @@ -44,12 +45,12 @@ %\setmonofont[Scale=0.86]{Andale Mono} %\usepackage{colortab} \newcommand{\commande}[1]{\texttt{#1}} -\setbeamertemplate{background}{\includegraphics[width=128mm]{beamer-skel/img/banner01.png}} +\setbeamertemplate{background}{\includegraphics[width=128mm]{beamer-skel/img/banner02.png}} -\title[]{Formation tronc commun 1} -\subtitle{XXX CLIENT XXX} +\title[]{Formation EOLE} +\subtitle{Tronc commun niveau 1} -\author[Equipe Auteur]{XXX AUTEUR XXX} +\author[Equipe Auteur]{Cadoles Formation} \institute[Cadoles]{\includegraphics[width=2cm]{beamer-skel/img/logo-cadoles-01.png}} @@ -66,11 +67,11 @@ } \logo{ - % \includegraphics[width=1cm]{beamer-skel/img/logo-ecologie.png}~ - \hspace{120pt} + %\includegraphics[width=1cm]{beamer-skel/img/logo_en.png}~ + %\hspace{120pt} \includegraphics[width=2cm]{beamer-skel/img/logo-cadoles-01.png}~ - \hspace{113pt} - \includegraphics[width=1cm]{beamer-skel/img/logo_en.jpg}~ + %\hspace{113pt} + %\includegraphics[width=1cm]{beamer-skel/img/logo_en.png}~ } \begin{document} @@ -90,10 +91,29 @@ \end{column} \end{columns} \end{frame} + +\section{GNU/Linux} +\begin{frame}{Plan} + \begin{columns}[t] + \begin{column}{5cm} + \tableofcontents[sections={1-6},currentsection, hideothersubsections] + \end{column} + \begin{column}{5cm} + \tableofcontents[sections={7-12},currentsection,hideothersubsections] + \end{column} + \end{columns} +\end{frame} +\include{modules_EOLE_envole/tronc-commun-1/20-gnu_linux} +\include{modules_EOLE_envole/tronc-commun-1/20-tcpdump-tshark} +\include{modules_EOLE_envole/tronc-commun-1/21-lire-ecrire} +\include{modules_EOLE_envole/tronc-commun-1/22-commande-distance} + \include{modules_EOLE_envole/commun/00-intro} %\include{modules_EOLE_envole/commun/01-nouveaute23} \include{modules_EOLE_envole/commun/01-nouveaute24} \include{modules_EOLE_envole/commun/01-nouveaute25} +\include{modules_EOLE_envole/commun/01-nouveaute26} + \section{Panorama des modules} \begin{frame}{Plan} \begin{columns}[t] @@ -180,21 +200,6 @@ \end{frame} \include{modules_EOLE_envole/tronc-commun-1/10-application-zephir} -\section{GNU/Linux} -\begin{frame}{Plan} - \begin{columns}[t] - \begin{column}{5cm} - \tableofcontents[sections={1-6},currentsection, hideothersubsections] - \end{column} - \begin{column}{5cm} - \tableofcontents[sections={7-12},currentsection,hideothersubsections] - \end{column} - \end{columns} -\end{frame} -\include{modules_EOLE_envole/tronc-commun-1/20-gnu_linux} -\include{modules_EOLE_envole/tronc-commun-1/20-tcpdump-tshark} -\include{modules_EOLE_envole/tronc-commun-1/21-lire-ecrire} -\include{modules_EOLE_envole/tronc-commun-1/22-commande-distance} \section{Application Zéphir 2} \begin{frame}{Plan} @@ -210,7 +215,7 @@ \include{modules_EOLE_envole/tronc-commun-1/11-application-zephir2} %FIXME a revoir ! -\include{modules_EOLE_envole/tronc-commun-1/99-migration-zephir} +%\include{modules_EOLE_envole/tronc-commun-1/99-migration-zephir} \subject{Talks} \begin{frame} diff --git a/modules_EOLE_envole/tronc-commun-2.tex b/modules_EOLE_envole/tronc-commun-2.tex index 15ca543..859c1e6 100644 --- a/modules_EOLE_envole/tronc-commun-2.tex +++ b/modules_EOLE_envole/tronc-commun-2.tex @@ -32,7 +32,7 @@ \definecolor{CleanWhite}{RGB}{255,255,255} \definecolor{DirtyWhite}{RGB}{105,105,105} \setbeamercolor{title}{fg=UniBlue} -\setbeamercolor{frametitle}{fg=CleanWhite} +\setbeamercolor{frametitle}{fg=UniBlue} \setbeamercolor{structure}{fg=UniBlue} \newcommand{\eolesmall}{ \begin{minipage}[c]{0.10\textwidth} @@ -44,12 +44,12 @@ %\setmonofont[Scale=0.86]{Andale Mono} %\usepackage{colortab} \newcommand{\commande}[1]{\texttt{#1}} -\setbeamertemplate{background}{\includegraphics[width=128mm]{beamer-skel/img/banner01.png}} +\setbeamertemplate{background}{\includegraphics[width=128mm]{beamer-skel/img/banner02.png}} -\title[]{Formation tronc commun 2} -\subtitle{XXX CLIENT XXX} +\title[]{Formation EOLE} +\subtitle{Tronc Commun 2} -\author[Equipe Auteur]{XXX AUTEUR XXX} +\author[Equipe Auteur]{Cadoles Formations} \institute[Cadoles]{\includegraphics[width=2cm]{beamer-skel/img/logo-cadoles-01.png}} @@ -70,7 +70,7 @@ \hspace{120pt} \includegraphics[width=2cm]{beamer-skel/img/logo-cadoles-01.png}~ \hspace{113pt} - \includegraphics[width=1cm]{beamer-skel/img/logo_en.jpg}~ + %\includegraphics[width=1cm]{beamer-skel/img/logo_en.jpg}~ } \begin{document} @@ -107,58 +107,58 @@ \include{modules_EOLE_envole/tronc-commun-2/02-zephir} \include{modules_EOLE_envole/tronc-commun-2/03-zephir_script} -%\section{API Python} -%\begin{frame}{Plan} -% \begin{columns}[t] -% \begin{column}{5cm} -% \tableofcontents[sections={1-6},currentsection, hideothersubsections] -% \end{column} -% \begin{column}{5cm} -% \tableofcontents[sections={7-12},currentsection,hideothersubsections] -% \end{column} -% \end{columns} -%\end{frame} -%\include{modules_EOLE_envole/tronc-commun-2/20-api} +\section{API Python} +\begin{frame}{Plan} + \begin{columns}[t] + \begin{column}{5cm} + \tableofcontents[sections={1-6},currentsection, hideothersubsections] + \end{column} + \begin{column}{5cm} + \tableofcontents[sections={7-12},currentsection,hideothersubsections] + \end{column} + \end{columns} +\end{frame} +\include{modules_EOLE_envole/tronc-commun-2/20-api} % -%\section{API Bash} -%\begin{frame}{Plan} -% \begin{columns}[t] -% \begin{column}{5cm} -% \tableofcontents[sections={1-6},currentsection, hideothersubsections] -% \end{column} -% \begin{column}{5cm} -% \tableofcontents[sections={7-12},currentsection,hideothersubsections] -% \end{column} -% \end{columns} -%\end{frame} -%\include{modules_EOLE_envole/tronc-commun-2/30-api_bash} +\section{API Bash} +\begin{frame}{Plan} + \begin{columns}[t] + \begin{column}{5cm} + \tableofcontents[sections={1-6},currentsection, hideothersubsections] + \end{column} + \begin{column}{5cm} + \tableofcontents[sections={7-12},currentsection,hideothersubsections] + \end{column} + \end{columns} +\end{frame} +\include{modules_EOLE_envole/tronc-commun-2/30-api_bash} % -%\section{Personnalisation avancée} -%\begin{frame}{Plan} -% \begin{columns}[t] -% \begin{column}{5cm} -% \tableofcontents[sections={1-6},currentsection, hideothersubsections] -% \end{column} -% \begin{column}{5cm} -% \tableofcontents[sections={7-12},currentsection,hideothersubsections] -% \end{column} -% \end{columns} -%\end{frame} -%\include{modules_EOLE_envole/tronc-commun-2/04-diagnose} -%\include{modules_EOLE_envole/tronc-commun-2/05-script-instance-reconfigure} -%\include{modules_EOLE_envole/tronc-commun-2/05-script-instance-reconfigure-pratique} -%\include{modules_EOLE_envole/tronc-commun-2/06-montage-conteneur} -%\include{modules_EOLE_envole/tronc-commun-2/07-eole-firewall} -%\include{modules_EOLE_envole/tronc-commun-2/08-schedule} -%\include{modules_EOLE_envole/tronc-commun-2/09-host} -%\include{modules_EOLE_envole/tronc-commun-2/11-mysql} -%\include{modules_EOLE_envole/tronc-commun-2/12-interface} -%\include{modules_EOLE_envole/tronc-commun-2/13-disknod} -%\include{modules_EOLE_envole/tronc-commun-2/14-sso} -%\include{modules_EOLE_envole/tronc-commun-2/15-script-ead} -%\include{modules_EOLE_envole/tronc-commun-2/16-sauvegarde} -%\include{modules_EOLE_envole/tronc-commun-2/17-conteneur_groupe_conteneur} -%\include{modules_EOLE_envole/tronc-commun-2/18-cert} +\section{Personnalisation avancée} +\begin{frame}{Plan} + \begin{columns}[t] + \begin{column}{5cm} + \tableofcontents[sections={1-6},currentsection, hideothersubsections] + \end{column} + \begin{column}{5cm} + \tableofcontents[sections={7-12},currentsection,hideothersubsections] + \end{column} + \end{columns} +\end{frame} +\include{modules_EOLE_envole/tronc-commun-2/04-diagnose} +\include{modules_EOLE_envole/tronc-commun-2/05-script-instance-reconfigure} +\include{modules_EOLE_envole/tronc-commun-2/05-script-instance-reconfigure-pratique} +\include{modules_EOLE_envole/tronc-commun-2/06-montage-conteneur} +\include{modules_EOLE_envole/tronc-commun-2/07-eole-firewall} +\include{modules_EOLE_envole/tronc-commun-2/08-schedule} +\include{modules_EOLE_envole/tronc-commun-2/09-host} +\include{modules_EOLE_envole/tronc-commun-2/11-mysql} +\include{modules_EOLE_envole/tronc-commun-2/12-interface} +\include{modules_EOLE_envole/tronc-commun-2/13-disknod} +\include{modules_EOLE_envole/tronc-commun-2/14-sso} +\include{modules_EOLE_envole/tronc-commun-2/15-script-ead} +\include{modules_EOLE_envole/tronc-commun-2/16-sauvegarde} +\include{modules_EOLE_envole/tronc-commun-2/17-conteneur_groupe_conteneur} +\include{modules_EOLE_envole/tronc-commun-2/18-cert} \subject{Talks} \begin{frame}