external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-12 19:22:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3869 from tim-moody/8.2.1-www-data

Browse source 
rename apache_allow_sudo and make True default
This commit is contained in:
Tim Moody 2024-12-21 08:16:38 -05:00 committed by GitHub
commit 04e02587c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/0-DEPRECATED-ROLES/httpd/defaults/main.yml
View file

@ -8,7 +8,7 @@
# apache_interface: 127.0.0.1 # apache_interface: 127.0.0.1
# 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 # allow_www_data_sudo: True
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml # 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! # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!

6
roles/www_options/tasks/main.yml
View file

@ -77,7 +77,7 @@
# COMPARE nginx_high_php_limits further above. # 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 # WITH NGINX TOO ? (The single-click poweroff button on IIAB's home
# page certainly does still work with NGINX.) # page certainly does still work with NGINX.)
@ -86,13 +86,13 @@
src: 020_apache_poweroff.j2 src: 020_apache_poweroff.j2
dest: /etc/sudoers.d/020_apache_poweroff dest: /etc/sudoers.d/020_apache_poweroff
mode: '0440' 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 - name: Remove {{ apache_user }} (per variable apache_user) permission to poweroff, removing /etc/sudoers.d/020_apache_poweroff
file: file:
path: /etc/sudoers.d/020_apache_poweroff path: /etc/sudoers.d/020_apache_poweroff
state: absent state: absent
when: not apache_allow_sudo when: not allow_www_data_sudo
# 2022-06-30: internet_available var removed # 2022-06-30: internet_available var removed

2
roles/www_options/tasks/php-settings.yml
View file

@ -207,4 +207,4 @@
# name: php{{ php_version }}-fpm # name: php{{ php_version }}-fpm
# state: restarted # 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.

6
vars/default_vars.yml
View file

@ -274,7 +274,7 @@ nginx_port: 80
nginx_interface: 0.0.0.0 nginx_interface: 0.0.0.0
nginx_conf_dir: /etc/nginx/conf.d nginx_conf_dir: /etc/nginx/conf.d
nginx_log_dir: /var/log/nginx 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) # 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 # ...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 # 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 # Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
apache_allow_sudo: False allow_www_data_sudo: True
apache_service: apache2 apache_service: apache2
apache_user: www-data # Admin Console uses apache_user: www-data # Admin Console uses

6
vars/local_vars_large.yml
View file

@ -172,7 +172,7 @@ pi_swap_file_size: 1024
# roles/nginx runs here (mandatory) # roles/nginx runs here (mandatory)
# roles/www_base 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 # 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 # ...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 # 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 # Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
apache_allow_sudo: False allow_www_data_sudo: True
# Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info) # Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
nodocs: False nodocs: False

2
vars/local_vars_medical.yml
View file

@ -13,7 +13,7 @@ munin_enabled: True
vnstat_install: True vnstat_install: True
vnstat_enabled: True vnstat_enabled: True
usb_lib_umask0000_for_kolibri: False usb_lib_umask0000_for_kolibri: False
apache_allow_sudo: True allow_www_data_sudo: True
# By default # By default
# kiwix # kiwix
# awstats # awstats

6
vars/local_vars_medium.yml
View file

@ -172,7 +172,7 @@ pi_swap_file_size: 1024
# roles/nginx runs here (mandatory) # roles/nginx runs here (mandatory)
# roles/www_base 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 # 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 # ...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 # 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 # Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
apache_allow_sudo: False allow_www_data_sudo: True
# Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info) # Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
nodocs: False nodocs: False

6
vars/local_vars_small.yml
View file

@ -172,7 +172,7 @@ pi_swap_file_size: 1024
# roles/nginx runs here (mandatory) # roles/nginx runs here (mandatory)
# roles/www_base 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 # 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 # ...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 # 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 # Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
apache_allow_sudo: False allow_www_data_sudo: True
# Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info) # Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
nodocs: False nodocs: False

6
vars/local_vars_unittest.yml
View file

@ -178,7 +178,7 @@ pi_swap_file_size: 1024
# roles/nginx runs here (mandatory) # roles/nginx runs here (mandatory)
# roles/www_base 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 # 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 # ...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 # 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 # Make this True to enable http://box/js-menu/menu-files/services/power_off.php and set-server-time.php
apache_allow_sudo: False allow_www_data_sudo: True
# Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info) # Toggle iiab-refresh-wiki-docs scraping for offline docs (http://box/info)
nodocs: True nodocs: True