diff options
| -rw-r--r-- | chaos-at-home/ch-imap-proxy.yml | 16 | ||||
| -rw-r--r-- | inventory/host_vars/ch-imap-proxy.yml | 3 | ||||
| -rw-r--r-- | roles/acmetool/cert/tasks/main.yml | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/chaos-at-home/ch-imap-proxy.yml b/chaos-at-home/ch-imap-proxy.yml new file mode 100644 index 00000000..d1479ce1 --- /dev/null +++ b/chaos-at-home/ch-imap-proxy.yml @@ -0,0 +1,16 @@ +--- +- name: Basic Setup + hosts: ch-imap-proxy + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd + - role: core/zsh + - role: apt-repo/spreadspace + - role: acmetool/base + - role: acmetool/cert + acmetool_cert_name: "imap.chaos-at-home.org" + acmetool_cert_config: + request: + challenge: + http-self-test: false diff --git a/inventory/host_vars/ch-imap-proxy.yml b/inventory/host_vars/ch-imap-proxy.yml index 8034750f..fb76d202 100644 --- a/inventory/host_vars/ch-imap-proxy.yml +++ b/inventory/host_vars/ch-imap-proxy.yml @@ -31,3 +31,6 @@ network: gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}" interfaces: - *_network_primary_ + + +# acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" diff --git a/roles/acmetool/cert/tasks/main.yml b/roles/acmetool/cert/tasks/main.yml index b20e68bb..09980dad 100644 --- a/roles/acmetool/cert/tasks/main.yml +++ b/roles/acmetool/cert/tasks/main.yml @@ -1,10 +1,10 @@ --- - name: add acmetool desired file vars: - acmetool_desired: + acmetool_cert_satisfy: satisfy: names: "{{ acmetool_cert_hostnames | default([acmetool_cert_name]) }}" copy: - content: "{{ acmetool_desired | to_nice_yaml }}" + content: "{{ acmetool_cert_config | default({}) | combine(acmetool_cert_satisfy) | to_nice_yaml }}" dest: "/var/lib/acme/desired/{{ acmetool_cert_name }}" notify: reconcile acmetool |