From 18ad21119b365a70cb8bdf9971d4b77a3f995ed2 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Tue, 30 Mar 2021 15:24:36 +0200
Subject: [PATCH] iddev: have the playbook call certbot directly

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
---
 .../hosts/iddev.fedorainfracloud.org.yml      | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/playbooks/hosts/iddev.fedorainfracloud.org.yml b/playbooks/hosts/iddev.fedorainfracloud.org.yml
index c32051934b..c49e374e94 100644
--- a/playbooks/hosts/iddev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/iddev.fedorainfracloud.org.yml
@@ -21,23 +21,16 @@
   - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
-  - name: Add an apache config to proxy letsencrypt
-    shell: |
-      echo '<VirtualHost *:80>
-        ServerName iddev.fedorainfracloud.org
-        ProxyPass "/.well-known/acme-challenge" "https://certgetter01/.well-known/acme-challenge"
-        Redirect permanent / https://iddev.fedorainfracloud.org
-      </VirtualHost>' > /etc/httpd/conf.d/proxy_letsencrypt.conf
   - name: reload apache
     ansible.builtin.service:
       name: httpd
-      state: reloaded
+      state: stopped
   - name: Letsencrypt for iddev.fedorainfracloud.org
-    include_role: name=letsencrypt
-    vars:
-      site_name: iddev.fedorainfracloud.org
-    tags:
-    - letsencrypt
+    shell: /usr/bin/certbot renew --noninteractive --no-random-sleep-on-renew --force-renewal --standalone
+  - name: reload apache
+    ansible.builtin.service:
+      name: httpd
+      state: restarted
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"