From 182feeca58e6bc089d1bcc6fd6e34c1581dbdf6a Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Thu, 8 Sep 2022 15:45:39 +0200 Subject: [PATCH] :fire: Remove role setup-http-dehydrated This feature is now provided by setup-http-site-proxy --- roles/setup-http-dehydrated/handlers/main.yml | 5 --- roles/setup-http-dehydrated/meta/main.yml | 3 -- roles/setup-http-dehydrated/tasks/main.yml | 12 ------ .../templates/apache-dehydrated.j2 | 38 ------------------- 4 files changed, 58 deletions(-) delete mode 100644 roles/setup-http-dehydrated/handlers/main.yml delete mode 100644 roles/setup-http-dehydrated/meta/main.yml delete mode 100644 roles/setup-http-dehydrated/tasks/main.yml delete mode 100644 roles/setup-http-dehydrated/templates/apache-dehydrated.j2 diff --git a/roles/setup-http-dehydrated/handlers/main.yml b/roles/setup-http-dehydrated/handlers/main.yml deleted file mode 100644 index 670471f..0000000 --- a/roles/setup-http-dehydrated/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: restart apache2 - service: - name: apache2 - state: restarted diff --git a/roles/setup-http-dehydrated/meta/main.yml b/roles/setup-http-dehydrated/meta/main.yml deleted file mode 100644 index 5eff279..0000000 --- a/roles/setup-http-dehydrated/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: -- role: ansible-role-dehydrated diff --git a/roles/setup-http-dehydrated/tasks/main.yml b/roles/setup-http-dehydrated/tasks/main.yml deleted file mode 100644 index a6f1650..0000000 --- a/roles/setup-http-dehydrated/tasks/main.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Add or update Apache2 site - template: - src: templates/apache-dehydrated.j2 - dest: /etc/apache2/sites-available/{{ site_name }}.conf - notify: restart apache2 - -- name: Activate Apache2 site - command: a2ensite {{ site_name }} - args: - creates: /etc/apache2/sites-enabled/{{ site_name }}.conf - notify: restart apache2 diff --git a/roles/setup-http-dehydrated/templates/apache-dehydrated.j2 b/roles/setup-http-dehydrated/templates/apache-dehydrated.j2 deleted file mode 100644 index 60076b4..0000000 --- a/roles/setup-http-dehydrated/templates/apache-dehydrated.j2 +++ /dev/null @@ -1,38 +0,0 @@ -{% if 'address' in ansible_default_ipv6 %} - -{% else %} - -{% endif %} - ServerAdmin {{ server_admin }} - ServerName {{ site_name }} - ServerAlias {{ site_name }} - ErrorLog /var/log/apache2/{{ site_name }}-error.log - CustomLog /var/log/apache2/{{ site_name }}-access.log common - - Alias /.well-known/acme-challenge {{ dehydrated_wellknown_dir }} - - - -{% if 'address' in ansible_default_ipv6 %} - -{% else %} - -{% endif %} - ServerAdmin {{ server_admin }} - ServerName {{ site_name }} - ServerAlias {{ site_name }} - - ErrorLog /var/log/apache2/{{ site_name }}-error.log - CustomLog /var/log/apache2/{{ site_name }}-access.log common - - SSLEngine on - SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown - SSLCertificateFile {{dehydrated_certs_dir}}/{{ site_name }}/cert.pem - SSLCertificateKeyFile {{dehydrated_certs_dir}}/{{ site_name }}/privkey.pem - SSLCertificateChainFile {{dehydrated_certs_dir}}/{{ site_name }}/chain.pem - - Alias /.well-known/acme-challenge {{ dehydrated_wellknown_dir }} - - Redirect 404 / - -