From f1b28cc2199b7c60d57a95d65a47c151e3b0c4a3 Mon Sep 17 00:00:00 2001
From: Olivier Navas <olivier.navas@libretic.fr>
Date: Mon, 27 Jun 2022 17:59:09 +0200
Subject: [PATCH] Externalisation de la configuration du vhost du reverse proxy

---
 defaults/main.yml                 |  1 -
 handlers/main.yml                 |  5 -----
 tasks/configure_reverse_proxy.yml | 11 -----------
 templates/0_vhost.conf            |  2 --
 templates/1_vhost_additional.conf |  1 -
 templates/2_mds_exclusion.conf    |  2 --
 6 files changed, 22 deletions(-)
 delete mode 100644 tasks/configure_reverse_proxy.yml
 delete mode 100644 templates/0_vhost.conf
 delete mode 100644 templates/1_vhost_additional.conf
 delete mode 100644 templates/2_mds_exclusion.conf

diff --git a/defaults/main.yml b/defaults/main.yml
index 240653f..e814620 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,3 @@
-docker_ldapmanager_rp_cert: LE
 docker_ldapmanager_username_format: "{first_name}.{last_name}"
 docker_ldapmanager_account_additional_objectclasses: "PostfixBookMailAccount,ownCloud"
 docker_ldapmanager_account_additional_attributes: "registeredAddress:Adresse de récupération,mailAlias:mail Alias,mailQuota:mail Quota,ownCloudQuota:nextCloud Quota"
diff --git a/handlers/main.yml b/handlers/main.yml
index cda39cf..f19fe51 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -3,8 +3,3 @@
     docker-compose up -d
   args:
     chdir: /opt/{{ docker_ldapmanager_service_id }}/
-
-- name: reverse-proxy-reload
-  service:
-    name: apache2
-    state: reloaded
diff --git a/tasks/configure_reverse_proxy.yml b/tasks/configure_reverse_proxy.yml
deleted file mode 100644
index 19635d9..0000000
--- a/tasks/configure_reverse_proxy.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- name: prepare reverse_proxy
-  template:
-    src: "{{ item }}"
-    dest: /etc/apache2/vhosts.d/{{ docker_ldapmanager_fqdn }}/
-  with_items:
-    - 0_vhost.conf
-    - 1_vhost_additional.conf
-    - 2_mds_exclusion.conf
-  notify: reverse-proxy-reload
-  
-
diff --git a/templates/0_vhost.conf b/templates/0_vhost.conf
deleted file mode 100644
index 63ff2a0..0000000
--- a/templates/0_vhost.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# {{ ansible_managed }}
-Use vhost_HTTPS_Generic {{ docker_ldapmanager_fqdn }} {{ docker_ldapmanager_rp_cert }} http {{ docker_ldapmanager_rp_docker_host }} info {{ docker_ldapmanager_rp_access_policy }} BlockCrawlerIndexing Off
diff --git a/templates/1_vhost_additional.conf b/templates/1_vhost_additional.conf
deleted file mode 100644
index e2bb153..0000000
--- a/templates/1_vhost_additional.conf
+++ /dev/null
@@ -1 +0,0 @@
-# {{ ansible_managed }}
diff --git a/templates/2_mds_exclusion.conf b/templates/2_mds_exclusion.conf
deleted file mode 100644
index ab0d77f..0000000
--- a/templates/2_mds_exclusion.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# {{ ansible_managed }}
-