1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Merge pull request #326 from iiab/master

sync from iiab:master
This commit is contained in:
A Holt 2020-01-07 12:02:11 -05:00 committed by GitHub
commit 0c132ec90a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 32 additions and 29 deletions

3
roles/httpd/README.md Normal file
View file

@ -0,0 +1,3 @@
See also Internet-in-a-Box's new NGINX README.md, evolving here:
[https://github.com/iiab/iiab/tree/master/roles/nginx](../nginx)

View file

@ -5,7 +5,7 @@
# apache_high_php_limits: False # apache_high_php_limits: False
# WARNING: Enabling this might cause excess use of RAM/disk or other resources! # WARNING: Enabling this might cause excess use of RAM/disk or other resources!
# SO AFTER INSTALLING IIAB, VERIFY THAT THESE 5 SETTINGS... # SO AFTER INSTALLING IIAB, VERIFY THAT THESE 5 SETTINGS...
# https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/main.yml#L80-L84 # https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/enable.yml#L1-L14
# ...ARE SUITABLE FOR YOUR HARDWARE IN /etc/php/<VERSION>/apache2/php.ini # ...ARE SUITABLE FOR YOUR HARDWARE IN /etc/php/<VERSION>/apache2/php.ini
# Make this False to disable http://box/common/services/power_off.php button: # Make this False to disable http://box/common/services/power_off.php button:

View file

@ -1,7 +1,7 @@
# This configuration file supplements the main Apache # This configuration file supplements the main Apache
# server configuration file (conf/httpd.conf). It contains the # server configuration file (conf/httpd.conf). It contains the
# configuration directives that specifically relate to the # configuration directives that specifically relate to the
# XSCE Schoolserver. # IIAB Schoolserver.
# #
# Some of the choices are a bit subjective, but in general directives # Some of the choices are a bit subjective, but in general directives
# that are still valid in 2.4 are left if they override something # that are still valid in 2.4 are left if they override something
@ -214,7 +214,7 @@ DocumentRoot "{{ doc_root }}"
# negotiated documents. The MultiViews Option can be used for the # negotiated documents. The MultiViews Option can be used for the
# same purpose, but it is much slower. # same purpose, but it is much slower.
# #
# XSCE has both multiview and .var strategies # IIAB has both multiview and .var strategies
DirectoryIndex index.html index.html.var DirectoryIndex index.html index.html.var

View file

@ -77,12 +77,13 @@
# become_user: "{{ kolibri_user }}" # become_user: "{{ kolibri_user }}"
# when: kolibri_provision | bool # when: kolibri_provision | bool
- name: Set Kolibri default language ({{ kolibri_language }}) # 2020-01-05: Deprecated per https://github.com/iiab/iiab/issues/2103
shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}" #- name: Set Kolibri default language ({{ kolibri_language }})
ignore_errors: yes # shell: export KOLIBRI_HOME="{{ kolibri_home }}" && "{{ kolibri_exec_path }}" language setdefault "{{ kolibri_language }}"
become: yes # ignore_errors: yes
become_user: "{{ kolibri_user }}" # become: yes
when: kolibri_provision | bool # become_user: "{{ kolibri_user }}"
# when: kolibri_provision | bool
- name: 'Provision Kolibri, while setting: facility name, admin acnt / password, preset type, and language' - name: 'Provision Kolibri, while setting: facility name, admin acnt / password, preset type, and language'
shell: > shell: >

View file

@ -1,4 +1,4 @@
# generated by XSCE # Generated by IIAB
# gui_desired_network_role is {{ gui_desired_network_role }} # gui_desired_network_role is {{ gui_desired_network_role }}
# we always want the wireless to be configured (and under bridge) # we always want the wireless to be configured (and under bridge)

View file

@ -1,4 +1,4 @@
# Generated by XSCE # Generated by IIAB
NAME="iiab-WAN" NAME="iiab-WAN"
TYPE="Ethernet" TYPE="Ethernet"
DEFROUTE="yes" DEFROUTE="yes"

View file

@ -1,4 +1,4 @@
# Generated by XSCE # Generated by IIAB
TYPE=Ethernet TYPE=Ethernet
BOOTPROTO=none BOOTPROTO=none
BRIDGE=br0 BRIDGE=br0

View file

@ -1,4 +1,4 @@
# Generated by XSCE # Generated by IIAB
{% if iiab_lan_iface == "br0" %} {% if iiab_lan_iface == "br0" %}
DEVICE=br0 DEVICE=br0
TYPE=Bridge TYPE=Bridge

View file

@ -1,4 +1,4 @@
# Generated by XSCE for wifi-slave # Generated by IIAB for wifi-slave
# used mostly for the NM_CONTROLLED part # used mostly for the NM_CONTROLLED part
TYPE=Ethernet TYPE=Ethernet
BOOTPROTO=none BOOTPROTO=none

View file

@ -33,7 +33,7 @@ To further refine Nextcloud access controls based on IPv4 addresses, you can edi
- max_execution_time - max_execution_time
- max_input_time - max_input_time
Useful PHP recommendations for these settings (while largely tailored to WordPress, and aimed at very low-end hardware) can be found here: [/opt/iiab/iiab/roles/httpd/tasks/main.yml](https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/main.yml#L80-L84) Useful PHP recommendations for these settings (while largely tailored to WordPress, and aimed at very low-end hardware) can be found here: [/opt/iiab/iiab/roles/httpd/tasks/enable.yml](https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/enable.yml#L1-L14)
## Using It ## Using It

View file

@ -2,7 +2,7 @@
RACHEL README RACHEL README
============= =============
This is the second pass at adding RACHEL (http://www.rachel.worldpossible.org/) to XSCE. This is the second pass at adding RACHEL (http://www.rachel.worldpossible.org/) to IIAB.
It takes RACHEL in its entirety and the download must be copied manually. It takes RACHEL in its entirety and the download must be copied manually.
This version is based on rachelusb_32EN_3.1.5.zip. This version is based on rachelusb_32EN_3.1.5.zip.

View file

@ -144,9 +144,9 @@ dns_jail_enabled: False
# Python-based Captive Portal, that @m-anish & @jvonau experimented with in # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
# July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
# extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070). # extensively later refined (PRs #1179, #1300, #1327, #2070).
captiveportal_install: False captiveportal_install: True
captiveportal_enabled: False captiveportal_enabled: True
captiveportal_port: 9090 captiveportal_port: 9090
captiveportal_splash_page: / captiveportal_splash_page: /
# You might also want to set iiab_home_url (above!) # You might also want to set iiab_home_url (above!)
@ -254,7 +254,6 @@ apache_high_php_limits: False
# https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/main.yml#L80-L84 # https://github.com/iiab/iiab/blob/master/roles/httpd/tasks/main.yml#L80-L84
# ...ARE SUITABLE FOR YOUR HARDWARE IN /etc/php/<VERSION>/apache2/php.ini # ...ARE SUITABLE FOR YOUR HARDWARE IN /etc/php/<VERSION>/apache2/php.ini
# #
# Make this False to disable http://box/common/services/power_off.php button: # Make this False to disable http://box/common/services/power_off.php button:
apache_allow_sudo: True apache_allow_sudo: True

View file

@ -82,9 +82,9 @@ dns_jail_enabled: False
# Python-based Captive Portal, that @m-anish & @jvonau experimented with in # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
# July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
# extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070). # extensively later refined (PRs #1179, #1300, #1327, #2070).
captiveportal_install: False captiveportal_install: True
captiveportal_enabled: False captiveportal_enabled: True
captiveportal_splash_page: / captiveportal_splash_page: /
# You might also want to set iiab_home_url (above!) # You might also want to set iiab_home_url (above!)
# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO

View file

@ -82,9 +82,9 @@ dns_jail_enabled: False
# Python-based Captive Portal, that @m-anish & @jvonau experimented with in # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
# July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
# extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070). # extensively later refined (PRs #1179, #1300, #1327, #2070).
captiveportal_install: False captiveportal_install: True
captiveportal_enabled: False captiveportal_enabled: True
captiveportal_splash_page: / captiveportal_splash_page: /
# You might also want to set iiab_home_url (above!) # You might also want to set iiab_home_url (above!)
# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO

View file

@ -82,9 +82,9 @@ dns_jail_enabled: False
# Python-based Captive Portal, that @m-anish & @jvonau experimented with in # Python-based Captive Portal, that @m-anish & @jvonau experimented with in
# July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt # July 2018 (https://github.com/iiab/iiab/pull/870) and that @georgejhunt
# extensively refined later in 2018 (PRs #1179, #1300, #1327, #2070). # extensively later refined (PRs #1179, #1300, #1327, #2070).
captiveportal_install: False captiveportal_install: True
captiveportal_enabled: False captiveportal_enabled: True
captiveportal_splash_page: / captiveportal_splash_page: /
# You might also want to set iiab_home_url (above!) # You might also want to set iiab_home_url (above!)
# In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO # In a pinch, disable Captive Portal using instructions in http://FAQ.IIAB.IO