From af2073b425a0c5eeccffff59ef6861a9fe14f7f4 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 25 May 2013 18:19:17 +0200 Subject: [PATCH] deplacement des communs en trop dans tc1 --- Makefile | 1 + .../commun/02-quatre_phases-pratique.tex | 17 -------- .../envole/00-introduction.tex | 12 ------ modules_EOLE_envole/scribe-horus.tex | 43 ++++++++----------- .../tronc-commun-1/commun/01-config-texte.tex | 19 ++++++++ .../commun/03-instance-reconfigure.tex | 0 .../commun/04-mise_a_jour.tex | 0 .../commun/05-diagnose-pratique.tex | 0 .../commun/05-diagnose.tex | 0 .../commun/06-conteneurs-pratique.tex | 0 .../commun/06-conteneurs.tex | 0 .../{ => tronc-commun-1}/commun/20-ead.tex | 0 .../commun/20-firewall.tex | 0 .../commun/21-schedule.tex | 0 .../commun/22-pratique.tex | 0 .../commun/23-onduleur-pratique.tex | 0 .../commun/23-onduleur.tex | 0 .../commun/24-trouver.tex | 0 18 files changed, 38 insertions(+), 54 deletions(-) delete mode 100644 modules_EOLE_envole/envole/00-introduction.tex create mode 100644 modules_EOLE_envole/tronc-commun-1/commun/01-config-texte.tex rename modules_EOLE_envole/{ => tronc-commun-1}/commun/03-instance-reconfigure.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/04-mise_a_jour.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/05-diagnose-pratique.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/05-diagnose.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/06-conteneurs-pratique.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/06-conteneurs.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/20-ead.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/20-firewall.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/21-schedule.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/22-pratique.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/23-onduleur-pratique.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/23-onduleur.tex (100%) rename modules_EOLE_envole/{ => tronc-commun-1}/commun/24-trouver.tex (100%) diff --git a/Makefile b/Makefile index 51dbb04..363a33c 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ all: $(OBJPDF) %.pdf: %.tex $(call latexbuild, $*, $< ) + $(call latexbuild, $*, $< ) clean: $(RM) *.aux diff --git a/modules_EOLE_envole/commun/02-quatre_phases-pratique.tex b/modules_EOLE_envole/commun/02-quatre_phases-pratique.tex index 23bd6bf..a3e9db9 100644 --- a/modules_EOLE_envole/commun/02-quatre_phases-pratique.tex +++ b/modules_EOLE_envole/commun/02-quatre_phases-pratique.tex @@ -18,23 +18,6 @@ \end{itemize} \end{frame} -\begin{frame} - \frametitle{Pratique : gen\_config en mode texte} - \begin{itemize} - \item taper gen\_config txt ; - \item avoir l'aide help ; - \item open .eol ; - \item choosegroup ; - \begin{itemize} - \item 0, - \item niveau de mise à jour : passer en "complete" ; - \end{itemize} - \item save ; - \item entrer le nom .eol ; - \item exit. - \end{itemize} -\end{frame} - \begin{frame} \frametitle{Pratique} \begin{itemize} diff --git a/modules_EOLE_envole/envole/00-introduction.tex b/modules_EOLE_envole/envole/00-introduction.tex deleted file mode 100644 index bb70196..0000000 --- a/modules_EOLE_envole/envole/00-introduction.tex +++ /dev/null @@ -1,12 +0,0 @@ -\section{Les services web} -\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} - diff --git a/modules_EOLE_envole/scribe-horus.tex b/modules_EOLE_envole/scribe-horus.tex index 09d8db2..394915b 100644 --- a/modules_EOLE_envole/scribe-horus.tex +++ b/modules_EOLE_envole/scribe-horus.tex @@ -111,30 +111,6 @@ \include{modules_EOLE_envole/scribe/00-virtualbox} \include{modules_EOLE_envole/commun/02-quatre_phases-pratique} -\section{Administration commune} -\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/commun/03-instance-reconfigure} -\include{modules_EOLE_envole/commun/04-mise_a_jour} -\include{modules_EOLE_envole/commun/05-diagnose} -\include{modules_EOLE_envole/commun/05-diagnose-pratique} -\include{modules_EOLE_envole/commun/06-conteneurs} -\include{modules_EOLE_envole/commun/06-conteneurs-pratique} -\include{modules_EOLE_envole/commun/20-firewall} -\include{modules_EOLE_envole/commun/21-schedule} -\include{modules_EOLE_envole/commun/22-pratique} -\include{modules_EOLE_envole/commun/23-onduleur} -\include{modules_EOLE_envole/commun/23-onduleur-pratique} -\include{modules_EOLE_envole/commun/24-trouver} - \section{Utilisateurs} \begin{frame}{Plan} \begin{columns}[t] @@ -167,11 +143,11 @@ \include{modules_EOLE_envole/scribe/13-profil} \include{modules_EOLE_envole/scribe/14-esu} \include{modules_EOLE_envole/scribe/15-script-scribe} +\include{modules_EOLE_envole/horus/02-machine} \include{modules_EOLE_envole/scribe/16-imprimante} \include{modules_EOLE_envole/scribe/17-corbeille} \include{modules_EOLE_envole/scribe/18-virus} \include{modules_EOLE_envole/scribe/19-ftp} -\include{modules_EOLE_envole/horus/02-machine} \section{Sauvegarde} \begin{frame}{Plan} @@ -212,6 +188,23 @@ \end{frame} \include{modules_EOLE_envole/horus/03-administratifs} +\section{Les services web} +\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/envole/01-ajout} +\include{modules_EOLE_envole/envole/02-applications} +\include{modules_EOLE_envole/envole/02-posh} + + + \subject{Talks} \begin{frame} \frametitle{Licence} diff --git a/modules_EOLE_envole/tronc-commun-1/commun/01-config-texte.tex b/modules_EOLE_envole/tronc-commun-1/commun/01-config-texte.tex new file mode 100644 index 0000000..c09d8ff --- /dev/null +++ b/modules_EOLE_envole/tronc-commun-1/commun/01-config-texte.tex @@ -0,0 +1,19 @@ + +\begin{frame} + \frametitle{Pratique : gen\_config en mode texte} + \begin{itemize} + \item taper gen\_config txt ; + \item avoir l'aide help ; + \item open .eol ; + \item choosegroup ; + \begin{itemize} + \item 0, + \item niveau de mise à jour : passer en "complete" ; + \end{itemize} + \item save ; + \item entrer le nom .eol ; + \item exit. + \end{itemize} +\end{frame} + + diff --git a/modules_EOLE_envole/commun/03-instance-reconfigure.tex b/modules_EOLE_envole/tronc-commun-1/commun/03-instance-reconfigure.tex similarity index 100% rename from modules_EOLE_envole/commun/03-instance-reconfigure.tex rename to modules_EOLE_envole/tronc-commun-1/commun/03-instance-reconfigure.tex diff --git a/modules_EOLE_envole/commun/04-mise_a_jour.tex b/modules_EOLE_envole/tronc-commun-1/commun/04-mise_a_jour.tex similarity index 100% rename from modules_EOLE_envole/commun/04-mise_a_jour.tex rename to modules_EOLE_envole/tronc-commun-1/commun/04-mise_a_jour.tex diff --git a/modules_EOLE_envole/commun/05-diagnose-pratique.tex b/modules_EOLE_envole/tronc-commun-1/commun/05-diagnose-pratique.tex similarity index 100% rename from modules_EOLE_envole/commun/05-diagnose-pratique.tex rename to modules_EOLE_envole/tronc-commun-1/commun/05-diagnose-pratique.tex diff --git a/modules_EOLE_envole/commun/05-diagnose.tex b/modules_EOLE_envole/tronc-commun-1/commun/05-diagnose.tex similarity index 100% rename from modules_EOLE_envole/commun/05-diagnose.tex rename to modules_EOLE_envole/tronc-commun-1/commun/05-diagnose.tex diff --git a/modules_EOLE_envole/commun/06-conteneurs-pratique.tex b/modules_EOLE_envole/tronc-commun-1/commun/06-conteneurs-pratique.tex similarity index 100% rename from modules_EOLE_envole/commun/06-conteneurs-pratique.tex rename to modules_EOLE_envole/tronc-commun-1/commun/06-conteneurs-pratique.tex diff --git a/modules_EOLE_envole/commun/06-conteneurs.tex b/modules_EOLE_envole/tronc-commun-1/commun/06-conteneurs.tex similarity index 100% rename from modules_EOLE_envole/commun/06-conteneurs.tex rename to modules_EOLE_envole/tronc-commun-1/commun/06-conteneurs.tex diff --git a/modules_EOLE_envole/commun/20-ead.tex b/modules_EOLE_envole/tronc-commun-1/commun/20-ead.tex similarity index 100% rename from modules_EOLE_envole/commun/20-ead.tex rename to modules_EOLE_envole/tronc-commun-1/commun/20-ead.tex diff --git a/modules_EOLE_envole/commun/20-firewall.tex b/modules_EOLE_envole/tronc-commun-1/commun/20-firewall.tex similarity index 100% rename from modules_EOLE_envole/commun/20-firewall.tex rename to modules_EOLE_envole/tronc-commun-1/commun/20-firewall.tex diff --git a/modules_EOLE_envole/commun/21-schedule.tex b/modules_EOLE_envole/tronc-commun-1/commun/21-schedule.tex similarity index 100% rename from modules_EOLE_envole/commun/21-schedule.tex rename to modules_EOLE_envole/tronc-commun-1/commun/21-schedule.tex diff --git a/modules_EOLE_envole/commun/22-pratique.tex b/modules_EOLE_envole/tronc-commun-1/commun/22-pratique.tex similarity index 100% rename from modules_EOLE_envole/commun/22-pratique.tex rename to modules_EOLE_envole/tronc-commun-1/commun/22-pratique.tex diff --git a/modules_EOLE_envole/commun/23-onduleur-pratique.tex b/modules_EOLE_envole/tronc-commun-1/commun/23-onduleur-pratique.tex similarity index 100% rename from modules_EOLE_envole/commun/23-onduleur-pratique.tex rename to modules_EOLE_envole/tronc-commun-1/commun/23-onduleur-pratique.tex diff --git a/modules_EOLE_envole/commun/23-onduleur.tex b/modules_EOLE_envole/tronc-commun-1/commun/23-onduleur.tex similarity index 100% rename from modules_EOLE_envole/commun/23-onduleur.tex rename to modules_EOLE_envole/tronc-commun-1/commun/23-onduleur.tex diff --git a/modules_EOLE_envole/commun/24-trouver.tex b/modules_EOLE_envole/tronc-commun-1/commun/24-trouver.tex similarity index 100% rename from modules_EOLE_envole/commun/24-trouver.tex rename to modules_EOLE_envole/tronc-commun-1/commun/24-trouver.tex