summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main.yml1
-rw-r--r--roles/catrust/handlers/main.yml2
-rw-r--r--roles/common/tasks/ca.yml (renamed from roles/catrust/tasks/main.yml)5
-rw-r--r--roles/common/tasks/main.yml3
4 files changed, 6 insertions, 5 deletions
diff --git a/main.yml b/main.yml
index 9e234eb..f610768 100644
--- a/main.yml
+++ b/main.yml
@@ -2,7 +2,6 @@
- hosts: all
remote_user: root
roles:
- - catrust
- common
- hosts: clients
diff --git a/roles/catrust/handlers/main.yml b/roles/catrust/handlers/main.yml
deleted file mode 100644
index 07d9b04..0000000
--- a/roles/catrust/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-- name: ca update
- command: /usr/bin/update-ca-trust
diff --git a/roles/catrust/tasks/main.yml b/roles/common/tasks/ca.yml
index 983b1da..2bf0e0d 100644
--- a/roles/catrust/tasks/main.yml
+++ b/roles/common/tasks/ca.yml
@@ -1,7 +1,8 @@
- name: Installation de mon autorité de certification
copy: src=root.pem dest=/etc/pki/ca-trust/source/anchors/root.pem mode=444
- notify: ca update
- name: Installation de l'autorité de certification CACert
copy: src=cacert.pem dest=/etc/pki/ca-trust/source/anchors/cacert.pem mode=444
- notify: ca update
+
+- name: Mise à jour de la base de confiance CA
+ command: /usr/bin/update-ca-trust
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 6d3e2ef..afaa4cb 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -13,6 +13,9 @@
- name: Configurations variables fichier setvars
include: setvars.yml
+- name: Gestion des Autorités de Certification
+ include: ca.yml
+
- name: Configuration Yum
include: yum.yml