external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Cleaner computed_network.yml, computed_services.yml, enable_services.yml

Browse source
This commit is contained in:
root 2021-08-14 16:44:22 -04:00
parent 55c016089c
commit d16d4f74e1
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/network/tasks/computed_network.yml
View file

@ -153,7 +153,7 @@
- name: Add 'computed_network' variable values to {{ iiab_ini_file }} - name: Add 'computed_network' variable values to {{ iiab_ini_file }}
ini_file: ini_file:
dest: "{{ iiab_ini_file }}" dest: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini
section: computed_network section: computed_network
option: "{{ item.option }}" option: "{{ item.option }}"
value: "{{ item.value | string }}" value: "{{ item.value | string }}"

2
roles/network/tasks/computed_services.yml
View file

@ -52,7 +52,7 @@
- name: Add 'network' variable values (from computed_services.yml) to {{ iiab_ini_file }} - name: Add 'network' variable values (from computed_services.yml) to {{ iiab_ini_file }}
ini_file: ini_file:
dest: "{{ iiab_ini_file }}" dest: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini
section: network section: network
option: "{{ item.option }}" option: "{{ item.option }}"
value: "{{ item.value | string }}" value: "{{ item.value | string }}"

34
roles/network/tasks/enable_services.yml
View file

@ -11,29 +11,29 @@
enabled: yes enabled: yes
when: dhcpd_install and dhcpd_enabled when: dhcpd_install and dhcpd_enabled
- name: Install /etc/sysconfig/dhcpd, /etc/dhcpd-iiab.conf from templates - name: Install /etc/sysconfig/dhcpd, /etc/dhcpd-iiab.conf from templates (root:root, 0644 by default)
template: template:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
owner: root # owner: root
group: root # group: root
mode: "{{ item.mode }}" # mode: "{{ item.mode }}"
with_items: with_items:
- { src: 'dhcp/dhcpd-env.j2', dest: '/etc/sysconfig/dhcpd', mode: '0644' } - { src: 'dhcp/dhcpd-env.j2', dest: '/etc/sysconfig/dhcpd' }
- { src: 'dhcp/dhcpd-iiab.conf.j2', dest: '/etc/dhcpd-iiab.conf', mode: '0644' } - { src: 'dhcp/dhcpd-iiab.conf.j2', dest: '/etc/dhcpd-iiab.conf' }
when: dhcpd_install and dhcpd_enabled when: dhcpd_install and dhcpd_enabled
- name: Install /etc/named-iiab.conf and two *.zone.db files into /var/named-iiab - name: Install /etc/named-iiab.conf and two *.zone.db files into /var/named-iiab (root:root, 0644 by default)
template: template:
src: "{{ item.src }}" src: "{{ item.src }}"
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
owner: root # owner: root
group: root # group: root
mode: "{{ item.mode }}" # mode: "{{ item.mode }}"
with_items: with_items:
- { src: 'named/named-iiab.conf.j2', dest: '/etc/named-iiab.conf', mode: '0644' } - { src: 'named/named-iiab.conf.j2', dest: '/etc/named-iiab.conf' }
- { src: 'named/school.local.zone.db', dest: '/var/named-iiab/', mode: '0644' } - { src: 'named/school.local.zone.db', dest: '/var/named-iiab/' }
- { src: 'named/school.internal.zone.db', dest: '/var/named-iiab/', mode: '0644' } - { src: 'named/school.internal.zone.db', dest: '/var/named-iiab/' }
when: named_install and named_enabled when: named_install and named_enabled
- name: Enable named service ({{ dns_service }}) if named_enabled - name: Enable named service ({{ dns_service }}) if named_enabled
@ -93,13 +93,13 @@
#- debug: #- debug:
# var: nd_dir # var: nd_dir
- name: To restart dnsmasq whenever br0 comes up, install /etc/networkd-dispatcher/routable.d/dnsmasq.sh from template (if isn't Appliance, and directory /etc/networkd-dispatcher/routable.d exists, i.e. OS's like Ubuntu 18.04 or later) - name: To restart dnsmasq whenever br0 comes up, install /etc/networkd-dispatcher/routable.d/dnsmasq.sh from template (if isn't Appliance, and directory /etc/networkd-dispatcher/routable.d exists, i.e. OS's like Ubuntu 18.04 or later) (root:root by default)
template: template:
src: roles/network/templates/network/dnsmasq.sh.j2 src: roles/network/templates/network/dnsmasq.sh.j2
dest: /etc/networkd-dispatcher/routable.d/dnsmasq.sh dest: /etc/networkd-dispatcher/routable.d/dnsmasq.sh
mode: 0755 mode: 0755
owner: root # owner: root
group: root # group: root
when: dnsmasq_install and dnsmasq_enabled and nd_dir.stat.exists and nd_dir.stat.isdir and (iiab_network_mode != "Appliance") when: dnsmasq_install and dnsmasq_enabled and nd_dir.stat.exists and nd_dir.stat.isdir and (iiab_network_mode != "Appliance")
#when: dnsmasq_install and dnsmasq_enabled and nd_enabled is defined and nd_enabled.stdout == "enabled" and nd_dir.stat.exists and nd_dir.stat.isdir and (iiab_network_mode != "Appliance") #when: dnsmasq_install and dnsmasq_enabled and nd_enabled is defined and nd_enabled.stdout == "enabled" and nd_dir.stat.exists and nd_dir.stat.isdir and (iiab_network_mode != "Appliance")
#when: dnsmasq_install and dnsmasq_enabled and systemd_out.status.UnitFileState == "enabled" and networkd_dir.stat.exists and networkd_dir.stat.isdir and (iiab_network_mode != "Appliance") #when: dnsmasq_install and dnsmasq_enabled and systemd_out.status.UnitFileState == "enabled" and networkd_dir.stat.exists and networkd_dir.stat.isdir and (iiab_network_mode != "Appliance")
@ -205,7 +205,7 @@
# group: root # group: root
mode: 0755 mode: 0755
- name: Install iiab-internet-on|off (root:root by default) - name: Install /usr/bin/iiab-internet-on|off from template (root:root by default)
template: template:
src: "{{ item }}" src: "{{ item }}"
dest: /usr/bin/ dest: /usr/bin/