external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #207 from iiab/master

Browse source 
sync from iiab/iiab
This commit is contained in:
A Holt 2019-01-31 20:18:12 -05:00 committed by GitHub
commit ad9fdbb788
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/2-common/tasks/packages.yml
View file

@ -14,11 +14,11 @@
state: present state: present
when: is_redhat when: is_redhat
- name: Install {{ iiab_download_url }}/usbmount_0.0.14.1_all.deb, missing from Debian (debian-9, debian-10 and not raspbian-9) - name: Install {{ iiab_download_url }}/usbmount_0.0.14.1_all.deb, missing from Debian (debian-9 or debian-10, if NOT rpi)
apt: apt:
deb: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb" deb: "{{ iiab_download_url }}/usbmount_0.0.14.1_all.deb"
#timeout: "{{ download_timeout }}" # Ansible's apt module doesn't support timeout parameter; that's ok as usbmount_0.0.14.1_all.deb is only 10KB #timeout: "{{ download_timeout }}" # Ansible's apt module doesn't support timeout parameter; that's ok as usbmount_0.0.14.1_all.deb is only 10KB
when: internet_available and is_debian_9 or is_debian_10 and not is_raspbian_9 when: internet_available and (is_debian_9 or is_debian_10) and not is_rpi
- name: "Install 7 deb/apt packages: avahi-daemon, avahi-discover, exfat-fuse, exfat-utils, inetutils-syslogd, libnss-mdns, wpasupplicant (debuntu)" - name: "Install 7 deb/apt packages: avahi-daemon, avahi-discover, exfat-fuse, exfat-utils, inetutils-syslogd, libnss-mdns, wpasupplicant (debuntu)"
package: package:

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

@ -62,7 +62,7 @@
value: "{{ squid_enabled }}" value: "{{ squid_enabled }}"
- option: wondershaper_enabled - option: wondershaper_enabled
value: "{{ wondershaper_enabled }}" value: "{{ wondershaper_enabled }}"
- option: iiab_network_mode(applied) - option: iiab_network_mode_applied
value: "{{ iiab_network_mode }}" value: "{{ iiab_network_mode }}"
- option: dhcpd_enabled - option: dhcpd_enabled
value: "{{ dhcpd_enabled }}" value: "{{ dhcpd_enabled }}"
@ -72,5 +72,5 @@
value: "{{ named_enabled }}" value: "{{ named_enabled }}"
- option: dnsmasq_enabled - option: dnsmasq_enabled
value: "{{ dnsmasq_enabled }}" value: "{{ dnsmasq_enabled }}"
# - option: no_net_restart - option: no_net_restart
# value: "{{ no_net_restart }}" value: "{{ no_net_restart }}"

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

@ -55,6 +55,7 @@ gui_port={{ gui_port }}
iiab_gateway_enabled={{ iiab_gateway_enabled }} iiab_gateway_enabled={{ iiab_gateway_enabled }}
services_externally_visible={{ services_externally_visible }} services_externally_visible={{ services_externally_visible }}
calibre_port={{ calibre_port }} calibre_port={{ calibre_port }}
calibreweb_port={{ calibreweb_port }}
kiwix_port={{ kiwix_port }} kiwix_port={{ kiwix_port }}
kalite_server_port={{ kalite_server_port }} kalite_server_port={{ kalite_server_port }}
kolibri_http_port={{ kolibri_http_port }} kolibri_http_port={{ kolibri_http_port }}
@ -96,6 +97,7 @@ if [ "$services_externally_visible" == "True" ]; then
$IPTABLES -A INPUT -p tcp --dport $kalite_server_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $kalite_server_port -m state --state NEW -i $wan -j ACCEPT
$IPTABLES -A INPUT -p tcp --dport $kolibri_http_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $kolibri_http_port -m state --state NEW -i $wan -j ACCEPT
$IPTABLES -A INPUT -p tcp --dport $calibre_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $calibre_port -m state --state NEW -i $wan -j ACCEPT
$IPTABLES -A INPUT -p tcp --dport $calibreweb_port -m state --state NEW -i $wan -j ACCEPT
$IPTABLES -A INPUT -p tcp --dport $cups_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $cups_port -m state --state NEW -i $wan -j ACCEPT
$IPTABLES -A INPUT -p tcp --dport $sugarizer_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $sugarizer_port -m state --state NEW -i $wan -j ACCEPT
$IPTABLES -A INPUT -p tcp --dport $nodered_port -m state --state NEW -i $wan -j ACCEPT $IPTABLES -A INPUT -p tcp --dport $nodered_port -m state --state NEW -i $wan -j ACCEPT