Merge pull request #7 from ganto/bug-fixes

Various bug fixes
ganto · Sep 15, 2016 · 9eeb1b7 · 9eeb1b7
2 parents 8bca8af + 8752a84
commit 9eeb1b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -45,6 +45,9 @@
   when: (item in acme_tiny__service_map|d({})) and
         ("cert_format" in acme_tiny__service_map[item]) and
         (acme_tiny__service_map[item].cert_format == "keycert")
+  with_items: '{{ acme_tiny__service
+                  if acme_tiny__service is iterable and not acme_tiny__service is string
+                  else [ acme_tiny__service ] }}'
 
 - name: Merge certificate chain
   become: True

diff --git a/tasks/setup.yml b/tasks/setup.yml
@@ -102,7 +102,7 @@
 - name: Sudo rule for service restart
   template:
     src: sudoers.d-rule.j2
-    dest: '/etc/sudoers.d/{{ acme_tiny__user_name }}-{{ item }}-{{ acme_tiny__cert_name }}'
+    dest: '/etc/sudoers.d/{{ acme_tiny__user_name }}-{{ item }}-{{ acme_tiny__cert_name | replace(".", "_") }}'
     owner: 'root'
     group: 'root'
     mode: '0440'

diff --git a/tasks/setup_links.yml b/tasks/setup_links.yml
@@ -50,7 +50,7 @@
 
 - name: Service certificate chain links
   file:
-    src: '{{ acme_tiny__certificate }}_chain.crt'
+    src: '{{ acme_tiny__certificate | replace(".crt", "") }}_chain.crt'
     path: '/etc/{{ item }}/ssl/{{ acme_tiny__cert_name }}.crt'
     state: link
     owner: 'root'