diff --git a/README.md b/README.md index 568c473..4eb5856 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,7 @@ ## Services fournis -- main.yml : Installation d'une instance matomo sur un serveur docker_host -- configure_reverse_proxy.yml : Configuration d'un reverse proxy préalablement installé par le role reverse_proxy +Installation d'une instance matomo sur un serveur docker_host ## Variables @@ -19,11 +18,6 @@ docker_matomo_image_version: x.y.z docker_matomo_db_name: matomodb docker_matomo_db_user: user_proprietaire_bdd docker_matomo_db_password: mdp_proprietaire_bdd -docker_matomo_rp_cert: LE -docker_matomo_rp_docker_host: machine.domaine.local -docker_matomo_rp_access_policy: OpenAccessPolicy -docker_matomo_rp_indexing: BlockCrawlerIndexing -docker_matomo_rp_waf: "On" ``` | Option | Valeur par défaut | Description | @@ -35,11 +29,6 @@ docker_matomo_rp_waf: "On" | docker_matomo_db_name | | Nom de la base de données | | docker_matomo_db_user | | Nom du proprietaire_de la base | | docker_matomo_db_password | | MDP du proprietaire_de la base | -| docker_matomo_rp_docker_host | | pour configure_reverse_proxy.yml: fqdn de la machine contenant le conteneur docker | -| docker_matomo_rp_cert | LE | Type de certificat pour le reverse proxy (LE = letsencrypt) | -| docker_matomo_rp_access_policy | | Modèle d'autorisation d'accès du reverse proxy | -| docker_matomo_rp_indexing | | Stratégie du reverse proxy vis à vis des robots | -| docker_matomo_rp_waf | | Activation websecurity du reverse proxy | diff --git a/defaults/main.yml b/defaults/main.yml index 159e5dc..8b13789 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1 +1 @@ -docker_matomo_rp_cert: LE + diff --git a/handlers/main.yml b/handlers/main.yml index 85f391f..4de3eeb 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,8 +3,3 @@ docker-compose up -d args: chdir: /opt/{{ docker_matomo_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 0d87056..0000000 --- a/tasks/configure_reverse_proxy.yml +++ /dev/null @@ -1,13 +0,0 @@ -- name: prepare reverse_proxy - template: - src: "{{ item }}" - dest: /etc/apache2/vhosts.d/{{ docker_matomo_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 12e5ecd..0000000 --- a/templates/0_vhost.conf +++ /dev/null @@ -1,2 +0,0 @@ -# {{ ansible_managed }} -Use vhost_HTTPS_Generic {{ docker_matomo_fqdn }} {{ docker_matomo_rp_cert }} http {{ docker_matomo_rp_docker_host }} info {{ docker_matomo_rp_access_policy }} {{ docker_matomo_rp_indexing }} {{ docker_matomo_rp_waf }} 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 }} -