From a882c50e2acf9dabe8005498044c29650f9978a7 Mon Sep 17 00:00:00 2001
From: Thomas Constans <thomas@opendoor.fr>
Date: Thu, 23 May 2024 09:34:31 +0200
Subject: [PATCH] manual merge

---
 tasks/main.yml  | 6 +-----
 vars/Debian.yml | 3 ++-
 vars/RedHat.yml | 5 ++---
 vars/debian.yml | 4 ----
 vars/redhat.yml | 4 ----
 5 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 vars/debian.yml
 delete mode 100644 vars/redhat.yml

diff --git a/tasks/main.yml b/tasks/main.yml
index 6dd0d7c..ab9a036 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,8 @@
 ---
 # tasks file for apache_vhost
 
-<<<<<<< HEAD
-- include_vars: "{{ ansible_os_family|lower }}.yml"
+- include_vars: "{{ ansible_os_family}}.yml"
   tags: always
-=======
-- include_vars: "{{ ansible_os_family }}.yml"
->>>>>>> certbot
 
 - name: create dedicated user
   user:
diff --git a/vars/Debian.yml b/vars/Debian.yml
index e4e00a2..61214ba 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -3,5 +3,6 @@ apache_config_dir: /etc/apache2/sites-enabled/
 apache_packages:
 - apache2
 apache_ssl_packages: openssl
-apache_service: apache2
 apache_group: www-data
+apache_service_name: apache2
+apache_config_dir: /etc/apache2/sites-enabled/
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 93a7abb..57ed88f 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,8 +1,7 @@
-
-#/home/tom/Documents/Opendoor/Technique/Ansible/roles/tconstans.apache/vars/Debian.yml
+#/home/tom/Documents/Opendoor/Technique/Ansible/roles/tco.apache_vhost/vars/RedHat.yml
 apache_config_dir: /etc/httpd/conf.d/
 apache_packages:
 - httpd
-apache_service: httpd
+apache_service_name: httpd
 apache_ssl_packages: mod_ssl
 apache_group: apache
diff --git a/vars/debian.yml b/vars/debian.yml
deleted file mode 100644
index 1bd1399..0000000
--- a/vars/debian.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-apache_group: www-data
-apache_config_dir: /etc/apache2/sites-enabled/
-apache_service_name: apache2
diff --git a/vars/redhat.yml b/vars/redhat.yml
deleted file mode 100644
index c88594a..0000000
--- a/vars/redhat.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-apache_group: apache
-apache_config_dir: /etc/httpd/conf.d/
-apache_service_name: httpd