external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

roles/nginx/tasks/install.yml: Resolve merge conflict

Browse source
This commit is contained in:
root 2021-08-08 03:03:43 -04:00
commit 144d905d71
38 changed files with 127 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

28
vars/default_vars.yml
View file

@ -43,10 +43,6 @@ py3_dist_path: /usr/lib/python3/dist-packages
# Ansible's default timeout for "get_url:" downloads (10 seconds) often fails
download_timeout: 200
# Languages (for Apache)
default_language: en
language_priority: en es fr
# Real-time clock: RTC chip family. Future auto-detection plausible?
rtc_id: none # Or ds3231 ? Used in 1-prep/tasks/raspberry_pi.yml
@ -154,9 +150,11 @@ iiab_gateway_enabled: False
gw_squid_whitelist: False
gw_block_https: False
# UNMAINTAINED as of July 2021
dhcpd_install: False
dhcpd_enabled: False
# UNMAINTAINED as of July 2021
# named (BIND)
named_install: False
named_enabled: False
@ -263,17 +261,6 @@ nginx_high_php_limits: False
# Make this False to disable http://box/common/services/power_off.php button:
apache_allow_sudo: True
# See also Apache vars {default_language, language_priority} @ top of this file
#
# 2020-09-24: BOTH VALUES BELOW ARE IGNORED as Apache is installed on demand as
# a dependency -- by CUPS, Elgg, Lokole, Moodle, Node-RED, PBX &/or phpMyAdmin
apache_install: False
apache_enabled: False
#
# NGINX proxies to Apache for legacy IIAB services, using:
apache_port: 8090
apache_interface: 127.0.0.1 # 2020-01-13: Var unused
# 4-SERVER-OPTIONS
@ -282,9 +269,11 @@ apache_interface: 127.0.0.1 # 2020-01-13: Var unused
# DNS prep (dnsmasq, named &/or dhcpd) run here. The full network stage runs
# after 9-LOCAL-ADDONS (or manually run "cd /opt/iiab/iiab; ./iiab-network")
# UNMAINTAINED as of July 2021
squid_install: False
squid_enabled: False
# UNMAINTAINED as of July 2021
# DansGuardian REQUIRES Squid (above) be installed & enabled.
# DansGuardian is NO LONGER AVAILABLE in Debian Buster i.e. since June 2019.
dansguardian_install: False
@ -339,7 +328,6 @@ idmgr_enabled: False # 2020-01-23: UNUSED
# 6-GENERIC-APPS
# UNMAINTAINED as of September 2020
azuracast_install: False
azuracast_enabled: False # This var is currently IGNORED
azuracast_http_port: 10080
@ -360,6 +348,7 @@ dokuwiki_url: /dokuwiki
ejabberd_install: False
ejabberd_enabled: False
# UNMAINTAINED as of July 2021
elgg_install: False
elgg_enabled: False
# elgg_mysql_password: $6$iiab51$jeTwnATcbaa92xo0QBTgjLBU.5aVDDrbKeNyyC99R/TAWz6pvfzj.L7lfnOVVjD78nxqT.gkNn6XZmuRV0W3o1
@ -539,15 +528,16 @@ monit_install: False
monit_enabled: False
watchdog:
- sshd
- idmgr
- ejabberd
- httpd
#- idmgr
#- ejabberd
#- httpd
- postgresql
- squid
munin_install: False
munin_enabled: False
# UNMAINTAINED as of July 2021
# Handy for maintaining tables, but DANGEROUS if not locked down
phpmyadmin_install: False
phpmyadmin_enabled: False

27
vars/local_vars_big.yml
View file

@ -15,10 +15,6 @@
# Ansible's default timeout for "get_url:" downloads (10 seconds) often fails
download_timeout: 200
# Languages (for Apache)
default_language: en
language_priority: en es fr
# Real-time clock: set RTC chip family here. Future auto-detection plausible?
rtc_id: none # Or ds3231 ?
@ -102,9 +98,11 @@ ports_externally_visible: 3 # ssh + http-or-https + common IIAB services
# Set True if client machines should have "passthrough" access to WAN/Internet:
iiab_gateway_enabled: False
# UNMAINTAINED as of July 2021
dhcpd_install: False
dhcpd_enabled: False
# UNMAINTAINED as of July 2021
# named (BIND)
named_install: False
named_enabled: False
@ -160,8 +158,6 @@ nginx_high_php_limits: False
# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L53-L133
# ...ARE SUITABLE FOR YOUR HARDWARE, as saved in: /etc/php/<VERSION>/*/php.ini
# See also Apache vars {default_language, language_priority} @ top of this file
#
# Make this False to disable http://box/common/services/power_off.php button:
apache_allow_sudo: True
@ -173,9 +169,11 @@ apache_allow_sudo: True
# DNS prep (dnsmasq, named &/or dhcpd) run here. The full network stage runs
# after 9-LOCAL-ADDONS (or manually run "cd /opt/iiab/iiab; ./iiab-network")
# UNMAINTAINED as of July 2021
squid_install: False
squid_enabled: False
# UNMAINTAINED as of July 2021
# DansGuardian REQUIRES Squid (above) be installed & enabled.
# DansGuardian is NO LONGER AVAILABLE in Debian Buster i.e. since June 2019.
dansguardian_install: False
@ -222,20 +220,12 @@ usb_lib_umask0000_for_kolibri: True
# 6-GENERIC-APPS
# UNMAINTAINED as of September 2020
azuracast_install: False
azuracast_enabled: False # This var is currently IGNORED.
# UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056
# dokuwiki_install: False
# dokuwiki_enabled: False
# UNMAINTAINED as of November 2019
# ejabberd_install: False
# ejabberd_enabled: False
elgg_install: True
elgg_enabled: True
# UNMAINTAINED as of July 2021
elgg_install: False
elgg_enabled: False
# Gitea (lightweight self-hosted "GitHub") from https://gitea.io
gitea_install: True
@ -347,8 +337,9 @@ monit_enabled: False
munin_install: True
munin_enabled: True
# UNMAINTAINED as of July 2021
# Handy for maintaining tables, but DANGEROUS if not locked down
phpmyadmin_install: True
phpmyadmin_install: False
phpmyadmin_enabled: False
vnstat_install: True

21
vars/local_vars_medium.yml
View file

@ -15,10 +15,6 @@
# Ansible's default timeout for "get_url:" downloads (10 seconds) often fails
download_timeout: 200
# Languages (for Apache)
default_language: en
language_priority: en es fr
# Real-time clock: set RTC chip family here. Future auto-detection plausible?
rtc_id: none # Or ds3231 ?
@ -102,9 +98,11 @@ ports_externally_visible: 3 # ssh + http-or-https + common IIAB services
# Set True if client machines should have "passthrough" access to WAN/Internet:
iiab_gateway_enabled: False
# UNMAINTAINED as of July 2021
dhcpd_install: False
dhcpd_enabled: False
# UNMAINTAINED as of July 2021
# named (BIND)
named_install: False
named_enabled: False
@ -160,8 +158,6 @@ nginx_high_php_limits: False
# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L53-L133
# ...ARE SUITABLE FOR YOUR HARDWARE, as saved in: /etc/php/<VERSION>/*/php.ini
# See also Apache vars {default_language, language_priority} @ top of this file
#
# Make this False to disable http://box/common/services/power_off.php button:
apache_allow_sudo: True
@ -173,9 +169,11 @@ apache_allow_sudo: True
# DNS prep (dnsmasq, named &/or dhcpd) run here. The full network stage runs
# after 9-LOCAL-ADDONS (or manually run "cd /opt/iiab/iiab; ./iiab-network")
# UNMAINTAINED as of July 2021
squid_install: False
squid_enabled: False
# UNMAINTAINED as of July 2021
# DansGuardian REQUIRES Squid (above) be installed & enabled.
# DansGuardian is NO LONGER AVAILABLE in Debian Buster i.e. since June 2019.
dansguardian_install: False
@ -222,18 +220,10 @@ usb_lib_umask0000_for_kolibri: True
# 6-GENERIC-APPS
# UNMAINTAINED as of September 2020
azuracast_install: False
azuracast_enabled: False # This var is currently IGNORED.
# UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056
# dokuwiki_install: False
# dokuwiki_enabled: False
# UNMAINTAINED as of November 2019
# ejabberd_install: False
# ejabberd_enabled: False
# UNMAINTAINED as of July 2021
elgg_install: False
elgg_enabled: False
@ -347,6 +337,7 @@ monit_enabled: False
munin_install: False
munin_enabled: False
# UNMAINTAINED as of July 2021
# Handy for maintaining tables, but DANGEROUS if not locked down
phpmyadmin_install: False
phpmyadmin_enabled: False

21
vars/local_vars_min.yml
View file

@ -15,10 +15,6 @@
# Ansible's default timeout for "get_url:" downloads (10 seconds) often fails
download_timeout: 200
# Languages (for Apache)
default_language: en
language_priority: en es fr
# Real-time clock: set RTC chip family here. Future auto-detection plausible?
rtc_id: none # Or ds3231 ?
@ -102,9 +98,11 @@ ports_externally_visible: 3 # ssh + http-or-https + common IIAB services
# Set True if client machines should have "passthrough" access to WAN/Internet:
iiab_gateway_enabled: False
# UNMAINTAINED as of July 2021
dhcpd_install: False
dhcpd_enabled: False
# UNMAINTAINED as of July 2021
# named (BIND)
named_install: False
named_enabled: False
@ -160,8 +158,6 @@ nginx_high_php_limits: False
# https://github.com/iiab/iiab/blob/master/roles/www_options/tasks/main.yml#L53-L133
# ...ARE SUITABLE FOR YOUR HARDWARE, as saved in: /etc/php/<VERSION>/*/php.ini
# See also Apache vars {default_language, language_priority} @ top of this file
#
# Make this False to disable http://box/common/services/power_off.php button:
apache_allow_sudo: True
@ -173,9 +169,11 @@ apache_allow_sudo: True
# DNS prep (dnsmasq, named &/or dhcpd) run here. The full network stage runs
# after 9-LOCAL-ADDONS (or manually run "cd /opt/iiab/iiab; ./iiab-network")
# UNMAINTAINED as of July 2021
squid_install: False
squid_enabled: False
# UNMAINTAINED as of July 2021
# DansGuardian REQUIRES Squid (above) be installed & enabled.
# DansGuardian is NO LONGER AVAILABLE in Debian Buster i.e. since June 2019.
dansguardian_install: False
@ -222,18 +220,10 @@ usb_lib_umask0000_for_kolibri: True
# 6-GENERIC-APPS
# UNMAINTAINED as of September 2020
azuracast_install: False
azuracast_enabled: False # This var is currently IGNORED.
# UNMAINTAINED as of January 2020: https://github.com/iiab/iiab/issues/2056
# dokuwiki_install: False
# dokuwiki_enabled: False
# UNMAINTAINED as of November 2019
# ejabberd_install: False
# ejabberd_enabled: False
# UNMAINTAINED as of July 2021
elgg_install: False
elgg_enabled: False
@ -347,6 +337,7 @@ monit_enabled: False
munin_install: False
munin_enabled: False
# UNMAINTAINED as of July 2021
# Handy for maintaining tables, but DANGEROUS if not locked down
phpmyadmin_install: False
phpmyadmin_enabled: False