From 9cbc88e4ec4b8ce7224c1351a8a718b3598fa974 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Thu, 7 Mar 2019 15:09:08 +0100 Subject: [PATCH] rename certmgr -> acertmgr --- roles/{certmgr => acertmgr}/tasks/main.yml | 0 roles/{certmgr => acertmgr}/templates/acme.conf.j2 | 0 roles/confluence/handlers/main.yml | 3 +++ roles/confluence/meta/main.yml | 2 +- roles/confluence/tasks/main.yml | 1 + roles/web-gw/handlers/main.yml | 2 +- roles/web-gw/meta/main.yml | 2 +- roles/web-gw/tasks/main.yml | 2 +- 8 files changed, 8 insertions(+), 4 deletions(-) rename roles/{certmgr => acertmgr}/tasks/main.yml (100%) rename roles/{certmgr => acertmgr}/templates/acme.conf.j2 (100%) diff --git a/roles/certmgr/tasks/main.yml b/roles/acertmgr/tasks/main.yml similarity index 100% rename from roles/certmgr/tasks/main.yml rename to roles/acertmgr/tasks/main.yml diff --git a/roles/certmgr/templates/acme.conf.j2 b/roles/acertmgr/templates/acme.conf.j2 similarity index 100% rename from roles/certmgr/templates/acme.conf.j2 rename to roles/acertmgr/templates/acme.conf.j2 diff --git a/roles/confluence/handlers/main.yml b/roles/confluence/handlers/main.yml index 45a4168..49dca8c 100644 --- a/roles/confluence/handlers/main.yml +++ b/roles/confluence/handlers/main.yml @@ -5,3 +5,6 @@ - name: Reload systemd command: systemctl daemon-reload + +- name: Run acertmgr + command: /opt/acertmgr/acertmgr.py diff --git a/roles/confluence/meta/main.yml b/roles/confluence/meta/main.yml index 8d2c010..8fcf724 100644 --- a/roles/confluence/meta/main.yml +++ b/roles/confluence/meta/main.yml @@ -1,5 +1,5 @@ --- dependencies: -- { role: certmgr } +- { role: acertmgr } - { role: nginx, nginx_ssl: True } diff --git a/roles/confluence/tasks/main.yml b/roles/confluence/tasks/main.yml index 4843889..77fd713 100644 --- a/roles/confluence/tasks/main.yml +++ b/roles/confluence/tasks/main.yml @@ -26,6 +26,7 @@ - name: Configure certificate manager for confluence template: src=certs.j2 dest=/etc/acme/domains.d/{{ confluence_domain }}.conf + notify: Run acertmgr - name: Configure vhost template: src=vhost.j2 dest=/etc/nginx/sites-available/confluence diff --git a/roles/web-gw/handlers/main.yml b/roles/web-gw/handlers/main.yml index 9735dcd..2c3a4e3 100644 --- a/roles/web-gw/handlers/main.yml +++ b/roles/web-gw/handlers/main.yml @@ -3,5 +3,5 @@ - name: Restart nginx service: name=nginx state=restarted -- name: Run certmgr +- name: Run acertmgr command: /opt/acertmgr/acertmgr.py diff --git a/roles/web-gw/meta/main.yml b/roles/web-gw/meta/main.yml index 8d2c010..8fcf724 100644 --- a/roles/web-gw/meta/main.yml +++ b/roles/web-gw/meta/main.yml @@ -1,5 +1,5 @@ --- dependencies: -- { role: certmgr } +- { role: acertmgr } - { role: nginx, nginx_ssl: True } diff --git a/roles/web-gw/tasks/main.yml b/roles/web-gw/tasks/main.yml index 2346f26..41721cf 100644 --- a/roles/web-gw/tasks/main.yml +++ b/roles/web-gw/tasks/main.yml @@ -9,7 +9,7 @@ - name: Configure certificate manager template: src=certs.j2 dest=/etc/acme/domains.d/{{ ansible_fqdn }}.conf - notify: Run certmgr + notify: Run acertmgr - name: Configure vhosts template: src=vhost.j2 dest=/etc/nginx/sites-available/www