mirror of
https://github.com/iiab/iiab.git
synced 2025-02-12 11:12:06 +00:00
Merge pull request #3869 from tim-moody/8.2.1-www-data
rename apache_allow_sudo and make True default
This commit is contained in:
commit
04e02587c5
9 changed files with 21 additions and 21 deletions
|
@ -8,7 +8,7 @@
|
|||
# apache_interface: 127.0.0.1
|
||||
|
||||
# Make this False to disable http://box/common/services/power_off.php button:
|
||||
# apache_allow_sudo: True
|
||||
# allow_www_data_sudo: True
|
||||
|
||||
# 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!
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
|
||||
# COMPARE nginx_high_php_limits further above.
|
||||
|
||||
# 2020-03-08: DOES THE FLAG BELOW (apache_allow_sudo) PRESUMABLY WORK
|
||||
# 2020-03-08: DOES THE FLAG BELOW (allow_www_data_sudo) PRESUMABLY WORK
|
||||
# WITH NGINX TOO ? (The single-click poweroff button on IIAB's home
|
||||
# page certainly does still work with NGINX.)
|
||||
|
||||
|
@ -86,13 +86,13 @@
|
|||
src: 020_apache_poweroff.j2
|
||||
dest: /etc/sudoers.d/020_apache_poweroff
|
||||
mode: '0440'
|
||||
when: apache_allow_sudo
|
||||
when: allow_www_data_sudo
|
||||
|
||||
- name: Remove {{ apache_user }} (per variable apache_user) permission to poweroff, removing /etc/sudoers.d/020_apache_poweroff
|
||||
file:
|
||||
path: /etc/sudoers.d/020_apache_poweroff
|
||||
state: absent
|
||||
when: not apache_allow_sudo
|
||||
when: not allow_www_data_sudo
|
||||
|
||||
|
||||
# 2022-06-30: internet_available var removed
|
||||
|
|
|
@ -207,4 +207,4 @@
|
|||
# name: php{{ php_version }}-fpm
|
||||
# state: restarted
|
||||
|
||||
# when: matomo_install or moodle_install or nextcloud_install or pbx_install or wordpress_install # 5-STANZA BLOCK ENDS. COMPARE apache_allow_sudo conditionals below.
|
||||
# when: matomo_install or moodle_install or nextcloud_install or pbx_install or wordpress_install # 5-STANZA BLOCK ENDS. COMPARE allow_www_data_sudo conditionals below.
|
||||
|
|
|
@ -274,7 +274,7 @@ nginx_port: 80
|
|||
nginx_interface: 0.0.0.0
|
||||
nginx_conf_dir: /etc/nginx/conf.d
|
||||
nginx_log_dir: /var/log/nginx
|
||||
# SEE BELOW: nginx_high_php_limits, apache_allow_sudo
|
||||
# SEE BELOW: nginx_high_php_limits, allow_www_data_sudo
|
||||
|
||||
# roles/www_base runs here (mandatory)
|
||||
|
||||
|
@ -340,8 +340,8 @@ nginx_high_php_limits: False
|
|||
# ...ARE SUITABLE FOR YOUR HARDWARE, as saved in: /etc/php/<VERSION>/*/php.ini
|
||||
# ALSO: ADJUST "client_max_body_size 10000M;" AS NEC, IN: /etc/nginx/server.conf
|
||||
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php
|
||||
apache_allow_sudo: False
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
|
||||
allow_www_data_sudo: True
|
||||
apache_service: apache2
|
||||
apache_user: www-data # Admin Console uses
|
||||
|
||||
|
|
|
@ -172,7 +172,7 @@ pi_swap_file_size: 1024
|
|||
# roles/nginx runs here (mandatory)
|
||||
# roles/www_base runs here (mandatory)
|
||||
|
||||
# SEE BELOW: nginx_high_php_limits, apache_allow_sudo
|
||||
# SEE BELOW: nginx_high_php_limits, allow_www_data_sudo
|
||||
|
||||
|
||||
# 4-SERVER-OPTIONS
|
||||
|
@ -218,8 +218,8 @@ nginx_high_php_limits: False
|
|||
# ...ARE SUITABLE FOR YOUR HARDWARE, as saved in: /etc/php/<VERSION>/*/php.ini
|
||||
# ALSO: ADJUST "client_max_body_size 10000M;" AS NEC, IN: /etc/nginx/server.conf
|
||||
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php
|
||||
apache_allow_sudo: False
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
|
||||
allow_www_data_sudo: True
|
||||
|
||||
# Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
|
||||
nodocs: False
|
||||
|
|
|
@ -13,7 +13,7 @@ munin_enabled: True
|
|||
vnstat_install: True
|
||||
vnstat_enabled: True
|
||||
usb_lib_umask0000_for_kolibri: False
|
||||
apache_allow_sudo: True
|
||||
allow_www_data_sudo: True
|
||||
# By default
|
||||
# kiwix
|
||||
# awstats
|
||||
|
|
|
@ -172,7 +172,7 @@ pi_swap_file_size: 1024
|
|||
# roles/nginx runs here (mandatory)
|
||||
# roles/www_base runs here (mandatory)
|
||||
|
||||
# SEE BELOW: nginx_high_php_limits, apache_allow_sudo
|
||||
# SEE BELOW: nginx_high_php_limits, allow_www_data_sudo
|
||||
|
||||
|
||||
# 4-SERVER-OPTIONS
|
||||
|
@ -218,8 +218,8 @@ nginx_high_php_limits: False
|
|||
# ...ARE SUITABLE FOR YOUR HARDWARE, as saved in: /etc/php/<VERSION>/*/php.ini
|
||||
# ALSO: ADJUST "client_max_body_size 10000M;" AS NEC, IN: /etc/nginx/server.conf
|
||||
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php
|
||||
apache_allow_sudo: False
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
|
||||
allow_www_data_sudo: True
|
||||
|
||||
# Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
|
||||
nodocs: False
|
||||
|
|
|
@ -172,7 +172,7 @@ pi_swap_file_size: 1024
|
|||
# roles/nginx runs here (mandatory)
|
||||
# roles/www_base runs here (mandatory)
|
||||
|
||||
# SEE BELOW: nginx_high_php_limits, apache_allow_sudo
|
||||
# SEE BELOW: nginx_high_php_limits, allow_www_data_sudo
|
||||
|
||||
|
||||
# 4-SERVER-OPTIONS
|
||||
|
@ -218,8 +218,8 @@ nginx_high_php_limits: False
|
|||
# ...ARE SUITABLE FOR YOUR HARDWARE, as saved in: /etc/php/<VERSION>/*/php.ini
|
||||
# ALSO: ADJUST "client_max_body_size 10000M;" AS NEC, IN: /etc/nginx/server.conf
|
||||
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php
|
||||
apache_allow_sudo: False
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
|
||||
allow_www_data_sudo: True
|
||||
|
||||
# Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
|
||||
nodocs: False
|
||||
|
|
|
@ -178,7 +178,7 @@ pi_swap_file_size: 1024
|
|||
# roles/nginx runs here (mandatory)
|
||||
# roles/www_base runs here (mandatory)
|
||||
|
||||
# SEE BELOW: nginx_high_php_limits, apache_allow_sudo
|
||||
# SEE BELOW: nginx_high_php_limits, allow_www_data_sudo
|
||||
|
||||
|
||||
# 4-SERVER-OPTIONS
|
||||
|
@ -224,8 +224,8 @@ nginx_high_php_limits: False
|
|||
# ...ARE SUITABLE FOR YOUR HARDWARE, as saved in: /etc/php/<VERSION>/*/php.ini
|
||||
# ALSO: ADJUST "client_max_body_size 10000M;" AS NEC, IN: /etc/nginx/server.conf
|
||||
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php
|
||||
apache_allow_sudo: False
|
||||
# Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
|
||||
allow_www_data_sudo: True
|
||||
|
||||
# Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
|
||||
nodocs: True
|
||||
|
|
Loading…
Reference in a new issue