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

Merge pull request #385 from iiab/master

Sync from iiab:master
This commit is contained in:
A Holt 2020-03-30 12:07:47 -04:00 committed by GitHub
commit 8eacbab2e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 24 additions and 14 deletions

View file

@ -11,10 +11,11 @@
# ignore_errors: yes
# when: is_raspbian | bool
- name: Install python2
package:
- name: Install python2, if Raspbian/Debian > 10 or Ubuntu > 19
package:
name: python2
state: present
when: not (is_debian_9 or is_debian_10 or is_ubuntu_16 or is_ubuntu_17 or is_ubuntu_18 or is_ubuntu_19) # 2020-03-27: Testing for {is_raspbian_9, is_raspbian_10} is not currently nec, as testing for {is_debian_9, is_debian_10} covers that already.
- name: Use pip to install KA Lite static to {{ kalite_venv }}
pip:

View file

@ -4,8 +4,8 @@
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
mediawiki_major_version: "1.34"
mediawiki_minor_version: "0"
mediawiki_major_version: 1.34 # "1.34" also works
mediawiki_minor_version: 1
mediawiki_version: "{{ mediawiki_major_version }}.{{ mediawiki_minor_version }}"
mediawiki_download_base_url: "https://releases.wikimedia.org/mediawiki/{{ mediawiki_major_version }}"

View file

@ -10,7 +10,7 @@
2. Without PHP available via FastCGI, any function at all for PHP-based applications validates NGINX.
3. Current state of IIAB App/Service migrations as of 2020-02-18:
3. Current state of IIAB App/Service migrations as of 2020-03-26:
1. These support "Native" NGINX but ***NOT*** Apache
* Admin Console
@ -18,9 +18,9 @@
* IIAB documentation (http://box/info)
* osm-vector-maps
* OER2Go/RACHEL modules
* usb-lib
* usb_lib
2. These support "Native" NGINX ***AND*** Apache, a.k.a. "dual support" for legacy testing (if suitable "Shims" from *Section iii.* below are preserved!) Both "Native" NGINX and "Shim" proxying from NGINX to Apache port 8090 *cannot be enabled simultaneously* for these IIAB Apps/Service. But if you want to attempt their "Shim" proxying legacy testing mode, change your *primary web server* over to Apache by setting `nginx_enabled: False` in [/etc/iiab/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) (which will [auto-enable Apache](../0-init/tasks/main.yml#L40-L44) for your testing).
2. These support "Native" NGINX ***AND*** Apache, a.k.a. "dual support" for legacy testing (if suitable "Shims" from *Section iii.* below are preserved!) Both "Native" NGINX and "Shim" proxying from NGINX to Apache port 8090 *cannot be enabled simultaneously* for these IIAB Apps/Service. But if you want to attempt their "Shim" proxying legacy testing mode, change your *primary web server* over to Apache by setting `nginx_enabled: False` in [/etc/iiab/local_vars.yml](http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F) (which will [auto-enable Apache](../0-init/tasks/main.yml#L47-L51) for your testing).
* awstats
* calibre-web
* gitea
@ -32,7 +32,7 @@
* sugarizer
* wordpress
3. These support Apache but ***NOT*** "Native" NGINX. They use a "Shim" to [proxy_pass](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) from NGINX to Apache on port 8090. See [roles/0-init/tasks/main.yml#L40-L44](../0-init/tasks/main.yml#L40-L44) for a list of these IIAB Apps/Services, that auto-enable Apache.
3. These support Apache but ***NOT*** "Native" NGINX. They use a "Shim" to [proxy_pass](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) from NGINX to Apache on port 8090. See [roles/0-init/tasks/main.yml#L47-L51](../0-init/tasks/main.yml#L47-L51) for a list of these IIAB Apps/Services, that auto-enable Apache.
* elgg
* lokole
* moodle
@ -47,4 +47,4 @@
* pbx [*]
* transmission [*]
[*] The 5 above starred roles could use improvement, as of 2020-02-18.
[*] The 5 above starred roles could use improvement, as of 2020-03-26.

View file

@ -4,11 +4,11 @@ location / {
location /usb {
alias /library/www/html/local_content/;
autoindex on;
fancyindex on; # autoindex on;
}
location /local_content/ {
autoindex on;
fancyindex on; # autoindex on;
}
location /modules/ {

View file

@ -43,6 +43,9 @@ download_timeout: 200
default_language: en
language_priority: en es fr
# Real-time clock: set RTC chip family here. Future auto-detection plausible?
# rtc_id: ds3231
# Set iiab_admin_user_install: False if you don't want iiab_admin_user & wheel
# group auto-created in roles/iiab-admin/tasks/main.yml (hence disabling sudo-
# checks/warnings of published passwds like pi/raspberry & iiab-admin/g0adm1n).

View file

@ -15,6 +15,9 @@ download_timeout: 200
default_language: en
language_priority: en es fr
# Real-time clock: set RTC chip family here. Future auto-detection plausible?
# rtc_id: ds3231
# Set iiab_admin_user_install: False if you don't want iiab_admin_user & wheel
# group auto-created in roles/iiab-admin/tasks/main.yml (hence disabling sudo-
# checks/warnings of published passwds like pi/raspberry & iiab-admin/g0adm1n).

View file

@ -15,6 +15,9 @@ download_timeout: 200
default_language: en
language_priority: en es fr
# Real-time clock: set RTC chip family here. Future auto-detection plausible?
# rtc_id: ds3231
# Set iiab_admin_user_install: False if you don't want iiab_admin_user & wheel
# group auto-created in roles/iiab-admin/tasks/main.yml (hence disabling sudo-
# checks/warnings of published passwds like pi/raspberry & iiab-admin/g0adm1n).

View file

@ -15,6 +15,9 @@ download_timeout: 200
default_language: en
language_priority: en es fr
# Real-time clock: set RTC chip family here. Future auto-detection plausible?
# rtc_id: ds3231
# Set iiab_admin_user_install: False if you don't want iiab_admin_user & wheel
# group auto-created in roles/iiab-admin/tasks/main.yml (hence disabling sudo-
# checks/warnings of published passwds like pi/raspberry & iiab-admin/g0adm1n).

View file

@ -3,7 +3,6 @@ is_debian: True
is_debian_10: True
is_raspbian: True
is_raspbian_10: True
rtc_id: ds3231
# 2019-03-23: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)

View file

@ -3,7 +3,6 @@ is_debian: True
is_debian_8: True
is_raspbian: True
is_raspbian_8: True
rtc_id: ds3231
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)

View file

@ -3,7 +3,6 @@ is_debian: True
is_debian_9: True
is_raspbian: True
is_raspbian_9: True
rtc_id: ds3231
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)