1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 19:52:06 +00:00
Commit graph

231 commits

Author SHA1 Message Date
A Holt
4f564ed670
Merge pull request #1453 from holta/iiab-network-dup-routes-fix
Change iiab.j2 to rpi.j2 to fix iiab-network dup route failings?
2019-02-26 13:34:06 -05:00
Anish Mangal
1cf55bdb70 Open PBX ports on WAN when pbx_enabled is true 2019-02-10 15:19:35 +00:00
A Holt
744e5328d1
Merge pull request #211 from tim-moody/minetest-rpi
sync from tim-moody:minetest-rpi
2019-02-07 19:06:02 -05:00
A Holt
b9b7261e81
Rename iiab.j2 to iiab.j2.deprecated 2019-02-07 11:02:06 -05:00
Anish Mangal
35c5ed3740
Update netplan.j2 2019-02-07 00:23:26 +05:30
Tim Moody
35ab675f2d minetest add port and include in 9 addons 2019-02-06 12:00:01 -05:00
A Holt
e4a1e13b06
open calibreweb_port (8083) requested by @m-anish 2019-01-31 14:35:11 -05:00
Anish Mangal
b78db708d3 Add nodered, mqtt ports to iptables-generator script 2019-01-15 13:43:39 +00:00
georgejhunt
7f9957aa55
0.3 patch1 (#1377)
* expand zim_versions_idx to include menuItem name, mediaCount, articleCount, size

* create a stub menuItem if none exists

* remember to change consumer of zim_version_idx in iiab-admin

* comment out some debugging prints

* do not change the name of a variable in iiab.ini

* consistent variable names for *_enabled

* start work on menus for enabled iiab roles

* changes to display cups in home menu

* remove reference to admin console which may not be installed

* print error message

* dict.get errors

* handle undefined menuItem"

* handle undefined menuItem again

* some work on logos

* break out the zim_versions_idx routines for use by update_menus in admin-console

* remove old menuDef creation code

* new variable names for zim_versions_idx

* missing the tags data in zim_versions_idx

* un-break-apart iiab-make-kiwix-lib.py

* return an empty string

* make size human_readable

* getting console and iiab to work together on menus

* add the new zim_date field to zim_versions_idx

* get the latest into repo

* found lost code iiab-make-kiwix-lib.py

* Create Lokole admin user during setup

* Add requested content to lokole readme
Per iiab/iiab#1293

* Update default password

* Add Lokole-IIAB user manual

* Update default_vars.yml

* Update local_vars_min.yml

* Update local_vars_min.yml

* Update local_vars_medium.yml

* Update local_vars_min.yml

* Update default_vars.yml

* Update local_vars_big.yml

* Update local_vars_medium.yml

* Update default_vars.yml

* Update default_vars.yml

* Update local_vars_min.yml

* Update local_vars_medium.yml

* Update local_vars_big.yml

* Update default_vars.yml

* Update default_vars.yml

* Update local_vars_big.yml

* Update local_vars_medium.yml

* Update local_vars_min.yml

* Update default_vars.yml

* Update local_vars_big.yml

* Update local_vars_medium.yml

* Update local_vars_min.yml

* Change admin username to uppercase

* Revert "Lokole: change admin to Admin per IIAB app norms"

* Update main.yml

* Update README.rst

* Update capture-wsgi.py

* Update main.yml

* Update main.yml

* Update default_vars.yml

* Update local_vars_big.yml

* Update local_vars_medium.yml

* Update local_vars_min.yml

* Update main.yml

* Update main.yml

* Update main.yml

* Update main.yml

* Update default_vars.yml

* Update local_vars_big.yml

* Update local_vars_medium.yml

* Update local_vars_min.yml

* Address TODOs in Lokole documentation

See https://github.com/ascoderu/opwen-webapp/issues/81

* Update main.yml

* Update local_vars_big.yml

* Update local_vars_medium.yml

* Update local_vars_big.yml

* Update local_vars_min.yml

* Update default_vars.yml

* expand zim_versions_idx to include menuItem name, mediaCount, articleCount, size

* create a stub menuItem if none exists

* remember to change consumer of zim_version_idx in iiab-admin

* comment out some debugging prints

* do not change the name of a variable in iiab.ini

* consistent variable names for *_enabled

* start work on menus for enabled iiab roles

* changes to display cups in home menu

* remove reference to admin console which may not be installed

* print error message

* dict.get errors

* handle undefined menuItem"

* handle undefined menuItem again

* some work on logos

* break out the zim_versions_idx routines for use by update_menus in admin-console

* remove old menuDef creation code

* new variable names for zim_versions_idx

* missing the tags data in zim_versions_idx

* un-break-apart iiab-make-kiwix-lib.py

* return an empty string

* make size human_readable

* getting console and iiab to work together on menus

* add the new zim_date field to zim_versions_idx

* get the latest into repo

* found lost code iiab-make-kiwix-lib.py
2019-01-10 14:26:47 -08:00
A Holt
fbe268569d
Merge pull request #1349 from holta/hotspot-on-off-commands
Update iiab-hotspot-on & -off commands from dhcpd to dnsmasq
2019-01-02 01:08:33 -05:00
A Holt
bb402fe24b
Update iiab-hotspot-off 2019-01-02 01:05:06 -05:00
A Holt
ac569245c5
Update iiab-hotspot-on 2019-01-02 01:04:41 -05:00
Jerry Vonau
4c93054d45 using supplied 01-netcfg.yaml as example
note the use of yes in place of true for dhcp4
2018-12-29 13:16:59 -06:00
Jerry Vonau
d6690b2537 lets not use netplan for bridges 2018-12-15 00:32:33 -06:00
Jerry Vonau
7cade0c052 boot time speed up 2018-12-15 00:32:33 -06:00
Jerry Vonau
69e36e9fc1 clean-up 2018-12-15 00:32:33 -06:00
A Holt
80f6902828 Update roles/network/templates/network/dnsmasq.service.u18
Co-Authored-By: jvonau <jvonau3@gmail.com>
2018-12-15 00:32:33 -06:00
Jerry Vonau
3167f8133a #1320 fix for U-18 dnsmasq 2018-12-15 00:32:33 -06:00
Jerry Vonau
343d00848f split out netplan2 2018-12-15 00:32:33 -06:00
George Hunt
1c32208d7b transition to using apache2 for wsgi 2018-12-05 21:03:12 +00:00
A Holt
73f9f7c3a0
Rename iiab-dnsmasq to dnsmasq-iiab 2018-12-03 02:19:31 -05:00
A Holt
04f4e48b1c
Rename roles/network/templates/iiab to roles/network/templates/network/iiab-dnsmasq 2018-12-03 02:18:44 -05:00
A Holt
a4a0d23a87
Create iiab 2018-12-03 02:15:29 -05:00
georgejhunt
84da40c40d
Cap2 (#1300)
* move captive portal to its own role

* runrole still not working

* make apache name consistent, define py_captive_portal_port

* record android fixes

* some progress -- windows8.1 works but detectportal.firefox active for both mac and windows

* works all platforms

* one captive_portal_install not changed to py_captive...

* port into defaults

* windows 7,8,10,mac,ios,android 5,7

* add # to dnsmasq.d/captive

* guess what android 8 might need

* move captive portal to its own role

* runrole still not working

* make apache name consistent, define py_captive_portal_port

* record android fixes

* some progress -- windows8.1 works but detectportal.firefox active for both mac and windows

* works all platforms

* one captive_portal_install not changed to py_captive...

* port into defaults

* windows 7,8,10,mac,ios,android 5,7

* add # to dnsmasq.d/captive

* guess what android 8 might need

* restart apache2 and dnsmasq in role

* do not hard code apache name

* cut out disfunctional experiments

* variable py_captive_portal_port misspelled

* add wildcard serveralias to box.lan vhost to fix default

* add in STDOUT to log

* remove the py_

* add in msn to urls to capture

* missed a few py_
2018-11-17 20:09:40 -08:00
root
b5efe25edb /etc/iiab/iiab.ini -> {{ iiab_ini_file }} 2018-10-15 07:01:09 -04:00
root
b973906dc3 iiab_env_file -> {{ iiab_env_file }} or "{{ iiab_env_file }}" 2018-10-15 06:41:58 -04:00
A Holt
a73c638181
Update iiab-gen-iptables 2018-10-03 14:47:21 -04:00
A Holt
e713a0705b
Update iiab-uncatch 2018-10-03 14:42:17 -04:00
A Holt
e6650b1313
Update iiab-catch 2018-10-03 14:41:20 -04:00
George Hunt
ac6c854646 change name of service, and test 2018-10-03 16:47:22 +00:00
George Hunt
25eb4acada remove the default debug logging that will use up SD card 2018-09-30 02:46:58 +00:00
George Hunt
f59dbfbce9 fix android 7 -- return non 204 2018-09-29 19:42:49 +00:00
George Hunt
4ee9c3e2b5 add in template dir
rebase bassed upon copy in

cut out obvious dead code

working on put-204

make users a sqlite db

sqlite db has users, and agent info

android timeouts not yet working

android 5 and 6 both work. lost mac

return to a working version for the MAC. Missing the splash

android,mac,windows all appear to work

sqlite get status of execute row == Null

initialize lasttimestamp with ajax call when home is triggered

remove commented code, move towards logging vs print statements

add logging with the -l flag

no changes to default_vars.yml

drop iptables captive portal stuff not using port 8090, and dnsmasq

missed deleting trap_enabled

fixes for 6.7 defaults

add in template dir

rebase bassed upon copy in

cut out obvious dead code

working on put-204

make users a sqlite db

sqlite db has users, and agent info

android timeouts not yet working

android 5 and 6 both work. lost mac

return to a working version for the MAC. Missing the splash

android,mac,windows all appear to work

sqlite get status of execute row == Null

initialize lasttimestamp with ajax call when home is triggered

remove commented code, move towards logging vs print statements

drop iptables captive portal stuff not using port 8090, and dnsmasq

missed deleting trap_enabled

fixes for 6.7 defaults

dispense with apache logs for captive portal, use the rotating portal.log instead

bring in clean defaults and py

Squash debugging details

remove backup file

still cannot dispense with cna on iphone. mac escape from cna broke with these changes

captive comes after iiab in apache config

one filename wrong

logging used for debug, lost mac escape from cna

typos

got mac/iphone full browser back

remove dead code

python was not creating db, or putting ip when first encountered
2018-09-29 03:40:14 +00:00
Tim Moody
746ce5f262 sync dhcpd so comes up at boot on rpi w 2018-09-08 17:46:59 -04:00
A Holt
11c2441059
Merge pull request #137 from arky/transmission
sync from arky/transmission
2018-08-28 16:41:23 -04:00
A Holt
f1dea552c4
Update hostapd.service.j2 2018-08-21 12:17:30 -04:00
Arky
62ed40a792 Correctly assign transmission_peer_port in iiab-gen-iptables 2018-08-20 16:36:02 +07:00
Arky
a4d4144156 Correct transmission variables and use 'to_json'
Ensure that transmission_http_port variable is not reset in
iiab-gen-iptables.

Remote the extra qoutes and also use to_json to clean the
transmission_kalite_languages output.

Restructure the defaults section.

Update the README documentation.
2018-08-20 16:36:02 +07:00
Arky
6e84639902 Proof-of-Concept: Install and Start downloading a torrent 2018-08-20 16:36:02 +07:00
A Holt
be2a9eb1ac
Update iiab-gen-iptables 2018-07-17 01:23:43 -04:00
A Holt
3c031c88a3
Update iiab-gen-iptables 2018-07-17 01:10:37 -04:00
A Holt
16e2cccec3
Update iiab-gen-iptables 2018-07-17 01:05:49 -04:00
Jerry Vonau
ca7c291ba5 use py_ for new captive_portal variables 2018-07-05 12:24:20 -05:00
Jerry Vonau
2f47e84696 use py_captive_portal_enabled and restore captive_portal_enabled 2018-07-05 10:57:38 -05:00
Jerry Vonau
516daefb27 use dns_jail_enabled for dnsmasq blackhole 2018-07-05 10:55:12 -05:00
Jerry Vonau
ef58b913aa use lan_ip in place of hardcoding 2018-07-04 08:32:24 -05:00
Jerry Vonau
418d941833 whitespace 2018-07-04 08:30:53 -05:00
Anish Mangal
5674675ef9 captive_portal service must run as root 2018-07-04 08:27:11 -05:00
Anish Mangal
74fb19864f Initial working copy of the captive portal 2018-07-04 08:27:11 -05:00
Jerry Vonau
aeacbe60ca tweaking iptables for captive portal 2018-07-04 08:27:11 -05:00
A Holt
9383cca879
Merge pull request #814 from georgejhunt/sugar
Sugarizer v1.0 migration
2018-06-21 12:09:27 -04:00
Jerry Vonau
6a47aa024f conditional captive portal 2018-06-01 12:33:03 -05:00
Jerry Vonau
656d7caeb0 don't use captive portal mode 2018-06-01 11:38:22 -05:00
George Hunt
732547b9e7 softcode sugarizer port, open iptables if services_externally_visible 2018-05-18 22:35:09 +00:00
Jerry Vonau
8167d9db71 missing %} 2018-05-14 10:34:59 -05:00
Jerry Vonau
7f02aa573f correct typo 2018-05-14 09:36:44 -05:00
Jerry Vonau
7d0cfc0f93 systemd-networkd support for wan static ip address 2018-05-13 21:13:34 -05:00
Jerry Vonau
450a346839 NetworkManager support for wan static ip address 2018-05-13 21:13:34 -05:00
Jerry Vonau
e7fc6cc36d ensure we want to use dhcp in template 2018-05-13 17:20:59 -05:00
Jerry Vonau
0c578c6a7d debian-9 clear out interfaces when static ip 2018-05-13 16:48:12 -05:00
Jerry Vonau
506ce3ffd3 debian-9 networking restart workaround 2018-05-13 15:27:09 -05:00
Jerry Vonau
72145ce13e update template to match distro 2018-05-13 10:56:55 -05:00
Jerry Vonau
ff7022b563 get rid of the stall with 'dhcp' 2018-05-12 23:13:27 -05:00
Jerry Vonau
1082dd2aa4 allow the console to back out of static 2018-05-12 22:44:08 -05:00
Jerry Vonau
db2b3b7ee1 netplan systemd-networkd static support 2018-05-12 22:44:08 -05:00
Jerry Vonau
76e84bec8b dhcpd staging 2018-05-02 21:27:15 -05:00
Jerry Vonau
039b584fb2 systemd-networkd fix-ups 2018-05-02 21:27:14 -05:00
Jerry Vonau
748235c4b7 start hostapd before dhcpd 2018-05-01 15:55:05 -05:00
A Holt
2c58341de5
record HOSTAPD_ENABLED=True into iiab.env 2018-04-04 03:27:41 -04:00
A Holt
fa47bc1d41
record HOSTAPD_ENABLED=False into iiab.env 2018-04-04 03:27:25 -04:00
A Holt
246515ed21
Update iiab-hotspot-on 2018-04-04 02:36:26 -04:00
Jerry Vonau
8c17fa14e4 NM correct permissions, lockout of hostapd, fix boot race 2018-03-25 23:59:09 -05:00
A Holt
1007a34347
Update iiab-hotspot-on 2018-01-11 00:02:09 -05:00
A Holt
50cdc51fd5
Update iiab-hotspot-off 2018-01-11 00:01:51 -05:00
A Holt
2cd342f180
Update iiab-hotspot-off 2018-01-10 23:47:39 -05:00
A Holt
91b0e4cf17
Update iiab-hotspot-on 2018-01-10 23:47:32 -05:00
A Holt
c138027c08
iiab-hotspot-on sets "hostapd_enabled = True" in /etc/iiab/iiab.ini 2018-01-10 23:41:18 -05:00
A Holt
de2550ed57
Update iiab-hotspot-off 2018-01-10 23:40:23 -05:00
A Holt
35aab19383
iiab-hotspot-off sets "hostapd_enabled = False" in /etc/iiab/iiab.ini 2018-01-10 23:33:22 -05:00
A Holt
b9f6dc5a7b
wlan0 promiscuous pn iiab-hotspot-off...only if rpi 2018-01-04 23:28:43 -05:00
A Holt
61e722a788
manually_toggle_AP: False -> hostapd_enabled: True 2018-01-01 11:11:37 -05:00
A Holt
1f98d7947a
Update iiab-hostapd.conf.j2 2017-12-28 22:34:28 -05:00
A Holt
764f301cb2
Update hostapd.conf.j2 2017-12-28 22:33:24 -05:00
A Holt
2d6d510e63
always support Ethernet-to-Internet on RPi: use discovered_wireless_iface (not iiab_wireless_lan_iface) to toggle AP 2017-12-28 19:28:20 -05:00
A Holt
8e17a4bc53
2 line breaks, to correspond w/ output of iiab-hostapd.conf.j2 2017-12-28 16:36:16 -05:00
A Holt
7ad820e0a9
on RPi put "#denyinterfaces wlan0" into /etc/dhcpcd.conf 2017-12-28 09:40:38 -05:00
A Holt
a349ff28c1
attempt to get Ethernet working also, during WiFi installs 2017-12-27 15:06:29 -05:00
A Holt
cde6430ce1
2 minor fixes to regexp 2017-12-27 13:34:09 -05:00
A Holt
66ed63c662
minor fix to regexp 2017-12-27 13:33:26 -05:00
Jerry Vonau
4f824c15ca use correct variable name 2017-12-07 17:52:52 -06:00
A Holt
3a729396f0
Merge pull request #554 from jvonau/U17-2
U17-2: refine network for Ubuntu 18.04 LTS daily builds
2017-12-07 12:46:34 -05:00
Jerry Vonau
dd0754fd7c force br0 to always be available on rpi 2017-12-03 09:47:03 -06:00
Jerry Vonau
bd5684cd10 dhcpd contol for iiab-hotspot-on|off 2017-11-24 13:05:43 -06:00
Jerry Vonau
7e4ff797e5 hand merge of systemd-net with a rename 2 2017-11-24 11:04:36 -06:00
Jerry Vonau
f73585aea1 keyfile layout 2017-11-22 17:20:46 -06:00
Jerry Vonau
b9d97bce4f provide NetworkManager.conf - and move prior to daemon-reload 2017-11-22 13:57:48 -06:00
Jerry Vonau
20398be41a partial 831e189795bf37d6c785a657a882556c3d649294 2017-11-20 11:20:20 -06:00
Jerry Vonau
61228a188e iiab-hotspot-on|off - no reboot needed post install 2017-11-20 11:20:20 -06:00
Jerry Vonau
30ee7a2449 iiab-hotspot-on|off 2017-11-20 11:20:20 -06:00
Jerry Vonau
e9aae150f4 rpi test 3 wifi flip on reboot 2017-11-20 11:17:16 -06:00
Jerry Vonau
d932185dcc rpi test 1 2017-11-20 11:17:16 -06:00
Jerry Vonau
450c04697d dnsmasq.conf based on George's template
https://raw.githubusercontent.com/georgejhunt/iiab/37e9c4cdbe55709cb306862f4d3324449ec011d5/roles/network/templates/network/dnsmasq.conf
2017-11-20 11:17:16 -06:00
Jerry Vonau
db2827a0ed removed unused templates & touchups 2017-11-13 09:59:14 -06:00
Jerry Vonau
0d5d494514 iptables 2017-11-13 09:59:13 -06:00
A Holt
84296a9de1
XSCE -> IIAB 2017-11-08 02:03:32 -05:00
Jerry Vonau
9fe05cbfd4 needs space or the next line is combined 2017-11-06 20:15:51 -06:00
Jerry Vonau
35cd2b44a5 iiab_wireless_lan_iface is defined for machines without wifi 2017-11-06 15:34:28 -06:00
Jerry Vonau
78a9434122 restore bridging for RPi and make optional 2017-11-06 15:34:28 -06:00
Jerry Vonau
6044abe401 dhcpcd.conf.j2 cleanup 2017-11-06 15:34:28 -06:00
Jerry Vonau
8c764acbca systemd.j2 touchups 2017-11-06 15:34:27 -06:00
Jerry Vonau
312f5a99ee adjust systemd.j2 2017-11-06 15:34:26 -06:00
Jerry Vonau
8e37472fbf running - double check after rebase 2017-11-06 15:34:26 -06:00
Jerry Vonau
ff22bcaf83 backport of 46c36b3e3542ffe5609ab5cc10a60de7335d6cd9 double check after rebase
backport of c837cde92304cfaf4a44c31dfb40bbadfd05fe04

backport of a0102669d2d842163d17d61e254dbd0ba8a3ea92

touch up

backport of a55c0555b6fb92a6b6b239a9dce2fde2100e7ae5
2017-11-06 15:34:25 -06:00
Jerry Vonau
de4be7c646 Everybody is testing debian.yml - Toggle dnsmasq_enabled False - edits
use hostapd.yml supplied templates sooner - remove systemd reload and restarted - move restarted to restart.yml

live testing
2017-11-06 12:33:41 -06:00
Jerry Vonau
8cf4481553 port dnsmasq over from nginx-rebase-eth0 - rebased edits 2017-11-06 12:33:41 -06:00
Jerry Vonau
054fa6b35d RFC - re-ordered to allow common shared parts 2017-11-06 12:33:41 -06:00
Jerry Vonau
cc8494608e reorder dhcpcd networking services - rebased edits
looks weird on redhat

add systemd reload
2017-11-06 12:33:41 -06:00
Jerry Vonau
c326a49de1 rename interfaces.j2 - rebased - edits 2017-11-06 12:33:41 -06:00
Jerry Vonau
78cd58ca8a boolean in template needs ==t/f 2017-11-06 12:33:41 -06:00
Arky
602223e4ff Adds spaces in variables after {{ and before }}
Fixes various warnings in Travis CI 

[EXTRA0001] Variables should have spaces after {{ and before }}
2017-10-20 11:36:10 +07:00
Jerry Vonau
9d2fb21705 permissions 2017-10-10 15:06:31 -05:00
georgejhunt
ed2b5d78f2 just move our config to interfaces.d (#247)
* just move our config to interfaces.d

* debian needs same fix as rpi

* try to recover/upgrade from putting wrong content in interfaces -- restore it

* modify dhcpcd.conf for gui static changes

* cannot comment out jinja2 with #, need to wipe the {%

* deny Lan for dhcpcd, will need work if wifi is used upstream

* attempt to change ip from console without requiring a reboot

* Revert "attempt to change ip from console without requiring a reboot"

This reverts commit 14c7499cdc.

Better not to break an upstream connection

* cleanup the iiab.j2 template --changing only comment lines
2017-09-15 22:31:09 -07:00
georgejhunt
58f078da43 xs_wan_device -> iiab_wan_device -- oops (#235) 2017-09-11 09:17:45 -07:00
georgejhunt
2f528a13de let dhcpcd do wan, make wan manual in interfaces for networking service (#238) 2017-09-11 09:17:16 -07:00
georgejhunt
5fdbe61aab defeat the iface renaming in debian 9 (#156) 2017-08-21 18:50:59 -07:00
Jerry Vonau
7abc3e2d68 Don't supply default gateway while in LanController mode (#130) 2017-07-17 12:19:01 -07:00
georgejhunt
4462652deb Iiab (#68)
* xs- goes to iiab-

* more xs->iiab

* sysconfig was forgotten

* hyphen vs underscore i roles network templates

* bulk sed on pgsql-xs

* create links for old script names

* missed named-xs -> named-iiab

* squid-xs ->squid-iiab

* misspelled squid-iiab.conf.j2
2017-06-27 19:53:13 -07:00
georgejhunt
f319afa432 Test (#20)
* change apache_data to apache_user in all

* no libapach2 in centos. just php. no php-magick in centos

* remove redundant vars entries

* do not create apache user

* missed one pound sign

* soft code all references to apache_user

* centos requires older setuptools

* revert ansible_lsb.id in xsce.yml

* try getting recent pip

* move pip download to 2prep so that kalite success is not dependent on iiab coming first

* still need to replace setuptools in kalite

* add curl -- needed in debian

* massivly substitue iiab for xsce, and rename files

* completed runansible

* centos fixes,install  pip

* appliance means no iptables rules

* change to earlier version of setuptools for centos

* delete file duplicate, hopefully unnecessary. generate the offline docs

* wiki docs errors

* create the admin group -- deleted earlier

* use the --yes option with pip uninstall

* base of repo moved from schoolserver to iiab, unleashkids.org->iiab.io

* network detection broken due to tupo
2017-06-09 16:25:56 -07:00
George Hunt
3da96de4e9 correct for ubuntu 2017-05-28 06:47:49 -07:00
George Hunt
cb344d7d47 patch 0002 2017-05-27 16:10:45 -07:00
George Hunt
845632d0ac initial checkin -- May 27, 2017 2017-05-27 11:09:50 -07:00