manual merge

tasks/main.yml

@@ -1,12 +1,8 @@
 ---
 # tasks file for apache_vhost
 
-<<<<<<< HEAD
+- include_vars: "{{ ansible_os_family}}.yml"
-- include_vars: "{{ ansible_os_family|lower }}.yml"
   tags: always
-=======
-- include_vars: "{{ ansible_os_family }}.yml"
->>>>>>> certbot
 
 - name: create dedicated user
   user:

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/

vars/RedHat.yml

@@ -1,8 +1,7 @@
-
+#/home/tom/Documents/Opendoor/Technique/Ansible/roles/tco.apache_vhost/vars/RedHat.yml
-#/home/tom/Documents/Opendoor/Technique/Ansible/roles/tconstans.apache/vars/Debian.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

vars/debian.yml

@@ -1,4 +0,0 @@
----
-apache_group: www-data
-apache_config_dir: /etc/apache2/sites-enabled/
-apache_service_name: apache2

vars/redhat.yml

@@ -1,4 +0,0 @@
----
-apache_group: apache
-apache_config_dir: /etc/httpd/conf.d/
-apache_service_name: httpd