summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dnsserver.yml1
-rw-r--r--roles/clients/meta/main.yml2
-rw-r--r--roles/common/tasks/pkgs.yml2
-rw-r--r--roles/common/tasks/rc.yml20
-rw-r--r--roles/cozycloud/meta/main.yml2
-rw-r--r--roles/dnsserver/meta/main.yml2
-rw-r--r--roles/dnsserver/tasks/dirs.yml4
-rw-r--r--roles/dnsserver/tasks/main.yml6
-rw-r--r--roles/dnsserver/templates/named.conf.j235
-rw-r--r--roles/dnsserver/vars/main.yml3
-rw-r--r--roles/ntpserver/meta/main.yml2
-rw-r--r--roles/yum-updatesd/meta/main.yml2
12 files changed, 37 insertions, 44 deletions
diff --git a/dnsserver.yml b/dnsserver.yml
index d3cd181..b6e8c42 100644
--- a/dnsserver.yml
+++ b/dnsserver.yml
@@ -1,5 +1,4 @@
- hosts: dns
remote_user: root
roles:
- - common
- dnsserver
diff --git a/roles/clients/meta/main.yml b/roles/clients/meta/main.yml
deleted file mode 100644
index b1656ff..0000000
--- a/roles/clients/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
- - { role: common }
diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml
index 1eca971..fdf062b 100644
--- a/roles/common/tasks/pkgs.yml
+++ b/roles/common/tasks/pkgs.yml
@@ -20,6 +20,8 @@
- bind-utils
- tar
- at
+ - zsh
+ - libsemanage-python
- name: Installation des paquets Fedora
yum: name={{ item }} state=present
diff --git a/roles/common/tasks/rc.yml b/roles/common/tasks/rc.yml
index a7ce235..683c770 100644
--- a/roles/common/tasks/rc.yml
+++ b/roles/common/tasks/rc.yml
@@ -1,11 +1,11 @@
-- name: Root bashrc
- copy: src=bashrc dest=/root/.bashrc mode=644
+- name: Installation des fichiers rc root
+ copy: src={{ item.name }} dest=/root/{{ item.dest }} mode=644
+ with_items:
+ - { name: 'bashrc', dest: '.bashrc' }
+ - { name: 'emacs.rc', dest: '.emacs' }
-- name: Root emacs rc
- copy: src=emacs.rc dest=/root/.emacs mode=644
-
-- name: Squelette bashrc
- copy: src=bashrc dest=/etc/skel/.bashrc mode=644
-
-- name: Squelette emacs rc
- copy: src=emacs.rc dest=/etc/skel/.emacs mode=644
+- name: Installation des fichiers rc squelette
+ copy: src={{ item.name }} dest=/etc/skel/{{ item.dest }} mode=644
+ with_items:
+ - { name: 'bashrc', dest: '.bashrc' }
+ - { name: 'emacs.rc', dest: '.emacs' }
diff --git a/roles/cozycloud/meta/main.yml b/roles/cozycloud/meta/main.yml
deleted file mode 100644
index b1656ff..0000000
--- a/roles/cozycloud/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
- - { role: common }
diff --git a/roles/dnsserver/meta/main.yml b/roles/dnsserver/meta/main.yml
deleted file mode 100644
index b1656ff..0000000
--- a/roles/dnsserver/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
- - { role: common }
diff --git a/roles/dnsserver/tasks/dirs.yml b/roles/dnsserver/tasks/dirs.yml
index 93a0a1a..3319eee 100644
--- a/roles/dnsserver/tasks/dirs.yml
+++ b/roles/dnsserver/tasks/dirs.yml
@@ -13,7 +13,7 @@
when: ansible_distribution == "CentOS"
- name: Création initiale des fichiers journaux dans /var/log/
- file: path=/var/log/named/{{ item }} state=file
+ file: path=/var/log/named/{{ item }} state=touch
owner=named
group=named
mode=644
@@ -29,7 +29,7 @@
when: ansible_distribution == "Fedora"
- name: Création initiale des fichiers journaux dans /var/named/chroot/
- file: path=/var/named/chroot/var/log/named/{{ item }} state=file
+ file: path=/var/named/chroot/var/log/named/{{ item }} state=touch
owner=named
group=named
mode=644
diff --git a/roles/dnsserver/tasks/main.yml b/roles/dnsserver/tasks/main.yml
index 40786bf..ab4a734 100644
--- a/roles/dnsserver/tasks/main.yml
+++ b/roles/dnsserver/tasks/main.yml
@@ -4,8 +4,8 @@
- name: Configuration de l'arborescence
include: dirs.yml
-- name: Gestion du service
- include: services.yml
-
- name: Configuration du service
include: config.yml
+
+- name: Gestion du service
+ include: services.yml
diff --git a/roles/dnsserver/templates/named.conf.j2 b/roles/dnsserver/templates/named.conf.j2
index 36acbad..8ea7423 100644
--- a/roles/dnsserver/templates/named.conf.j2
+++ b/roles/dnsserver/templates/named.conf.j2
@@ -12,10 +12,10 @@ acl "whitelist-recursion" {
2a01:e35:2f76:7750::/64; // Réseau local
86.220.0.0/16; // Plage des adresses dynamiques de Orange
109.28.114.38; // Adresse fixe de SFR
-{% if ansible_default_ipv6.address == master_ipv6 %}
+{% if ansible_default_ipv6.address != slave1_ipv6 %}
{{ slave1_ipv6 }}; // Adresse de NS2
{% endif %}
-{% if ansible_default_ipv6.address == slave1_ipv6 %}
+{% if ansible_default_ipv6.address != master_ipv6 %}
{{ master_ipv4 }}; // Réseau domestique
{% endif %}
};
@@ -121,6 +121,14 @@ server {{ slave1_ipv4 }} {
server {{ slave1_ipv6 }} {
keys { Forwarder; };
};
+
+server {{ slave2_ipv4 }} {
+ keys { Forwarder; };
+};
+
+server {{ slave2_ipv6 }} {
+ keys { Forwarder; };
+};
{% endif %}
{% if ansible_default_ipv6.address != master_ipv6 %}
server {{ master_ipv4 }} {
@@ -145,7 +153,7 @@ zone "." IN {
zone "casperlefantom.net" IN {
{% if ansible_default_ipv6.address == master_ipv6 %}
type master;
- allow-transfer { {{ slave1_ipv6 }}; };
+ allow-transfer { {{ slave1_ipv6 }}; {{ slave2_ipv6 }}; };
file "casperlefantom.net.zone";
notify yes;
{% endif %}
@@ -159,7 +167,7 @@ zone "casperlefantom.net" IN {
zone "117.103.247.82.in-addr.arpa" IN {
{% if ansible_default_ipv6.address == master_ipv6 %}
type master;
- allow-transfer { {{ slave1_ipv6 }}; };
+ allow-transfer { {{ slave1_ipv6 }}; {{ slave2_ipv6 }}; };
file "117.103.247.82.in-addr.arpa";
notify no;
{% endif %}
@@ -173,7 +181,7 @@ zone "117.103.247.82.in-addr.arpa" IN {
zone "4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa" IN {
{% if ansible_default_ipv6.address == master_ipv6 %}
type master;
- allow-transfer { {{ slave1_ipv6 }}; };
+ allow-transfer { {{ slave1_ipv6 }}; {{ slave2_ipv6 }}; };
file "4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa";
notify no;
{% endif %}
@@ -187,7 +195,7 @@ zone "4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa"
zone "2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa" IN {
{% if ansible_default_ipv6.address == master_ipv6 %}
type master;
- allow-transfer { {{ slave1_ipv6 }}; };
+ allow-transfer { {{ slave1_ipv6 }}; {{ slave2_ipv6 }}; };
file "2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa";
notify no;
{% endif %}
@@ -201,7 +209,7 @@ zone "2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa"
zone "3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa" IN {
{% if ansible_default_ipv6.address == master_ipv6 %}
type master;
- allow-transfer { {{ slave1_ipv6 }}; };
+ allow-transfer { {{ slave1_ipv6 }}; {{ slave2_ipv6 }}; };
file "3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa";
notify no;
{% endif %}
@@ -215,7 +223,7 @@ zone "3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa"
zone "194.111.170.178.in-addr.arpa" IN {
{% if ansible_default_ipv6.address == master_ipv6 %}
type master;
- allow-transfer { {{ slave1_ipv6 }}; };
+ allow-transfer { {{ slave1_ipv6 }}; {{ slave2_ipv6 }}; };
file "194.111.170.178.in-addr.arpa";
notify no;
{% endif %}
@@ -229,7 +237,7 @@ zone "194.111.170.178.in-addr.arpa" IN {
zone "0.0.0.5.4.9.1.0.1.1.1.0.0.7.1.0.8.7.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa" IN {
{% if ansible_default_ipv6.address == master_ipv6 %}
type master;
- allow-transfer { {{ slave1_ipv6 }}; };
+ allow-transfer { {{ slave1_ipv6 }}; {{ slave2_ipv6 }}; };
file "0.0.0.5.4.9.1.0.1.1.1.0.0.7.1.0.8.7.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa";
notify no;
{% endif %}
@@ -240,14 +248,5 @@ zone "0.0.0.5.4.9.1.0.1.1.1.0.0.7.1.0.8.7.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa"
{% endif %}
};
-{% if ansible_default_ipv6.address != master_ipv6 and ansible_default_ipv6.address != slave1_ipv6 %}
-{% for domain in google.com google.fr googlevideos.com admob.com adsense.com adwords.com android.com blogger.com blogspot.com chromium.org chrome.com chromebook.com feedburner.com doubleclick.com igoogle.com foofle.com froogle.com googleanalytics.com google-analytics.com googlecode.com googlesource.com googledrive.com googlearth.com googleearth.com googlemaps.com googlepagecreator.com googlescholar.com keyhole.com panoramio.com picasa.com sketchup.com urchin.com waze.com youtube.com youtu.be yt.be ytimg.com youtubeeducation.com youtube-nocookie.com like.com google.org google.net 1e100.net 466453.com gooogle.com gogle.com ggoogle.com gogole.com goolge.com googel.com googil.com googlr.com ggpht.com gmodules.com gtempaccount.com gstatic.com googleadservices.com googleapps.com googleapis.com goo.gl googlebot.com googlecommerce.com googleratings.com googlesyndication.com googletagservices.com googleusercontent.com whatbrowser.org gmail.com googlemail.com facebook.com %}
-zone "{{ domain }}" IN {
- type master;
- file "";
-};
-{% endfor %}
-{% endif %}
-
include "/etc/named.rfc1912.zones";
include "/etc/named.root.key";
diff --git a/roles/dnsserver/vars/main.yml b/roles/dnsserver/vars/main.yml
index 271824c..a299334 100644
--- a/roles/dnsserver/vars/main.yml
+++ b/roles/dnsserver/vars/main.yml
@@ -3,3 +3,6 @@ master_ipv6: 2a01:e35:2f76:7750::4
slave1_ipv4: 178.170.111.194
slave1_ipv6: 2a00:c70:1:178:170:111:194:5000
+
+slave2_ipv4: 192.168.0.61
+slave2_ipv6: 2a01:e35:2f76:7750::11
diff --git a/roles/ntpserver/meta/main.yml b/roles/ntpserver/meta/main.yml
deleted file mode 100644
index b1656ff..0000000
--- a/roles/ntpserver/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
- - { role: common }
diff --git a/roles/yum-updatesd/meta/main.yml b/roles/yum-updatesd/meta/main.yml
deleted file mode 100644
index b1656ff..0000000
--- a/roles/yum-updatesd/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
- - { role: common }
generated by cgit (git 2.34.1) at 2024-06-15 11:00:45 +0000