FF-RGB/ansible
4
2
Fork 1
Code Issues 3 Pull Requests Activity

Fix dhcp config (local addr instead of interface), define site_domain

Browse Source
This commit is contained in:
Markus 2017-03-27 18:08:29 +02:00
parent 71cc89884d
commit a774357218
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
group_vars/all/vars.yml
View File

@ -2,13 +2,15 @@
certmgr_mode: webserver certmgr_mode: webserver
confluence_domain: confluence.regensburg.freifunk.net
confluence_dbname: confluence
confluence_dbuser: confluence
confluence_dbpass: "{{ vault_confluence_dbpass }}"
ntp_servers: ntp_servers:
- 0.de.pool.ntp.org - 0.de.pool.ntp.org
- 1.de.pool.ntp.org - 1.de.pool.ntp.org
- 2.de.pool.ntp.org - 2.de.pool.ntp.org
- 3.de.pool.ntp.org - 3.de.pool.ntp.org
confluence_domain: confluence.regensburg.freifunk.net site_domain: regensburg.freifunk.net
confluence_dbname: confluence
confluence_dbuser: confluence
confluence_dbpass: "{{ vault_confluence_dbpass }}"

1
roles/dhcpd/defaults/main.yml
View File

@ -1,6 +1,5 @@
--- ---
dhcp_interface: br-{{ site_code }}
dhcp_first: "{{ batman_ipv4 | ipaddr('512') | ipaddr('address') }}" dhcp_first: "{{ batman_ipv4 | ipaddr('512') | ipaddr('address') }}"
dhcp_last: "{{ batman_ipv4 | ipaddr('2558') | ipaddr('address') }}" dhcp_last: "{{ batman_ipv4 | ipaddr('2558') | ipaddr('address') }}"
name_server: "{{ batman_ipv4 | ipaddr('address') }}" name_server: "{{ batman_ipv4 | ipaddr('address') }}"

4
roles/dhcpd/templates/dhcpd.conf.j2
View File

@ -1,9 +1,11 @@
# dhcpd.conf # {{ ansible_managed }}
# option definitions common to all supported networks... # option definitions common to all supported networks...
option domain-name "{{ site_domain }}"; option domain-name "{{ site_domain }}";
option domain-name-servers {{ name_server }}; option domain-name-servers {{ name_server }};
local-address {{ batman_ipv4 | ipaddr('address') }};
default-lease-time 3600; default-lease-time 3600;
max-lease-time 14400; max-lease-time 14400;