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

Adds spaces in variables after {{ and before }}

Browse source 
Fixes various warnings in Travis CI 

[EXTRA0001] Variables should have spaces after {{ and before }}
This commit is contained in:
Arky 2017-10-20 11:36:10 +07:00
parent 1d8e946b91
commit 602223e4ff
22 changed files with 48 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/network/templates/avahi/schoolserver.service
View file

@ -4,6 +4,6 @@
<name replace-wildcards="yes">MGMT console at %h </name>
<service>
<type>_https._tcp</type>
<port>{{gui_port}}</port>
<port>{{ gui_port }}</port>
</service>
</service-group>

5
roles/network/templates/dhcp/dhcpd-env.j2
View file

@ -1,8 +1,7 @@
## XS Config override
##
## This file has an ".in" template - for details see
## see /usr/share/doc/xs-config-<version>/README
## see /usr/share/doc/xs-config-<version>/README
#
# Point dhcpd to the XS-specific config
DHCPDARGS='-cf /etc/dhcpd-iiab.conf {{iiab_lan_iface}}'
DHCPDARGS='-cf /etc/dhcpd-iiab.conf {{ iiab_lan_iface }}'

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

@ -16,10 +16,10 @@ $IPTABLES -t nat -F
$IPTABLES -X
# first match wins
# Always accept loopback traffic
# Always accept loopback traffic
$IPTABLES -A INPUT -i lo -j ACCEPT
# Always drop rpc
# Always drop rpc
$IPTABLES -A INPUT -p tcp --dport 111 -j DROP
$IPTABLES -A INPUT -p udp --dport 111 -j DROP
# mysql
@ -73,10 +73,10 @@ clear_fw
$IPTABLES -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
$IPTABLES -A INPUT -m state --state NEW -i $lan -j ACCEPT
# Allow mDNS
# Allow mDNS
$IPTABLES -A INPUT -p udp --dport 5353 -j ACCEPT
#when run as gateway
#when run as gateway
$IPTABLES -A INPUT -p tcp --dport $ssh_port -m state --state NEW -i $wan -j ACCEPT
if [ "$gui_wan" == "True" ]; then
@ -96,9 +96,9 @@ fi
$IPTABLES -A FORWARD -i $wan -o $lan -m state --state ESTABLISHED,RELATED -j ACCEPT
#Block https traffic except if directed at server
if [ "$gw_block_https" == "True" ]; then
if [ "$gw_block_https" == "True" ]; then
$IPTABLES -A FORWARD -p tcp ! -d 172.18.96.1 --dport 443 -j DROP
fi
fi
# Allow outgoing connections from the LAN side.
$IPTABLES -A FORWARD -i $lan -o $wan -j ACCEPT
@ -108,8 +108,8 @@ $IPTABLES -A FORWARD -i $wan -o $lan -j DROP
$IPTABLES -A INPUT -i $wan -j DROP
if [ "$block_DNS" == "True" ];then
$IPTABLES -t nat -A PREROUTING -i $lan -p tcp --dport 53 ! -d {{lan_ip}} -j DNAT --to {{lan_ip}}:53
$IPTABLES -t nat -A PREROUTING -i $lan -p udp --dport 53 ! -d {{lan_ip}} -j DNAT --to {{lan_ip}}:53
$IPTABLES -t nat -A PREROUTING -i $lan -p tcp --dport 53 ! -d {{ lan_ip }} -j DNAT --to {{ lan_ip }}:53
$IPTABLES -t nat -A PREROUTING -i $lan -p udp --dport 53 ! -d {{ lan_ip }} -j DNAT --to {{ lan_ip }}:53
fi
if [ -f /etc/sysconfig/xs_httpcache_on ]; then

9
roles/network/templates/network/br0.j2
View file

@ -3,7 +3,7 @@
# we always want the wireless to be configured (and under bridge)
auto {{ discovered_wireless_iface }}
iface {{discovered_wireless_iface }} inet manual
iface {{ discovered_wireless_iface }} inet manual
pre-up ifconfig $IFACE up
pre-down ifconfig $IFACE down
@ -13,7 +13,7 @@ auto {{ discovered_wan_iface }}
{% if gui_static_wan == false %}
iface {{ discovered_wan_iface }} inet dhcp
pre-up ip link set br0 down && brctl delbr br0
{% else %} # gui_static_wan_ip is set
{% else %} # gui_static_wan_ip is set
iface {{ discovered_wan_iface }} inet static
# pre-up ip link set br0 down && brctl delbr br0
address {{ gui_static_wan_ip }}
@ -25,7 +25,7 @@ iface {{ discovered_wan_iface }} inet static
################# GATEWAY #########################
auto br0
iface br0 inet static
bridge_ports {{ discovered_wireless_iface }}
bridge_ports {{ discovered_wireless_iface }}
address {{ lan_ip }}
netmask {{ lan_netmask }}
dns-nameservers {{ lan_ip }}
@ -36,7 +36,7 @@ allow-hotplug {{ discovered_wan_iface }}
iface {{ discovered_wan_iface }} inet manual
pre-up ifconfig $IFACE up
pre-down ifconfig $IFACE down
{% else %} # gui_static_wan_ip is set
{% else %} # gui_static_wan_ip is set
iface {{ discovered_wan_iface }} inet static
address {{ gui_static_wan_ip }}
netmask {{ gui_static_wan_netmask }}
@ -58,4 +58,3 @@ iface br0 inet static
dns-search {{ iiab_domain }}
post-up systemctl restart dhcpd && systemctl restart hostapd
{% endif %}

3
roles/network/templates/network/iiab.j2
View file

@ -6,7 +6,7 @@
{% if discovered_wireless_iface != 'none' %}
auto {{ discovered_wireless_iface }}
iface {{discovered_wireless_iface }} inet manual
iface {{ discovered_wireless_iface }} inet manual
{% endif %}
{% if iiab_network_mode == "Appliance" %}
@ -45,4 +45,3 @@ iface br0 inet static
dns-search {{ iiab_domain }}
post-up systemctl restart dhcpd && systemctl restart hostapd
{% endif %}