summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMatthieu Saulnier <fantom@fedoraproject.org>2014-05-22 11:50:10 +0200
committerMatthieu Saulnier <fantom@fedoraproject.org>2014-05-22 11:50:10 +0200
commitfda2fe7948d4d437e1f7a6e21cc07724d1e16bdb (patch)
tree2c59a70cadf040c2ae43879480a053f207be2249 /roles
parente9c547aa1aa29e15e73a4b749c16492e1449f492 (diff)
downloadplaybooks-ansible-fda2fe7948d4d437e1f7a6e21cc07724d1e16bdb.tar.gz
playbooks-ansible-fda2fe7948d4d437e1f7a6e21cc07724d1e16bdb.tar.xz
playbooks-ansible-fda2fe7948d4d437e1f7a6e21cc07724d1e16bdb.zip
Revert "Create catrust role needed to run before common role"
This reverts commit c25b2229d3e03255a69f42175e9fe7979a9d78b4. Handlers of catrust role is not launched before the start of common role.
Diffstat (limited to 'roles')
-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
3 files changed, 6 insertions, 4 deletions
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