diff --git a/hosts b/hosts index 0d5280dc..039f1ec3 100644 --- a/hosts +++ b/hosts @@ -44,7 +44,7 @@ sam.adm.crans.org daniel.adm.crans.org jack.adm.crans.org -[slapd] +[ldap_server] tealc.adm.crans.org sam.adm.crans.org daniel.adm.crans.org @@ -58,7 +58,6 @@ routeur-daniel.adm.crans.org routeur-sam.adm.crans.org routeur-daniel.adm.crans.org - [crans_routeurs:children] dhcp keepalived diff --git a/plays/root.yml b/plays/root.yml index 6e9cfe3f..08e7bc62 100755 --- a/plays/root.yml +++ b/plays/root.yml @@ -31,7 +31,7 @@ - qemu-guest-agent - serial-tty -- hosts: slapd +- hosts: ldap_server vars: slapd: '{{ glob_slapd | combine(loc_slapd | default({})) }}' ldap: @@ -47,6 +47,6 @@ - ldap-client - home-nounous -- hosts: server +- hosts: server,!virtu roles: - openssh diff --git a/roles/slapd/templates/ldap/ldap.key.j2 b/roles/slapd/templates/ldap/ldap.key.j2 index 926db60f..e165a54d 100644 --- a/roles/slapd/templates/ldap/ldap.key.j2 +++ b/roles/slapd/templates/ldap/ldap.key.j2 @@ -1 +1 @@ -{{ ldap.private_key }} +{{ slapd.private_key }} diff --git a/roles/slapd/templates/ldap/ldap.pem.j2 b/roles/slapd/templates/ldap/ldap.pem.j2 index ed4f7a5c..cabc323d 100644 --- a/roles/slapd/templates/ldap/ldap.pem.j2 +++ b/roles/slapd/templates/ldap/ldap.pem.j2 @@ -1 +1 @@ -{{ ldap.certificate }} +{{ slapd.certificate }}