From ea9ce43e9d2e8b66c4774bb82bbb513710da736d Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 14 Jul 2015 11:17:56 +0100 Subject: [PATCH] New role for Debian-specific configuration. Move the PKI-management scripts over, because they're not truly common. --- all.yml | 6 ++++++ roles/common/tasks/main.yml | 7 ------- roles/{common => debian}/files/pki/check-x509-certs | 0 roles/{common => debian}/files/pki/update-ca-certs | 0 roles/debian/tasks/main.yml | 17 +++++++++++++++++ 5 files changed, 23 insertions(+), 7 deletions(-) rename roles/{common => debian}/files/pki/check-x509-certs (100%) rename roles/{common => debian}/files/pki/update-ca-certs (100%) create mode 100644 roles/debian/tasks/main.yml diff --git a/all.yml b/all.yml index c1af708..13f9a27 100644 --- a/all.yml +++ b/all.yml @@ -9,3 +9,9 @@ gather_facts: no roles: - common + +## Operating-system-specific configuration. +- hosts: debian-hosts + gather_facts: no + roles: + - debian diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 42bc86c..f20dc0f 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -14,13 +14,6 @@ ###-------------------------------------------------------------------------- ### PKI machinery. -- name: install PKI maintenance scripts - tags: [pki, pki-scripts] - copy: src=pki/{{ item }} dest=/etc/cron.daily/ - with_items: - - update-ca-certs - - check-x509-certs - - name: install common PKI files tags: [pki, pki-keys] copy: src=pki/{{ item }} dest=/etc/ca/ diff --git a/roles/common/files/pki/check-x509-certs b/roles/debian/files/pki/check-x509-certs similarity index 100% rename from roles/common/files/pki/check-x509-certs rename to roles/debian/files/pki/check-x509-certs diff --git a/roles/common/files/pki/update-ca-certs b/roles/debian/files/pki/update-ca-certs similarity index 100% rename from roles/common/files/pki/update-ca-certs rename to roles/debian/files/pki/update-ca-certs diff --git a/roles/debian/tasks/main.yml b/roles/debian/tasks/main.yml new file mode 100644 index 0000000..70bf371 --- /dev/null +++ b/roles/debian/tasks/main.yml @@ -0,0 +1,17 @@ +### -*-yaml-*- +### +### Tasks applicable for all Debian hosts. + +--- + +###-------------------------------------------------------------------------- +### PKI machinery. + +- name: install PKI maintenance scripts + tags: [pki, pki-scripts] + copy: src=pki/{{ item }} dest=/etc/cron.daily/ + with_items: + - update-ca-certs + - check-x509-certs + +###----- That's all, folks -------------------------------------------------- -- 2.11.0