From 476df56fcc5c2759234a63a2aff5bdd5e2c4d434 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Mon, 25 Feb 2019 08:34:21 +0100
Subject: [PATCH] acertmgr: rename vars, introduce version

---
 group_vars/all/vars.yml               | 2 +-
 host_vars/carbon.binary-kitchen.net   | 2 +-
 roles/acertmgr/detaults/main.yml      | 3 +++
 roles/acertmgr/tasks/main.yml         | 2 +-
 roles/acertmgr/templates/acme.conf.j2 | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 roles/acertmgr/detaults/main.yml

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 09eb721..ca64094 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -1,6 +1,6 @@
 ---
 
-certmgr_mode: webdir
+acertmgr_mode: webdir
 
 dns_axfr_ips:
 - 216.218.133.2
diff --git a/host_vars/carbon.binary-kitchen.net b/host_vars/carbon.binary-kitchen.net
index e31fa45..7c98557 100644
--- a/host_vars/carbon.binary-kitchen.net
+++ b/host_vars/carbon.binary-kitchen.net
@@ -1,3 +1,3 @@
 ---
 
-certmgr_mode: standalone
+acertmgr_mode: standalone
diff --git a/roles/acertmgr/detaults/main.yml b/roles/acertmgr/detaults/main.yml
new file mode 100644
index 0000000..3116046
--- /dev/null
+++ b/roles/acertmgr/detaults/main.yml
@@ -0,0 +1,3 @@
+---
+
+acertmgr_version: 0.8.0
diff --git a/roles/acertmgr/tasks/main.yml b/roles/acertmgr/tasks/main.yml
index c14466f..2316821 100644
--- a/roles/acertmgr/tasks/main.yml
+++ b/roles/acertmgr/tasks/main.yml
@@ -9,7 +9,7 @@
   - python-yaml
 
 - name: Install acertmgr
-  git: repo=https://github.com/moepman/acertmgr.git dest=/opt/acertmgr depth=1 version=02036f56173e3a87173fed33103918c7c5279c5a
+  git: repo=https://github.com/moepman/acertmgr.git dest=/opt/acertmgr depth=1 version={{ acertmgr_version }}
 
 - name: Create config directories
   file: path={{ item }} state=directory mode=0755
diff --git a/roles/acertmgr/templates/acme.conf.j2 b/roles/acertmgr/templates/acme.conf.j2
index a793b2f..f478eb9 100644
--- a/roles/acertmgr/templates/acme.conf.j2
+++ b/roles/acertmgr/templates/acme.conf.j2
@@ -1,6 +1,6 @@
 ---
 
-mode: {{ certmgr_mode }}
+mode: {{ acertmgr_mode }}
 webdir: /var/www/acme-challenge/
 ttl_days: 30
 authority: "https://acme-v01.api.letsencrypt.org"