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

install and start dnsmasq early - add option to set upstream dns server

Browse source
This commit is contained in:
Jerry Vonau 2020-05-08 23:06:18 -05:00
parent 054046bc37
commit 7e79d691fc
5 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
roles/1-prep/tasks/main.yml
View file

@ -3,6 +3,9 @@
- name: ...IS BEGINNING ============================================ - name: ...IS BEGINNING ============================================
command: echo command: echo
- name: dnsmasq (install now, configure LATER in 'network', after Stage 9)
include_tasks: roles/network/tasks/dnsmasq.yml
- name: Install uuid-runtime package (debuntu) - name: Install uuid-runtime package (debuntu)
package: package:
name: name:

6
roles/3-base-server/tasks/main.yml
View file

@ -21,12 +21,6 @@
- name: WWW_BASE (WWW_OPTIONS should be installed later) - name: WWW_BASE (WWW_OPTIONS should be installed later)
include_role: include_role:
name: www_base name: www_base
#when: www_base_install | bool
#when: apache_install or nginx_install
- name: dnsmasq (install now, configure LATER in 'network', after Stage 9)
include_tasks: roles/network/tasks/dnsmasq.yml
when: dnsmasq_install | bool
- name: Recording STAGE 3 HAS COMPLETED ===================== - name: Recording STAGE 3 HAS COMPLETED =====================
lineinfile: lineinfile:

4
roles/network/tasks/dnsmasq.yml
View file

@ -14,7 +14,9 @@
- { src: 'roles/network/templates/network/dnsmasq.service.u18', dest: '/etc/systemd/system/iiab-dnsmasq.service', mode: '0644' } - { src: 'roles/network/templates/network/dnsmasq.service.u18', dest: '/etc/systemd/system/iiab-dnsmasq.service', mode: '0644' }
- { src: 'roles/network/templates/network/dnsmasq-iiab', dest: '/etc/dnsmasq.d/dnsmasq-iiab', mode: '644' } - { src: 'roles/network/templates/network/dnsmasq-iiab', dest: '/etc/dnsmasq.d/dnsmasq-iiab', mode: '644' }
- name: Don't use stock dnsmasq systemd unit file during boot - name: Don't use stock dnsmasq systemd unit file during boot but start now
systemd: systemd:
name: dnsmasq name: dnsmasq
daemon_reload: yes
enabled: no enabled: no
state: restarted

6
roles/network/templates/network/dnsmasq-iiab
View file

@ -1 +1,7 @@
#IIAB
bind-interfaces bind-interfaces
# Wan nameserver if manually set
{% if wan_nameserver != "" %}
no-resolv
server={{ wan_nameserver }}
{% endif %}

6
vars/default_vars.yml
View file

@ -177,14 +177,14 @@ user_wan_iface: auto
user_lan_iface: auto user_lan_iface: auto
# Ethernet - IF NECESSARY, CUSTOMIZE THESE 4+1 VARS IN /etc/iiab/local_vars.yml # Ethernet - IF NECESSARY, CUSTOMIZE THESE 4+1 VARS IN /etc/iiab/local_vars.yml
# Details @ roles/network/templates/network/dhcpcd.conf.j2 for /etc/dhcpcd.conf
# See "How do I set a static IP address?" for Ethernet, in http://FAQ.IIAB.IO # See "How do I set a static IP address?" for Ethernet, in http://FAQ.IIAB.IO
wan_ip: dhcp # wan_ip: 192.168.1.99 wan_ip: dhcp # wan_ip: 192.168.1.99
wan_netmask: # wan_netmask: 255.255.255.0 wan_netmask: # wan_netmask: 255.255.255.0
wan_gateway: # wan_gateway: 192.168.1.254 wan_gateway: # wan_gateway: 192.168.1.254
wan_nameserver: # wan_nameserver: 192.168.1.254
wan_try_dhcp_before_static_ip: True # Facilitate field updates w/ cablemodems wan_try_dhcp_before_static_ip: True # Facilitate field updates w/ cablemodems
# Details @ roles/network/templates/network/dhcpcd.conf.j2 for /etc/dhcpcd.conf # Can be set to override the isp provided dns servers when on a dhcp network.
wan_nameserver: # wan_nameserver: 192.168.1.254 or 8.8.8.8
# Parameters for Aggregate Roles # Parameters for Aggregate Roles
# Each Role should have the following variables which are either True or False: # Each Role should have the following variables which are either True or False: