|
@@ -34,22 +34,22 @@
|
|
|
- isc-dhcp-server
|
|
|
- unbound
|
|
|
|
|
|
-#- name: Make services autorestart themselves on failure
|
|
|
-# template:
|
|
|
-# src: "custom-service-autorestart.j2"
|
|
|
-## dest: /etc/systemd/system/{{ item }}.service.d/autorestart.conf
|
|
|
-# owner: root
|
|
|
-# group: root
|
|
|
-# mode: '0644'
|
|
|
-# loop:
|
|
|
-# - isc-dhcp-server
|
|
|
-# - unbound
|
|
|
-# notify:
|
|
|
-# - Restart {{ item }}
|
|
|
-# - Reload systemd services
|
|
|
+- name: Make services autorestart themselves on failure
|
|
|
+ ansible.builtin.template:
|
|
|
+ src: "custom-service-autorestart.j2"
|
|
|
+ dest: /etc/systemd/system/{{ item }}.service.d/autorestart.conf
|
|
|
+ owner: root
|
|
|
+ group: root
|
|
|
+ mode: '0644'
|
|
|
+ loop:
|
|
|
+ - isc-dhcp-server
|
|
|
+ - unbound
|
|
|
+ notify:
|
|
|
+ - Reload systemd services
|
|
|
+ - Restart {{ item }}
|
|
|
|
|
|
- name: Enable dhcpd and unbound services
|
|
|
- systemd:
|
|
|
+ ansible.builtin.systemd_service:
|
|
|
name: "{{ item }}"
|
|
|
enabled: yes
|
|
|
loop:
|
|
@@ -65,27 +65,18 @@
|
|
|
|
|
|
|
|
|
- name: Copy dhcpd.conf
|
|
|
- template:
|
|
|
+ ansible.builtin.template:
|
|
|
src: dhcpd/dhcpd.conf.j2
|
|
|
dest: /etc/dhcp/dhcpd.conf
|
|
|
owner: root
|
|
|
group: root
|
|
|
mode: '0644'
|
|
|
notify:
|
|
|
- - Restart dhcpd
|
|
|
-
|
|
|
-
|
|
|
-#- name: Create unbound local.d directory
|
|
|
-# ansible.builtin.file:
|
|
|
-# path: /etc/unbound/local.d
|
|
|
-# state: directory
|
|
|
-# owner: root
|
|
|
-# group: unbound
|
|
|
-# mode: '0750'
|
|
|
+ - Restart isc-dhcp-server
|
|
|
|
|
|
|
|
|
- name: Copy unbound conf files
|
|
|
- template:
|
|
|
+ ansible.builtin.template:
|
|
|
src: "unbound/{{ item }}.j2"
|
|
|
dest: /etc/unbound/unbound.conf.d/{{ item }}
|
|
|
owner: root
|
|
@@ -99,17 +90,17 @@
|
|
|
- Restart unbound
|
|
|
|
|
|
- name: Check adblock config file
|
|
|
- stat:
|
|
|
+ ansible.builtin.stat:
|
|
|
path: /etc/unbound/unbound.conf.d/ad-servers.conf
|
|
|
register: adservers_conf
|
|
|
|
|
|
-- set_fact:
|
|
|
+- ansible.builtin.set_fact:
|
|
|
adservers_conf_age_in_days: "{{ (lookup('pipe', 'date +%s')|int - adservers_conf.stat.ctime|int) / 86400 }}"
|
|
|
when:
|
|
|
- adservers_conf.stat.exists
|
|
|
|
|
|
- name: Download fresh adblock config
|
|
|
- get_url:
|
|
|
+ ansible.builtin.get_url:
|
|
|
url: 'https://pgl.yoyo.org/adservers/serverlist.php?hostformat=unbound&mimetype=plaintext'
|
|
|
dest: /etc/unbound/unbound.conf.d/ad-servers.conf
|
|
|
owner: root
|
|
@@ -121,7 +112,7 @@
|
|
|
- Restart unbound
|
|
|
|
|
|
- name: Update /etc/hosts
|
|
|
- template:
|
|
|
+ ansible.builtin.template:
|
|
|
src: hosts.j2
|
|
|
dest: /etc/hosts
|
|
|
owner: root
|