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

466 commits

Author SHA1 Message Date
A Holt
237547f9da
exclude wired interface for RPi 2019-02-26 13:05:10 -05:00
A Holt
3ec408fbd1
cleaner, on @jvonau's recommendation 2019-02-25 12:00:46 -05:00
A Holt
fa8ac3606d
@jvonau: suppress restarting of dnsmasq if initial install is using WiFi 2019-02-25 11:56:57 -05:00
Anish Mangal
425df6b4f0 Add pbx and pbx.lan to /etc/hosts 2019-02-06 21:15:43 +00:00
A Holt
9edce23829
Update rpi_debian.yml 2019-02-05 13:10:19 -05:00
A Holt
3957891c36
Update rpi_debian.yml 2019-02-05 12:59:03 -05:00
A Holt
e2120ef8aa
Change iiab.j2 to rpi.j2 to fix #1452 dup route problem? 2019-02-05 12:56:51 -05:00
A Holt
1f8c3f78cb
Update computed_services.yml 2019-01-31 14:29:19 -05:00
A Holt
c160e0e1d7
Merge pull request #1407 from jvonau/move_dnsmasq
Move dnsmasq config file to /etc/dnsmasq.d/
2019-01-17 15:04:05 -05:00
A Holt
e5abe54373
Update enable_services.yml 2019-01-17 15:03:12 -05:00
Jerry Vonau
04928693b1 as requested in chat 2019-01-17 12:43:50 -06:00
Jerry Vonau
f43f2f4d77 move dnsmasq config file to /etc/dnsmasq.d/
Bugfix don't supply named/bind files when not enabled.
2019-01-17 10:41:55 -06:00
A Holt
63fda2b290
Update main.yml 2019-01-16 04:49:30 -05:00
Jerry Vonau
2550eb4d04 Don't auto reinstall named, dhcpd when install is False
Trigger is change in hostname away from what is set in local_vars.
2019-01-16 03:32:40 -06:00
A Holt
a654b64476
box.lan NOT iiab-server.lan 2019-01-10 19:12:56 -05:00
Jerry Vonau
9254e4b400 fix WiFi as gateway 2019-01-02 01:32:40 -06:00
Jerry Vonau
346ad4cde6 cheap unmasking 2018-12-29 14:14:56 -06:00
Jerry Vonau
4c14ae3e37 use .yaml instead of .yml 2018-12-29 13:49:06 -06:00
Jerry Vonau
0827827925 use .yml with file name, allow removal of more than one file name 2018-12-29 11:47:18 -06:00
Jerry Vonau
00152a0769 use iiab-dnsmasq.service everywhere 2018-12-19 15:58:53 -06:00
Jerry Vonau
f4a99abaf2 less time without services 2018-12-16 07:22:38 -06:00
Jerry Vonau
82e1a6fe63 use netplan for static wan interface on U-18 2018-12-16 06:39:19 -06:00
A Holt
ab8017647a
Apply suggestions from code review
as requested

Co-Authored-By: jvonau <jvonau3@gmail.com>
2018-12-16 06:26:55 -06:00
Jerry Vonau
bba77de643 yaml syntax 2018-12-15 18:55:18 +00:00
Jerry Vonau
3e36883758 networkd only 2018-12-15 00:32:33 -06:00
Jerry Vonau
d6690b2537 lets not use netplan for bridges 2018-12-15 00:32:33 -06:00
A Holt
f24e600945 Update roles/network/tasks/netplan.yml
Co-Authored-By: jvonau <jvonau3@gmail.com>
2018-12-15 00:32:33 -06:00
A Holt
c0f2d38d1c Update roles/network/tasks/netplan.yml
Co-Authored-By: jvonau <jvonau3@gmail.com>
2018-12-15 00:32:33 -06:00
A Holt
eb9a222887 Update roles/network/tasks/netplan.yml
Co-Authored-By: jvonau <jvonau3@gmail.com>
2018-12-15 00:32:33 -06:00
Jerry Vonau
27470ab830 stdout_lines 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
967102bc4f easier way to disable cloud-init 2018-12-15 00:32:33 -06:00
Jerry Vonau
14dd29eba4 refine netplan2 2018-12-15 00:32:33 -06:00
Jerry Vonau
d0c66fb4d3 refine netplan 2018-12-15 00:32:33 -06:00
Jerry Vonau
343d00848f split out netplan2 2018-12-15 00:32:33 -06:00
Jerry Vonau
93694e853b split out netplan 2018-12-15 00:32:33 -06:00
A Holt
e74dd2def1
Update named.yml 2018-12-03 03:05:17 -05:00
A Holt
15d5405295
Update named.yml 2018-12-03 02:54:49 -05:00
A Holt
ff10a576f3
Update dnsmasq.yml 2018-12-03 02:31:12 -05:00
A Holt
5353d725a8
Update dnsmasq.yml 2018-12-03 02:30:16 -05:00
A Holt
d05123afe9
Allow systemd-resolved AND dnsmasq to work (#1306) 2018-12-03 02:23:39 -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
A Holt
57e0747564
Update restart.yml 2018-11-03 23:39:03 -04:00
A Holt
c7854d760d
Update named.yml 2018-10-31 14:12:08 -04:00
A Holt
858306b547
Update named.yml 2018-10-31 14:02:37 -04:00
A Holt
7c79fed0ae
Update squid.yml 2018-10-31 13:51:10 -04:00
A Holt
f8b28cfc6d
Update enable_services.yml 2018-10-31 03:58:55 -04:00
A Holt
b3adcfff6e
Update dansguardian.yml 2018-10-30 20:53:32 -04:00
A Holt
ca15a70c00
Update squid.yml 2018-10-30 20:51:21 -04:00
A Holt
5e956b9203
Update dansguardian.yml 2018-10-28 12:19:01 -04:00
A Holt
b6e842f38b
Update squid.yml 2018-10-28 12:09:55 -04:00
A Holt
1b1744c2b5
Update named.yml 2018-10-28 12:07:44 -04:00
A Holt
d37c0acc88
Update captive_portal.yml 2018-10-27 20:54:44 -04: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
root
d9c73cc804 service_filelist -> iiab_ini_file 2018-10-15 06:13:57 -04:00
A Holt
a0d62e87fb
Update detected_network.yml 2018-10-15 04:54:01 -04:00
A Holt
ad247eb8b4
Update computed_services.yml 2018-10-15 04:53:40 -04:00
A Holt
89cf8be11d
Update computed_network.yml 2018-10-15 04:53:20 -04:00
A Holt
15df488fce
Update rpi_debian.yml 2018-10-09 17:21:25 -04:00
A Holt
eaf81d0d6b
Update computed_services.yml 2018-10-09 16:52:20 -04:00
Jerry Vonau
9d616cf301 explicitly identify which primary dhcp server is being disabled
dhcp_service2 is used in restart.yml when not in Appliance mode
2018-10-09 12:20:03 -05:00
Jerry Vonau
bb6b3c2ab2 Explicitly disable dnsmasq when in Appliance mode
otherwise dnsmasq will become active upon reboot because enable_services.yml
would still be acting upon local_vars.yml where dnsmasq_enabled is set to True
while there is not LAN interface available to bind the service to.
2018-10-09 11:50:00 -05:00
A Holt
ababc0cba7
Update hosts.yml 2018-10-08 19:34:04 -04:00
A Holt
2f3fb69e01
Merge branch 'master' into dnsmasq-initial-cleanup 2018-10-08 19:32:08 -04:00
A Holt
691fb23f83
Update avahi.yml 2018-10-08 19:14:10 -04:00
A Holt
b96b6f42ac
Update main.yml 2018-10-08 19:03:26 -04:00
A Holt
aa1c8287d5
Update edit_ifcfg.yml 2018-10-08 19:00:25 -04:00
A Holt
30c4f2a868
Update enable_wan.yml 2018-10-08 18:55:09 -04:00
A Holt
c6e6f7967c
Update hosts.yml 2018-10-08 18:49:04 -04:00
A Holt
27e04ebe0e
Update named.yml 2018-10-08 18:40:11 -04:00
A Holt
e94077fc3d
Update redetect.yml 2018-10-08 18:34:16 -04:00
A Holt
20988fda38
Update squid.yml 2018-10-08 18:30:21 -04:00
A Holt
73a2ce03da
Update static.yml 2018-10-08 18:29:15 -04:00
A Holt
d81a6788a6
Update wondershaper.yml 2018-10-08 18:24:17 -04:00
A Holt
0d0ef2fd39
Update NM.yml 2018-10-08 18:15:50 -04:00
A Holt
62e1a07e53
Update avahi.yml 2018-10-08 18:09:49 -04:00
A Holt
31388eee9d
Rename create_ifcfg.yml to create_ifcfg.yml.deprecated 2018-10-08 18:00:22 -04:00
A Holt
2004e621e9
Update detected_network.yml 2018-10-08 17:58:38 -04:00
A Holt
535dca7fca
Update detected_redhat.yml 2018-10-08 17:52:40 -04:00
A Holt
4986aef070
Update detected_redhat.yml 2018-10-08 17:51:15 -04:00
A Holt
394a308d72
Update dhcpd.yml 2018-10-08 17:44:35 -04:00
A Holt
c32fc5c7d6
Update dhcpd.yml 2018-10-08 17:13:03 -04:00
A Holt
5bf67f847c
Update computed_services.yml 2018-10-08 17:05:44 -04:00
A Holt
5b129ec79b
Update computed_network.yml 2018-10-08 17:04:00 -04:00
A Holt
30550052f1
Update computed_services.yml 2018-10-08 15:51:21 -04:00
A Holt
6645cc284e
Update hosts.yml 2018-10-03 18:20:00 -04:00
A Holt
9cbf08cf8f
Update captive_portal.yml 2018-10-03 16:14:15 -04:00
A Holt
a6b0bceef8
Update captive_portal.yml 2018-10-03 15:57:07 -04:00
A Holt
d41abbbbc3
Update hosts.yml 2018-10-03 14:52:04 -04:00
George Hunt
ac6c854646 change name of service, and test 2018-10-03 16:47:22 +00:00
George Hunt
b11b46ccd0 use hard coded iiab-servar.lan as a link between client redirects and our server 2018-10-02 02:30:52 +00:00
George Hunt
e26aa688c7 with_items 2018-10-01 18:52:00 +00:00
George Hunt
18d2315438 service->systemd 2018-10-01 18:27:54 +00:00
George Hunt
c91cb6cd32 no change to hosts 2018-10-01 18:18:36 +00:00
George Hunt
f91c67ad58 fix dual when 2018-10-01 18:16:51 +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
A Holt
d97f62edf9
Update main.yml 2018-08-21 12:45:38 -04:00
A Holt
b3a7af09c5
Update named.yml 2018-07-20 05:16:57 -04:00
A Holt
1d128593ee
Update debian.yml 2018-07-17 02:01:01 -04:00
A Holt
5161152432
Update debian.yml 2018-07-17 01:57:12 -04:00
A Holt
b3dbf16a27
Update ifcfg_mods.yml 2018-07-17 01:56:14 -04:00
A Holt
0247ee1930
Update debian.yml 2018-07-17 01:54:14 -04:00
A Holt
74dca68882
Update down-debian.yml 2018-07-17 01:49:14 -04:00
A Holt
7790fd6624
Update ifcfg_mods.yml 2018-07-17 01:48:19 -04:00
A Holt
44c1c0293a
Update restart.yml 2018-07-17 01:41:51 -04:00
A Holt
eb1f6a5dcc
Update enable_services.yml 2018-07-12 14:04:52 -04:00
A Holt
281e0de791
Update enable_services.yml 2018-07-12 13:51:59 -04:00
A Holt
1337b651ac
modern Ansible syntax/style for readability 2018-07-12 13:50:32 -04:00
A Holt
d9398e39a7
modern Ansible syntax/style for readability 2018-07-12 13:36:44 -04:00
Jerry Vonau
cc09adb677 replace named-iiab.conf to pickup changes in dns_jail_enabled 2018-07-04 09:29:05 -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
A Holt
b04a6147e9
typo in comment: counry -> country 2018-06-29 17:40:50 -04:00
A Holt
11d18826c7
Update dnsmasq.yml 2018-06-14 15:22:11 -04:00
A Holt
831107839f
@jvonau requests we comment out most lines for now 2018-06-14 15:18:06 -04:00
A Holt
fa150095a6
commas were missing; fix to path roles/network/templates/network/dnsmasq.conf.j2 2018-06-14 14:56:42 -04:00
Jerry Vonau
1db445aacb use full path otherwise .j2 is used - no need to supply systemd unit file 2018-06-01 11:16:30 -05:00
Jerry Vonau
f6e16fea68 setup installing dnsmasq 2018-06-01 10:56:16 -05:00
Jerry Vonau
1267c1e19c Fallback to old gateway info when WAN is not detected when configuring static ip 2018-05-31 11:20:35 -05:00
Jerry Vonau
7501d256f8 handle different netplan file name 2018-05-20 11:57:10 -05:00
Jerry Vonau
5ca184297e handle systemd-networkd having enabled-runtime 2018-05-20 11:34:02 -05:00
Jerry Vonau
36217b7b3f allow backout from static to dhcp 2018-05-14 13:22:32 -05:00
Jerry Vonau
0ad689711f missing .j2 2018-05-14 10:02:32 -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
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
90ffdb9f69 netplan file change only for ubuntu-18 2018-05-13 12:09:31 -05:00
Jerry Vonau
ff7022b563 get rid of the stall with 'dhcp' 2018-05-12 23:13:27 -05:00
Jerry Vonau
aad974777a needed for dhcp now 2018-05-12 22:44:08 -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
852d14dbde correct false postive, numbers need quotes 2018-05-05 07:57:04 -05:00
Jerry Vonau
1dda6adf6d Disable isc-dhcp-server6.service on ubuntu-18 2018-05-03 09:40:08 -05:00
Jerry Vonau
e74cc9e241 Disable and mask systemd-networkd-wait-online on ubuntu-18 2018-05-03 08:10:31 -05:00
Jerry Vonau
039b584fb2 systemd-networkd fix-ups 2018-05-02 21:27:14 -05:00
Jerry Vonau
e2c641e974 allow br0 removel 2018-05-02 21:27:14 -05:00
Jerry Vonau
4ed7c38f4f NM not playing nice on ubuntu-16, use older method 2018-05-01 14:40:04 -05:00
Jerry Vonau
50ad0de6be revise feedback 2018-04-08 19:57:49 -05:00
Jerry Vonau
5a0a37d064 scripts only apply to the RPi 2018-04-08 19:46:31 -05:00
Jerry Vonau
ceb4d7d901 hostapd - disable before enable
Similar workarounds exist in named.yml and dhcpd.yml, just go with the flow
2018-04-08 19:23:13 -05:00
Jerry Vonau
367164029c replace shell use of daemon_reload with systemd module, use systemd module in place of service for hostapd 2018-04-07 17:31:36 -05:00
Jerry Vonau
e7872a2a9d fix enabling hostapd 2018-04-07 11:50:13 -05:00
A Holt
902b473f5b
Merge pull request #726 from georgejhunt/fix6.5
fix6.5 - auto-enable hostapd (during Ethernet install of IIAB)
2018-04-05 12:17:59 -04:00
A Holt
464488da62
Update main.yml 2018-04-04 04:16:51 -04:00
A Holt
aec942f75a
Update main.yml 2018-04-04 03:57:33 -04:00
A Holt
1396704aff
record HOSTAPD_ENABLED=<value> into iiab.env 2018-04-04 03:15:19 -04:00
George Hunt
95ea759fa0 Merge branch 'fix6.5' of https://github.com/georgejhunt/iiab into fix6.5 2018-03-31 00:02:25 +00:00