From 0405240b5b1a232c53e9703ba209c7c0ab2b655a Mon Sep 17 00:00:00 2001
From: Bertrand Janvoie <janvoiebertrand@gmail.com>
Date: Mon, 19 Sep 2022 14:49:44 +0200
Subject: [PATCH] merge Road-to-devops with Pepiniere

---
 Pepinière/ansible                                   |  1 +
 Pepinière/devops                                    |  1 +
 Pepinière/git-level1                                |  1 +
 Pepinière/gitlab-presentation                       |  1 +
 README.md                                            | 12 +++++++++---
 .../1-vagrant-srv}/Vagrantfile                       |  0
 .../1-vagrant-srv}/install_p1jenkins.sh              |  0
 Road-to-DevOps/README.md                             |  5 +++++
 8 files changed, 18 insertions(+), 3 deletions(-)
 create mode 160000 Pepinière/ansible
 create mode 160000 Pepinière/devops
 create mode 160000 Pepinière/git-level1
 create mode 160000 Pepinière/gitlab-presentation
 rename {1-vagrant-srv => Road-to-DevOps/1-vagrant-srv}/Vagrantfile (100%)
 rename {1-vagrant-srv => Road-to-DevOps/1-vagrant-srv}/install_p1jenkins.sh (100%)
 create mode 100644 Road-to-DevOps/README.md

diff --git a/Pepinière/ansible b/Pepinière/ansible
new file mode 160000
index 0000000..4bc85ec
--- /dev/null
+++ b/Pepinière/ansible
@@ -0,0 +1 @@
+Subproject commit 4bc85ecf0966d6a013c489eaefd24d876b154c01
diff --git a/Pepinière/devops b/Pepinière/devops
new file mode 160000
index 0000000..6b95292
--- /dev/null
+++ b/Pepinière/devops
@@ -0,0 +1 @@
+Subproject commit 6b95292e83342fb9d1f87756d10f59ca36ad0694
diff --git a/Pepinière/git-level1 b/Pepinière/git-level1
new file mode 160000
index 0000000..6314ee4
--- /dev/null
+++ b/Pepinière/git-level1
@@ -0,0 +1 @@
+Subproject commit 6314ee4b55c741493340279206c6c43834be1cd3
diff --git a/Pepinière/gitlab-presentation b/Pepinière/gitlab-presentation
new file mode 160000
index 0000000..a10cf58
--- /dev/null
+++ b/Pepinière/gitlab-presentation
@@ -0,0 +1 @@
+Subproject commit a10cf5840c45b202c946de86edef6d2e7208bef4
diff --git a/README.md b/README.md
index 3b8d518..4f94efc 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,11 @@
-# ROAD TO DEVOPS
+# FORMATION
 
-Repo centralisant les fichiers nécessaires au déroulement de l'article "RoadtoDevOps"
+## How to open each presentation?
+
+(Docker needs to be installed):
+' docker run --rm -p 127.0.0.1:8080:80 --name http -v $(pwd):/usr/local/apache2/htdocs:ro httpd '
+
+## Display the presentation:
+
+In your browser points to 'http://localhost:8080'
 
-https://blog.noobtoroot.xyz/road-to-devops/
\ No newline at end of file
diff --git a/1-vagrant-srv/Vagrantfile b/Road-to-DevOps/1-vagrant-srv/Vagrantfile
similarity index 100%
rename from 1-vagrant-srv/Vagrantfile
rename to Road-to-DevOps/1-vagrant-srv/Vagrantfile
diff --git a/1-vagrant-srv/install_p1jenkins.sh b/Road-to-DevOps/1-vagrant-srv/install_p1jenkins.sh
similarity index 100%
rename from 1-vagrant-srv/install_p1jenkins.sh
rename to Road-to-DevOps/1-vagrant-srv/install_p1jenkins.sh
diff --git a/Road-to-DevOps/README.md b/Road-to-DevOps/README.md
new file mode 100644
index 0000000..3b8d518
--- /dev/null
+++ b/Road-to-DevOps/README.md
@@ -0,0 +1,5 @@
+# ROAD TO DEVOPS
+
+Repo centralisant les fichiers nécessaires au déroulement de l'article "RoadtoDevOps"
+
+https://blog.noobtoroot.xyz/road-to-devops/
\ No newline at end of file