acmetool: minor refactroing

4 files changed, 37 insertions, 37 deletions

diff --git a/roles/x509/acmetool/base/tasks/main.yml b/roles/x509/acmetool/base/tasks/main.yml
index 5f2ae4ab..5ad03257 100644
--- a/roles/x509/acmetool/base/tasks/main.yml
+++ b/roles/x509/acmetool/base/tasks/main.yml
@@ -1,34 +1,34 @@
 ---
 - name: check if acmetool package is new enough
-  ansible.builtin.debug:
+  debug:
     msg: "Check distribution_release"
   failed_when: (ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) < 9) or (ansible_distribution == 'Ubuntu' and (ansible_distribution_major_version | int) < 17) or (ansible_distribution != 'Debian' and ansible_distribution != 'Ubuntu')
 
 - name: install needed packages
-  ansible.builtin.apt:
+  apt:
     name:
     - acmetool
     - "{{ python_basename }}-openssl"
     state: present
 
 - name: create initial directory structure
-  ansible.builtin.command: acmetool --batch
+  command: acmetool --batch
   args:
     creates: /var/lib/acme/conf
 
 - name: create acmetool response file
-  ansible.builtin.template:
+  template:
     src: responses.j2
     dest: /var/lib/acme/conf/responses
 
 - name: create non-standard acmetool webroot path
-  ansible.builtin.file:
+  file:
     name: "{{ acmetool_challenge_webroot_path }}"
     state: directory
   when: acmetool_challenge_webroot_path is defined
 
 - name: run quickstart to create account and default target configuration
-  ansible.builtin.command: acmetool --batch quickstart
+  command: acmetool --batch quickstart
   environment:
     http_proxy: "{{ acmetool_http_proxy | default('') }}"
     https_proxy: "{{ acmetool_https_proxy | default('') }}"
@@ -36,10 +36,10 @@
     creates: /var/lib/acme/conf/target
 
 - name: generate selfsigned interim certificate
-  ansible.builtin.include_tasks: selfsigned.yml
+  include_tasks: selfsigned.yml
 
 - name: install service reload configuration
-  ansible.builtin.template:
+  template:
     src: acme-reload.j2
     dest: /etc/default/acme-reload
     owner: root
@@ -48,17 +48,17 @@
   when: acmetool_reload_services is defined
 
 - name: create system unit snippet directory
-  ansible.builtin.file:
+  file:
     path: /etc/systemd/system/acmetool.service.d/
     state: directory
 
 - name: install systemd unit snippet
-  ansible.builtin.template:
+  template:
     src: systemd-override.conf.j2
     dest: /etc/systemd/system/acmetool.service.d/override.conf
 
 - name: enable/start systemd timer for acmetool
-  ansible.builtin.systemd:
+  systemd:
     name: acmetool.timer
     state: started
     enabled: yes
diff --git a/roles/x509/acmetool/base/tasks/selfsigned.yml b/roles/x509/acmetool/base/tasks/selfsigned.yml
index 449fbdb9..9b1af903 100644
--- a/roles/x509/acmetool/base/tasks/selfsigned.yml
+++ b/roles/x509/acmetool/base/tasks/selfsigned.yml
@@ -1,16 +1,16 @@
 ---
 - name: get id of existing selfsigned interim certificate
-  ansible.builtin.shell: cat /var/lib/acme/.selfsigned-interim-cert || true
+  shell: cat /var/lib/acme/.selfsigned-interim-cert || true
   changed_when: false
   check_mode: false
   register: existing_selfsigned_interim_cert_id
 
 - name: set existing_selfsigned_interim_cert_id variable
-  ansible.builtin.set_fact:
+  set_fact:
     existing_selfsigned_interim_cert_id: "{{ existing_selfsigned_interim_cert_id.stdout }}"
 
 - name: check if selfsigned interim certificate does exist
-  ansible.builtin.stat:
+  stat:
     path: "/var/lib/acme/certs/{{ existing_selfsigned_interim_cert_id }}"
   register: existing_selfsigned_interim_cert_stat
 
@@ -18,18 +18,18 @@
   when: not existing_selfsigned_interim_cert_id or not existing_selfsigned_interim_cert_stat.stat.exists
   block:
   - name: create temporary directory
-    ansible.builtin.tempfile:
+    tempfile:
       path: /var/lib/acme/tmp
       prefix: selfsigned-interim-cert-
       state: directory
     register: tmpdir
 
   - name: set tmpdir variable
-    ansible.builtin.set_fact:
+    set_fact:
       tmpdir: "{{ tmpdir.path }}"
 
   - name: generate private key for selfsigned interim certificate
-    ansible.builtin.openssl_privatekey:
+    openssl_privatekey:
       path: "{{ tmpdir }}/privkey"
       mode: 0600
 
@@ -43,11 +43,11 @@
   ### this is needed because strftime filter in ansible is exceptionally stupid
   ### see: https://github.com/ansible/ansible/issues/39835
   - name: get remote date-time 10s ago
-    ansible.builtin.command: date -d '10 seconds ago' -u '+%Y%m%d%H%M%SZ'
+    command: date -d '10 seconds ago' -u '+%Y%m%d%H%M%SZ'
     register: remote_datetime_10sago
 
   - name: get remote date-time now
-    ansible.builtin.command: date -u '+%Y%m%d%H%M%SZ'
+    command: date -u '+%Y%m%d%H%M%SZ'
     register: remote_datetime_now
 
   - name: generate selfsigned interim certificate
@@ -64,7 +64,7 @@
     loop:
     - cert
     - fullchain
-    ansible.builtin.copy:
+    copy:
       content: "{{ selfsigned_interim_cert.certificate }}"
       dest: "{{ tmpdir }}/{{ item }}"
 
@@ -72,74 +72,74 @@
     loop:
     - chain
     - selfsigned
-    ansible.builtin.copy:
+    copy:
       content: ""
       dest: "{{ tmpdir }}/{{ item }}"
 
   ### TODO: remove this once acmetool respects it's own storage layout
   ###       see: https://github.com/hlandau/acme/blob/master/_doc/SCHEMA.md#temporary-use-of-self-signed-certificates
   - name: generate fake url file
-    ansible.builtin.copy:
+    copy:
       content: "https://acme.example.com/acme/cert/self-signed\n"
       dest: "{{ tmpdir }}/url"
 
   - name: get key id
-    ansible.builtin.shell: "openssl x509 -in '{{ tmpdir }}/cert' -noout -pubkey | openssl enc -base64 -d | openssl sha256 -binary | base32 | tr -d '=' | tr '[:upper:]' '[:lower:]'"
+    shell: "openssl x509 -in '{{ tmpdir }}/cert' -noout -pubkey | openssl enc -base64 -d | openssl sha256 -binary | base32 | tr -d '=' | tr '[:upper:]' '[:lower:]'"
     register: selfsigned_interim_key_id
 
   - name: set selfsigned_interim_key_id variable
-    ansible.builtin.set_fact:
+    set_fact:
       selfsigned_interim_key_id: "{{ selfsigned_interim_key_id.stdout }}"
 
   - name: create directory for private key of selfsigned interim certificate
-    ansible.builtin.file:
+    file:
       path: "/var/lib/acme/keys/{{ selfsigned_interim_key_id }}"
       state: directory
       mode: 0700
 
   - name: move private key to its directory
-    ansible.builtin.command: "mv '{{ tmpdir }}/privkey' '/var/lib/acme/keys/{{ selfsigned_interim_key_id }}/privkey'"
+    command: "mv '{{ tmpdir }}/privkey' '/var/lib/acme/keys/{{ selfsigned_interim_key_id }}/privkey'"
 
   - name: create symlink to privkey
-    ansible.builtin.file:
+    file:
       src: "../../keys/{{ selfsigned_interim_key_id }}/privkey"
       dest: "{{ tmpdir }}/privkey"
       state: link
 
   # - name: get certificate id
-  #   ansible.builtin.shell: "openssl x509 -in '{{ tmpdir }}/cert' -outform der | openssl sha256 -binary | base32 | tr -d '=' | tr '[:upper:]' '[:lower:]'"
+  #   shell: "openssl x509 -in '{{ tmpdir }}/cert' -outform der | openssl sha256 -binary | base32 | tr -d '=' | tr '[:upper:]' '[:lower:]'"
   #   register: selfsigned_interim_cert_id
 
   # - name: set selfsigned_interim_cert_id variable
-  #   ansible.builtin.set_fact:
+  #   set_fact:
   #     selfsigned_interim_cert_id: "selfsigned-{{ selfsigned_interim_cert_id.stdout }}"
 
   ### TODO: replace with the above once acmetool respects it's own storage layout
   ###       see: https://github.com/hlandau/acme/blob/master/_doc/SCHEMA.md#temporary-use-of-self-signed-certificates
   - name: get certificate id
-    ansible.builtin.shell: "cat '{{ tmpdir }}/url' | tr -d '\n' | openssl sha256 -binary | base32 | tr -d '=' | tr '[:upper:]' '[:lower:]'"
+    shell: "cat '{{ tmpdir }}/url' | tr -d '\n' | openssl sha256 -binary | base32 | tr -d '=' | tr '[:upper:]' '[:lower:]'"
     register: selfsigned_interim_cert_id
 
   - name: set selfsigned_interim_cert_id variable
-    ansible.builtin.set_fact:
+    set_fact:
       selfsigned_interim_cert_id: "{{ selfsigned_interim_cert_id.stdout }}"
 
   - name: set permissions for selfsigned interim certificate directory
-    ansible.builtin.file:
+    file:
       path: "{{ tmpdir }}"
       mode: 0755
       state: directory
 
   - name: move selfsigned interim certificate directory into place
-    ansible.builtin.command: "mv '{{ tmpdir }}' '/var/lib/acme/certs/{{ selfsigned_interim_cert_id }}'"
+    command: "mv '{{ tmpdir }}' '/var/lib/acme/certs/{{ selfsigned_interim_cert_id }}'"
 
   - name: write cert-id of selfsigned interim certificate to state directory
-    ansible.builtin.copy:
+    copy:
       content: "{{ selfsigned_interim_cert_id }}"
       dest: /var/lib/acme/.selfsigned-interim-cert
 
   rescue:
   - name: remove temporary directory for selfsigned interim certificate
-    ansible.builtin.file:
+    file:
       path: "{{ tmpdir }}"
       state: absent
diff --git a/roles/x509/acmetool/cert/handlers/main.yml b/roles/x509/acmetool/cert/handlers/main.yml
index 08892c18..a7fc43ed 100644
--- a/roles/x509/acmetool/cert/handlers/main.yml
+++ b/roles/x509/acmetool/cert/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: reconcile acmetool
   when: not acmetool_reconcile_disabled
-  ansible.builtin.systemd:
+  systemd:
     name: acmetool.service
     state: started
diff --git a/roles/x509/acmetool/cert/tasks/main.yml b/roles/x509/acmetool/cert/tasks/main.yml
index e97aab84..09980dad 100644
--- a/roles/x509/acmetool/cert/tasks/main.yml
+++ b/roles/x509/acmetool/cert/tasks/main.yml
@@ -4,7 +4,7 @@
     acmetool_cert_satisfy:
       satisfy:
         names: "{{ acmetool_cert_hostnames | default([acmetool_cert_name]) }}"
-  ansible.builtin.copy:
+  copy:
     content: "{{ acmetool_cert_config | default({}) | combine(acmetool_cert_satisfy) | to_nice_yaml }}"
     dest: "/var/lib/acme/desired/{{ acmetool_cert_name }}"
   notify: reconcile acmetool