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

Merge branch 'master' into azuracast

Browse source
This commit is contained in:
A Holt 2019-06-22 14:27:24 -04:00 • committed by GitHub
commit 84cfd2b789
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 54 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,8 +45,8 @@
set_fact:
named_enabled: False
dhcpd_enabled: False
dnsmasq_enabled: False
dhcp_service2: "dnsmasq disabled"
dnsmasq_enabled: True
dhcp_service2: "dnsmasq"
when: dnsmasq_install and iiab_network_mode == "Appliance"
- name: Add 'network' variable values (from computed_services.yml) to {{ iiab_ini_file }}

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

@ -10,7 +10,7 @@
lineinfile:
path: /etc/hosts
regexp: '^172\.18\.96\.1'
line: '172.18.96.1 {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box box.lan pbx pbx.lan'
line: '172.18.96.1 {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box box.lan'
state: present
when: iiab_lan_iface != "none" and not installing

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

@ -74,6 +74,6 @@
systemd:
name: "{{ dhcp_service2 }}"
state: restarted
when: (iiab_network_mode != "Appliance") # Sufficient b/c br0 exists thanks to /etc/network/interfaces.d/iiab
#when: (iiab_network_mode != "Appliance") # Sufficient b/c br0 exists thanks to /etc/network/interfaces.d/iiab
#when: (iiab_network_mode != "Appliance") and (not no_net_restart)
#when: iiab_network_mode != "Appliance" and iiab_wan_iface != discovered_wireless_iface

2
roles/network/templates/gateway/iiab-gen-iptables
View file

@ -66,6 +66,7 @@ minetest_port={{ minetest_port }}
mosquitto_port={{ mosquitto_port }}
nodered_port={{ nodered_port }}
pbx_enabled={{ pbx_enabled }}
pbx_http_port={{ pbx_http_port }}
pbx_signaling_ports_chan_sip={{ pbx_signaling_ports_chan_sip }}
pbx_signaling_ports_chan_pjsip={{ pbx_signaling_ports_chan_pjsip }}
pbx_data_ports={{ pbx_data_ports }}
@ -158,6 +159,7 @@ if [ "$wan" != "none" ]; then
$IPTABLES -A INPUT -p tcp --dport $nodered_port -m state --state NEW -i $wan -j ACCEPT
if [ "$pbx_enabled" == "True" ]; then
$IPTABLES -A INPUT -p tcp --dport $pbx_http_port -m state --state NEW -i $wan -j ACCEPT
$IPTABLES -A INPUT -p udp --dport $pbx_signaling_ports_chan_sip -m state --state NEW -i $wan -j ACCEPT
$IPTABLES -A INPUT -p udp --dport $pbx_signaling_ports_chan_pjsip -m state --state NEW -i $wan -j ACCEPT
$IPTABLES -A INPUT -p udp --dport $pbx_data_ports -m state --state NEW -i $wan -j ACCEPT

2
roles/network/templates/network/dhcpcd.conf.j2
View file

@ -61,5 +61,5 @@ static domain_name_servers=127.0.0.1
interface {{ iiab_wan_iface }}
static ip_address={{ wan_ip }}/24
static routers={{ wan_gateway }}
domain_name_servers= {{ wan_nameserver }}
static domain_name_servers={{ wan_nameserver }}
{% endif %}