diff --git a/all.yml b/all.yml index ac216f33..c7bc795f 100755 --- a/all.yml +++ b/all.yml @@ -15,7 +15,6 @@ - import_playbook: plays/constellation.yml - import_playbook: plays/dhcp.yml - import_playbook: plays/dns-authoritative.yml -- import_playbook: plays/dns-recursive.yml - import_playbook: plays/dovecot.yml - import_playbook: plays/ethercalc.yml - import_playbook: plays/etherpad.yml @@ -63,6 +62,5 @@ - import_playbook: plays/unbound.yml - import_playbook: plays/utilities.yml - import_playbook: plays/vm_setup.yml -- import_playbook: plays/vsftpd.yml - import_playbook: plays/wireguard.yml - import_playbook: plays/zamok.yml diff --git a/group_vars/reverseproxy.yml b/group_vars/reverseproxy.yml index f5d35f14..3a7a58a6 100644 --- a/group_vars/reverseproxy.yml +++ b/group_vars/reverseproxy.yml @@ -51,9 +51,9 @@ glob_reverseproxy: - {from: cas.crans.org, to: 172.16.10.120} - {from: constellation-dev.crans.org, to: 172.16.10.167} - {from: eclats.crans.org, to: 172.16.10.104} - - {from: ftps.crans.org, to: 172.16.10.113} - {from: ethercalc.crans.org, to: "172.16.10.133:8000"} - {from: framadate.crans.org, to: 172.16.10.109} + - {from: ftps.crans.org, to: 172.16.10.113} - {from: galene-token.crans.org, to: "172.16.10.115:3000"} - {from: grafana.crans.org, to: "172.16.10.121:3000"} - {from: hedgedoc.crans.org, to: "172.16.10.128:3000"} diff --git a/plays/routeurs.yml b/plays/routeurs.yml index fc141cc4..0ac1af8b 100755 --- a/plays/routeurs.yml +++ b/plays/routeurs.yml @@ -4,7 +4,6 @@ - import_playbook: bird.yml - import_playbook: freeradius.yml - import_playbook: firewall.yml -- import_playbook: dns-recursive.yml - import_playbook: prefix-delegation.yml - import_playbook: radvd.yml - import_playbook: keepalived.yml diff --git a/plays/vsftpd.yml b/plays/vsftpd.yml deleted file mode 100755 index ece6df48..00000000 --- a/plays/vsftpd.yml +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env ansible-playbook ---- -# Deploy vsftpd server on the mirrors -- hosts: vsftpd_mirror - vars: - certbot: "{{ loc_certbot | default(glob_certbot | default([])) }}" - vsftpd: "{{ glob_vsftpd_mirror | default({}) | combine(loc_vsftpd | default({})) }}" - roles: - - certbot - - vsftpd - -# Deploy vstfpd on the camera serveur -- hosts: vsftpd_cameras - vars: - vsftpd: "{{ glob_vsftpd_cameras | default({}) | combine(loc_vsftpd | default({})) }}" - roles: - - vsftpd diff --git a/plays/zamok.yml b/plays/zamok.yml index c4bbfbe0..5d311fcf 100755 --- a/plays/zamok.yml +++ b/plays/zamok.yml @@ -8,4 +8,3 @@ roles: - zamok-tools # - postfix - - prometheus-node-exporter-postfix diff --git a/roles/moinmoin-gendoc/tasks/main.yml b/roles/moinmoin-gendoc/tasks/main.yml index c66ad943..c62ef82a 100644 --- a/roles/moinmoin-gendoc/tasks/main.yml +++ b/roles/moinmoin-gendoc/tasks/main.yml @@ -9,9 +9,10 @@ - name: get dmidecode facts dmidecode_facts: {} -- name: get ssh fingerprints - sshfp: {} - register: sshfp + +#- name: get ssh fingerprints +# sshfp: {} +# register: sshfp - name: Create wiki page documenting {{ ansible_hostname }} (physical) when: ansible_system_vendor != 'QEMU' diff --git a/roles/moinmoin-gendoc/templates/server.j2 b/roles/moinmoin-gendoc/templates/server.j2 index c49a5039..9aa6612b 100644 --- a/roles/moinmoin-gendoc/templates/server.j2 +++ b/roles/moinmoin-gendoc/templates/server.j2 @@ -78,7 +78,7 @@ et {{ (ansible_memory_mb.swap.total/1024)|round(1) }} GiB de SWAP. {{ interface.macaddress }} || {% endif %} {% endfor %} - +{# === Clés publiques SSH de la machine === '''RSA''' : @@ -94,4 +94,4 @@ et {{ (ansible_memory_mb.swap.total/1024)|round(1) }} GiB de SWAP. '''ED25519''' : {{ '{{{' }} {{ sshfp.ssh_host_key_ed25519_fp }} -{{ '}}}' }} +{{ '}}}' }}#}