diff --git a/tomcat/config b/config
similarity index 100%
rename from tomcat/config
rename to config
diff --git a/tomcat/ppebase/exans.yml b/ppebase/exans.yml
similarity index 100%
rename from tomcat/ppebase/exans.yml
rename to ppebase/exans.yml
diff --git a/tomcat/ppebase/hosts b/ppebase/hosts
similarity index 100%
rename from tomcat/ppebase/hosts
rename to ppebase/hosts
diff --git a/tomcat/ppebase/invent.txt b/ppebase/invent.txt
similarity index 100%
rename from tomcat/ppebase/invent.txt
rename to ppebase/invent.txt
diff --git a/tomcat/ppebase/roles/bdd/tasks/mariadb.yml b/ppebase/roles/bdd/tasks/mariadb.yml
similarity index 100%
rename from tomcat/ppebase/roles/bdd/tasks/mariadb.yml
rename to ppebase/roles/bdd/tasks/mariadb.yml
diff --git a/tomcat/ppebase/roles/bdddump/tasks/createdump.yml b/ppebase/roles/bdddump/tasks/createdump.yml
similarity index 100%
rename from tomcat/ppebase/roles/bdddump/tasks/createdump.yml
rename to ppebase/roles/bdddump/tasks/createdump.yml
diff --git a/tomcat/ppebase/roles/tomcat/defaults/main.yml b/ppebase/roles/tomcat/defaults/main.yml
similarity index 51%
rename from tomcat/ppebase/roles/tomcat/defaults/main.yml
rename to ppebase/roles/tomcat/defaults/main.yml
index 4b7a55b..3ab700f 100644
--- a/tomcat/ppebase/roles/tomcat/defaults/main.yml
+++ b/ppebase/roles/tomcat/defaults/main.yml
@@ -1,2 +1,2 @@
 tomcat_archive_url: http://depl/store/apache-tomcat-10.0.13.tar.gz
-tomcat_archive_dest: /opt/tomcat/apache-tomcat-10.0.13.tar.gz
+tomcat_archive_dest: /usr/share/tomcat/
diff --git a/ppebase/roles/tomcat/defaults/main.yml.sv1 b/ppebase/roles/tomcat/defaults/main.yml.sv1
new file mode 100644
index 0000000..ecea063
--- /dev/null
+++ b/ppebase/roles/tomcat/defaults/main.yml.sv1
@@ -0,0 +1,2 @@
+tomcat_archive_url: http://depl/store/apache-tomcat-10.0.13.tar.gz
+tomcat_archive_dest: /usr/share/tomcat/apache-tomcat-10.0.13.tar.gz
diff --git a/ppebase/roles/tomcat/handlers/main.yml b/ppebase/roles/tomcat/handlers/main.yml
new file mode 100644
index 0000000..e69de29
diff --git a/ppebase/roles/tomcat/tasks/main.yml b/ppebase/roles/tomcat/tasks/main.yml
new file mode 100644
index 0000000..aa09550
--- /dev/null
+++ b/ppebase/roles/tomcat/tasks/main.yml
@@ -0,0 +1,74 @@
+  - name: Install basic packages
+    package:
+      name: ['vim','aptitude','bash-completion','tmux','tree','htop','wget','unzip','curl','git','python']
+      state: present
+      update_cache: yes
+
+  - name: installer JDK
+    apt:
+      name: openjdk-11-jdk
+      state: present
+
+  - name: creer le repertoire /opt/tomcat
+    file:
+      path: /usr/share/tomcat
+      state: directory
+      mode: 0755
+
+  - name: creer le groupe tomcat
+    group:
+      name: tomcat
+
+  - name: creer l'utilisateur tomcat
+    user:
+      name: tomcat
+      group: tomcat
+      home: /usr/share/tomcat
+      createhome: no
+
+  - name: installer TomCat
+    unarchive:
+      src: http://depl/store/apache-tomcat-10.0.13.tar.gz
+      dest: /usr/share/tomcat
+      remote_src: yes
+
+  - name: Change ownership
+    file:
+      path: /usr/share/tomcat
+      owner: tomcat
+      group: tomcat
+      mode: "u+rwx,g+rx,o=rx"
+      recurse: yes
+      state: directory
+
+  - name: Templating Tomcat service from local to remote
+    template:
+      src: tomcat.service.j2
+      dest: /etc/systemd/system/tomcat.service
+    when: ansible_service_mgr == "systemd"
+
+  - name: Demarrer tomcat
+    local_action: command sh /usr/share/tomcat/apache-tomcat-10.0.13/bin/startup.sh
+
+  - name: Definition des utilisateurs
+    template:
+      src: tomcat-users.xml.j2
+      dest: /usr/share/tomcat/apache-tomcat-10.0.13/conf/tomcat-users.xml
+
+  - name: Autorisation des différentes ips de connexions
+    template:
+      src: context.xml.j2
+      dest: "{{ item }}" 
+    with_items:
+      - /usr/share/tomcat/apache-tomcat-10.0.13/webapps/host-manager/META-INF/context.xml
+      - /usr/share/tomcat/apache-tomcat-10.0.13/webapps/manager/META-INF/context.xml
+
+  - name: Redemarrer le service tomcat (1)
+    local_action: command sh /usr/share/tomcat/apache-tomcat-10.0.13/bin/shutdown.sh
+
+  - name: Redemarrer le service tomcat (2)
+    local_action: command sh /usr/share/tomcat/apache-tomcat-10.0.13/bin/startup.sh
+
+  - name: Redemarrer le service tomcat (3)
+    local_action: command sh /usr/share/tomcat/apache-tomcat-10.0.13/bin/catalina.sh start
+
diff --git a/tomcat/ppebase/roles/tomcat/tasks/main.yml.sv1 b/ppebase/roles/tomcat/tasks/main.yml.sv1
similarity index 100%
rename from tomcat/ppebase/roles/tomcat/tasks/main.yml.sv1
rename to ppebase/roles/tomcat/tasks/main.yml.sv1
diff --git a/tomcat/ppebase/roles/tomcat/tasks/main.yml.sv2 b/ppebase/roles/tomcat/tasks/main.yml.sv2
similarity index 100%
rename from tomcat/ppebase/roles/tomcat/tasks/main.yml.sv2
rename to ppebase/roles/tomcat/tasks/main.yml.sv2
diff --git a/tomcat/ppebase/roles/tomcat/tasks/main.yml b/ppebase/roles/tomcat/tasks/main.yml.sv3
similarity index 81%
rename from tomcat/ppebase/roles/tomcat/tasks/main.yml
rename to ppebase/roles/tomcat/tasks/main.yml.sv3
index 5dba831..1fc6574 100644
--- a/tomcat/ppebase/roles/tomcat/tasks/main.yml
+++ b/ppebase/roles/tomcat/tasks/main.yml.sv3
@@ -43,9 +43,10 @@
 
   - name: Templating Tomcat service from local to remote
     template:
-      src: tomcat.service.j2
-      dest: /etc/systemd/system/
-      mode: 0755
+      src: templates/tomcat.service.j2
+      dest: /etc/systemd/system/tomcat.service
+    when: ansible_service_mgr == "systemd"
+
 
   - name: Demarrer le service tomcat
     local_action: command sh /opt/tomcat/apache-tomcat-10.0.13/bin/startup.sh
@@ -62,6 +63,12 @@
       src: context.xml.j2
       dest: context.xml 
 
+  - name: changement de la ligne dans context.xml
+    replace:
+      path: tomcat-users.xml
+      regexp: <user username="manager" password="root" roles="manager-gui" />
+      replace: <user username="tomcat" password="toor" roles="manager-gui" />
+
   - name: Redemarrer le service tomcat (1)
     local_action: command sh /opt/tomcat/apache-tomcat-10.0.13/bin/shutdown.sh
 
diff --git a/tomcat/ppebase/roles/tomcat/templates/context.xml.j2 b/ppebase/roles/tomcat/templates/context.xml.j2
similarity index 100%
rename from tomcat/ppebase/roles/tomcat/templates/context.xml.j2
rename to ppebase/roles/tomcat/templates/context.xml.j2
diff --git a/tomcat/ppebase/roles/tomcat/templates/tomcat-users.xml.j2 b/ppebase/roles/tomcat/templates/tomcat-users.xml.j2
similarity index 100%
rename from tomcat/ppebase/roles/tomcat/templates/tomcat-users.xml.j2
rename to ppebase/roles/tomcat/templates/tomcat-users.xml.j2
diff --git a/ppebase/roles/tomcat/templates/tomcat.service.j2 b/ppebase/roles/tomcat/templates/tomcat.service.j2
new file mode 100644
index 0000000..1c902f5
--- /dev/null
+++ b/ppebase/roles/tomcat/templates/tomcat.service.j2
@@ -0,0 +1,22 @@
+[Unit]
+Description=Tomcat
+After=syslog.target network.target
+
+[Service]
+Type=forking
+
+User=tomcat
+Group=tomcat
+
+Environment=JAVA_HOME={{ JAVA_HOME }}
+Environment='JAVA_OPTS=-Djava.awt.headless=true'
+
+Environment=CATALINA_HOME=/usr/share/tomcat/apache-tomcat-10.0.13
+Environment=CATALINA_BASE=/usr/share/tomcat/apache-tomcat-10.0.13
+Environment=CATALINA_PID=/usr/share/tomcat/apache-tomcat-10.0.13/temp/tomcat.pid
+
+ExecStart=catalina.sh start
+ExecStop=catalina.sh stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/tomcat/ppebase/roles/tomcat/vars/main.yml b/ppebase/roles/tomcat/vars/main.yml
similarity index 100%
rename from tomcat/ppebase/roles/tomcat/vars/main.yml
rename to ppebase/roles/tomcat/vars/main.yml
diff --git a/tomcat/ppebase/tomcat-setup.yml b/ppebase/tomcat-setup.yml
similarity index 100%
rename from tomcat/ppebase/tomcat-setup.yml
rename to ppebase/tomcat-setup.yml
diff --git a/tomcat/ppebase/context.xml b/tomcat/ppebase/context.xml
deleted file mode 100644
index 9265673..0000000
--- a/tomcat/ppebase/context.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<Context antiResourceLocking="false" privileged="true" >
-</Context>
diff --git a/tomcat/ppebase/roles/tomcat/handlers/main.yml b/tomcat/ppebase/roles/tomcat/handlers/main.yml
deleted file mode 100644
index 02c4fcb..0000000
--- a/tomcat/ppebase/roles/tomcat/handlers/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: restart tomcat
-  service:
-    name: tomcat
-    state: restarted
diff --git a/tomcat/ppebase/roles/tomcat/templates/tomcat.service.j2 b/tomcat/ppebase/roles/tomcat/templates/tomcat.service.j2
deleted file mode 100644
index 0ce7236..0000000
--- a/tomcat/ppebase/roles/tomcat/templates/tomcat.service.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Tomcat
-After=syslog.target network.target
-
-[Service]
-Type=forking
-
-User=tomcat
-Group=tomcat
-
-Environment=JAVA_HOME={{ JAVA_HOME }}
-Environment='JAVA_OPTS=-Djava.awt.headless=true'
-
-Environment=CATALINA_HOME=/usr/share/tomcat
-Environment=CATALINA_BASE=/usr/share/tomcat
-Environment=CATALINA_PID=/usr/share/tomcat/temp/tomcat.pid
-
-ExecStart=/opt/tomcat/bin/catalina.sh start
-ExecStop=/opt/tomcat/bin/catalina.sh stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/tomcat/ppebase/tomcat-users.xml b/tomcat/ppebase/tomcat-users.xml
deleted file mode 100644
index 37c05aa..0000000
--- a/tomcat/ppebase/tomcat-users.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<tomcat-users xmlns="http://tomcat.apache.org/xml"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
-              version="1.0">
-<!--
-  NOTE:  By default, no user is included in the "manager-gui" role required
-  to operate the "/manager/html" web application.  If you wish to use this app,
-  you must define such a user - the username and password are arbitrary. It is
-  strongly recommended that you do NOT use one of the users in the commented out
-  section below since they are intended for use with the examples web
-  application.
--->
-<!--
-  NOTE:  The sample user and role entries below are intended for use with the
-  examples web application. They are wrapped in a comment and thus are ignored
-  when reading this file. If you wish to configure these users for use with the
-  examples web application, do not forget to remove the <!.. ..> that surrounds
-  them. You will also need to set the passwords to something appropriate.
--->
-<!-- user manager can access only manager section -->
-<role rolename="manager-gui" />
-<user username="manager" password="root" roles="manager-gui" />
-
-<!-- user admin can access manager and admin section both -->
-<role rolename="admin-gui" />
-<user username="admin" password="root" roles="manager-gui,admin-gui" />
-</tomcat-users>