From f3af7a46d70908af2f0abfacc154165cb7a13f70 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Mon, 29 Apr 2024 05:16:30 +0200
Subject: [PATCH] cleaning and testing ok

---
 clean.sh      |  5 +++++
 inventory.ini |  4 +---
 playbook.yml  | 60 ++++++++++++++++-----------------------------------
 3 files changed, 24 insertions(+), 45 deletions(-)
 create mode 100644 clean.sh

diff --git a/clean.sh b/clean.sh
new file mode 100644
index 0000000..49429a4
--- /dev/null
+++ b/clean.sh
@@ -0,0 +1,5 @@
+docker-compose -f ./docker-compose.yml down
+docker rm $(docker ps -qa)
+# docker rmi -f $(docker images -qa)
+docker volume rm $(docker volume ls -q)
+docker network rm $(docker network ls -q)
\ No newline at end of file
diff --git a/inventory.ini b/inventory.ini
index 3818375..554bc1e 100644
--- a/inventory.ini
+++ b/inventory.ini
@@ -1,4 +1,2 @@
 [myhosts]
-37.114.41.144 ansible_ssh_user=root
-; 192.168.1.119:2222 ansible_ssh_user=server_user
-; 192.168.1.119:2223 ansible_ssh_user=server_user
\ No newline at end of file
+37.114.41.144 ansible_ssh_user=root
\ No newline at end of file
diff --git a/playbook.yml b/playbook.yml
index 420d6d8..a75f08d 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -1,8 +1,6 @@
 # ---
 - name: Deploy WordPress
   hosts: myhosts
-  # remote_user: root  # Change remote user to your sudo user!
-  # become: true
   vars:
     arch_mapping:  # Map ansible architecture {{ ansible_architecture }} names to Docker's architecture names
       x86_64: amd64
@@ -10,6 +8,22 @@
 
   tasks:
 
+    - name: Update and upgrade all packages to the latest version
+      ansible.builtin.apt:
+        update_cache: true
+        upgrade: dist
+        cache_valid_time: 3600
+
+    - name: Install required packages
+      ansible.builtin.apt:
+        pkg:
+          - rsync
+          - python3-pip
+          - apt-transport-https
+          - ca-certificates
+          - curl
+          - gnupg
+
     - name: Create src directory if it does not exist
       ansible.builtin.file:
         path: ./src
@@ -21,21 +35,6 @@
         src: ./  # Specify the source folder on the control node
         dest: src/  # Specify the destination folder on the target node
 
-    - name: Update and upgrade all packages to the latest version
-      ansible.builtin.apt:
-        update_cache: true
-        upgrade: dist
-        cache_valid_time: 3600
-
-    - name: Install required packages
-      ansible.builtin.apt:
-        pkg:
-          - python3-pip
-          - apt-transport-https
-          - ca-certificates
-          - curl
-          - gnupg
-          # - software-properties-commo
     - name: Create directory for Docker's GPG key
       ansible.builtin.file:
         path: /etc/apt/keyrings
@@ -60,10 +59,6 @@
           https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable
         filename: docker
         state: present
-    # - name: Add Docker repository
-    #   apt_repository:
-    #     repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_lsb.codename }} stable
-    #     state: present
 
     - name: Install Docker and related packages
       ansible.builtin.apt:
@@ -93,10 +88,6 @@
         pkg:
           - python3-docker
 
-    # - name: Install Docker Module for Python
-    #   ansible.builtin.shell:
-    #     cmd: pip3 install docker
-
     - name: Enable and start Docker services
       ansible.builtin.systemd:
         name: "{{ item }}"
@@ -115,20 +106,5 @@
 
     - name: Launch Docker Compose project
       ansible.builtin.shell:
-          cmd: docker-compose up
-          chdir: src/
-
-    # - name: Copy Docker Compose file
-    #   copy:
-    #     src: ./
-    #     dest: src/
-
-    # - name: Launch Docker Compose project
-    #   ansible.builtin.shell:
-    #       cmd: docker-compose up
-    #       chdir: src/
-
-    # - name: Launch Docker Compose project
-    #   docker_compose:
-    #     project_src: src/
-    #     state: present
\ No newline at end of file
+          cmd: docker-compose up -d
+          chdir: src/
\ No newline at end of file