From 63629d27ee7771e16afa8764ecfe16f91c100883 Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Sun, 31 Dec 2017 07:07:11 +0100 Subject: Minor cleanup in task file ans DNS zone file --- roles/common/tasks/pkgs.yml | 38 +++++------------------ roles/dnsserver/files/vpn.casperlefantom.net.zone | 9 +++--- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml index 8911bf5..cffd957 100644 --- a/roles/common/tasks/pkgs.yml +++ b/roles/common/tasks/pkgs.yml @@ -1,30 +1,8 @@ -- name: Installation des paquets +- name: Installation des paquets pour Centos yum: name={{ item }} state=present with_items: - - emacs-nox - - iotop - - nmap - yum-plugin-fastestmirror - yum-plugin-verify - - screen - - powertop - - ipset - - patch - - gpm - - elinks - - mutt - - nfs-utils - - tcpdump - - bind-utils - - tar - - at - - zsh - - libsemanage-python - - policycoreutils-python - - setools-console - - cryptsetup - - rsync - - sudo - lsof - net-tools when: ansible_distribution == "CentOS" @@ -54,16 +32,14 @@ - cryptsetup - rsync - sudo - - util-linux-user - when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22 - - -- name: Installation des paquets Fedora - dnf: name={{ item }} state=present - with_items: - tmux - htop - glances + - docker + +- name: Installation des paquets pour Fedora + dnf: name={{ item }} state=present + with_items: - iftop - bvi - whois @@ -79,7 +55,7 @@ - testdisk - steghide - yum-utils - - docker + - util-linux-user when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22 - name: Installation des paquets disgnostic matériel diff --git a/roles/dnsserver/files/vpn.casperlefantom.net.zone b/roles/dnsserver/files/vpn.casperlefantom.net.zone index 6f9b7db..baaeb57 100644 --- a/roles/dnsserver/files/vpn.casperlefantom.net.zone +++ b/roles/dnsserver/files/vpn.casperlefantom.net.zone @@ -1,6 +1,6 @@ $ttl 86400 vpn.casperlefantom.net. IN SOA nsa.vpn.casperlefantom.net. hostmaster.casperlefantom.net. ( -2017081201 +2017122100 10800 3600 604800 @@ -11,10 +11,11 @@ vpn.casperlefantom.net. IN SOA nsa.vpn.casperlefantom.net. hostmaster.casperlefa @ IN A 172.18.2.0 -nsa IN A 172.18.2.0 -nsb IN A 172.18.4.0 - sd-129211 IN A 172.18.2.0 * IN CNAME sd-129211 + +nsa IN A 172.18.2.0 +nsb IN A 172.18.4.0 + 111281hpv002079 IN A 172.18.4.0 -- cgit