diff options
author | Christian Pointner <equinox@spreadspace.org> | 2018-10-05 17:55:53 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2018-10-05 17:55:53 +0200 |
commit | 42f023c73a2e30f17abff585b787b41f48d91042 (patch) | |
tree | 9ff2e64653571fc295df6bb4a472d32fa75c5d08 | |
parent | improved preseed fetch script (diff) |
refactor acmetool role
-rw-r--r-- | host_playbooks/helene.yml | 2 | ||||
-rw-r--r-- | playbooks/emc-acme.yml | 8 | ||||
-rw-r--r-- | roles/acmetool/base/defaults/main.yml (renamed from roles/acmetool/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/acmetool/base/handlers/main.yml (renamed from roles/acmetool/handlers/main.yml) | 0 | ||||
-rw-r--r-- | roles/acmetool/base/tasks/main.yml (renamed from roles/acmetool/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/acmetool/base/templates/responses.j2 (renamed from roles/acmetool/templates/responses.j2) | 0 | ||||
-rw-r--r-- | roles/acmetool/cert/tasks/main.yml (renamed from roles/acmetool-cert/tasks/main.yml) | 0 |
7 files changed, 5 insertions, 5 deletions
diff --git a/host_playbooks/helene.yml b/host_playbooks/helene.yml index ce45cddf..d3619d9d 100644 --- a/host_playbooks/helene.yml +++ b/host_playbooks/helene.yml @@ -7,4 +7,4 @@ - role: zsh - role: admin-user - role: blackmagic-desktopvideo - - role: acmetool + - role: acmetool/base diff --git a/playbooks/emc-acme.yml b/playbooks/emc-acme.yml index e8fd72df..41fff42b 100644 --- a/playbooks/emc-acme.yml +++ b/playbooks/emc-acme.yml @@ -4,8 +4,8 @@ vars: acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" roles: - - role: acmetool - - role: acmetool-cert + - role: acmetool/base + - role: acmetool/cert acmetool_cert_name: "{{ inventory_hostname }}" acmetool_cert_hostnames: - "{{ inventory_hostname }}.spreadspace.org" @@ -13,7 +13,7 @@ - name: create certificates for names running on emc-00 hosts: emc-00 roles: - - role: acmetool-cert + - role: acmetool/cert acmetool_cert_name: emc acmetool_cert_hostnames: - stream.elevate.at @@ -23,7 +23,7 @@ - name: create certificates for names running on helene hosts: helene roles: - - role: acmetool-cert + - role: acmetool/cert acmetool_cert_name: emc acmetool_cert_hostnames: - elevate-feed.spreadspace.org diff --git a/roles/acmetool/defaults/main.yml b/roles/acmetool/base/defaults/main.yml index 409523da..409523da 100644 --- a/roles/acmetool/defaults/main.yml +++ b/roles/acmetool/base/defaults/main.yml diff --git a/roles/acmetool/handlers/main.yml b/roles/acmetool/base/handlers/main.yml index 3d6f1b76..3d6f1b76 100644 --- a/roles/acmetool/handlers/main.yml +++ b/roles/acmetool/base/handlers/main.yml diff --git a/roles/acmetool/tasks/main.yml b/roles/acmetool/base/tasks/main.yml index c2fc2c6c..c2fc2c6c 100644 --- a/roles/acmetool/tasks/main.yml +++ b/roles/acmetool/base/tasks/main.yml diff --git a/roles/acmetool/templates/responses.j2 b/roles/acmetool/base/templates/responses.j2 index a7bf2504..a7bf2504 100644 --- a/roles/acmetool/templates/responses.j2 +++ b/roles/acmetool/base/templates/responses.j2 diff --git a/roles/acmetool-cert/tasks/main.yml b/roles/acmetool/cert/tasks/main.yml index a24ea2ed..a24ea2ed 100644 --- a/roles/acmetool-cert/tasks/main.yml +++ b/roles/acmetool/cert/tasks/main.yml |