manual merge

2024-05-23 09:34:31 +02:00
parent 180aa7c404
commit a882c50e2a
5 changed files with 5 additions and 17 deletions
--- 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/
--- 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
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -1,4 +0,0 @@
---
-apache_group: www-data
-apache_config_dir: /etc/apache2/sites-enabled/
-apache_service_name: apache2
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -1,4 +0,0 @@
---
-apache_group: apache
-apache_config_dir: /etc/httpd/conf.d/
-apache_service_name: httpd