From f0b3dc75748c2f666abf6e138476380681e8ca20 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 18:34:54 -0400 Subject: [PATCH 01/13] Create main.yml --- roles/httpd/defaults/main.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 roles/httpd/defaults/main.yml diff --git a/roles/httpd/defaults/main.yml b/roles/httpd/defaults/main.yml new file mode 100644 index 000000000..7cb58c931 --- /dev/null +++ b/roles/httpd/defaults/main.yml @@ -0,0 +1,3 @@ +# For schools that use WordPress and/or Moodle intensively. See iiab/iiab #1147 +# WARNING: Enabling this (might) cause excess use of RAM or other resources? +apache_raise_php_limits: False From 70e96032a989c5575c1e495a0c94cabe85b23d8b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 18:54:30 -0400 Subject: [PATCH 02/13] Update main.yml --- roles/wordpress/defaults/main.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/roles/wordpress/defaults/main.yml b/roles/wordpress/defaults/main.yml index 8a088c1ed..3ea78d238 100644 --- a/roles/wordpress/defaults/main.yml +++ b/roles/wordpress/defaults/main.yml @@ -1,9 +1,13 @@ wordpress_install: True wordpress_enabled: True -# For schools that use WordPress intensively. WARNING: Enabling this (might) -# cause excess use of RAM or other resources? github.com/iiab/iiab/issues/1147 -wordpress_raise_php_limits: False +# If using WordPress intensively, consider setting apache_raise_php_limits in: +# /etc/iiab/local_vars.yml + +See iiab/iiab #1147 +# WARNING: Enabling this (might) cause excess use of RAM or other resources? +apache_raise_php_limits: False +# roles/httpd/defaults/main.yml wordpress_download_base_url: https://wordpress.org wordpress_src: latest.tar.gz From 869fc76bd8e16a7d1ee0f70cf86b888e5c4d3183 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 18:56:34 -0400 Subject: [PATCH 03/13] Update main.yml --- roles/moodle/defaults/main.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/moodle/defaults/main.yml b/roles/moodle/defaults/main.yml index 045496194..fae2de673 100644 --- a/roles/moodle/defaults/main.yml +++ b/roles/moodle/defaults/main.yml @@ -1,9 +1,13 @@ +#moodle_install: True +#moodle_enabled: False + +# If using Moodle intensively, consider setting apache_raise_php_limits in: +# /etc/iiab/local_vars.yml + moodle_version: 35 #moodle_repo_url: "https://github.com/moodle/moodle.git" moodle_repo_url: "git://git.moodle.org/moodle.git" moodle_base: "{{ iiab_base }}/moodle" #moodle_user: moodle -#moodle_install: True -#moodle_enabled: False moodle_data: '{{ content_base }}/moodle' moodle_database_name: moodle From ef61d2e0f3b8357d63f1a167583f7ac4eda94837 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 18:59:57 -0400 Subject: [PATCH 04/13] Update main.yml --- roles/httpd/defaults/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/httpd/defaults/main.yml b/roles/httpd/defaults/main.yml index 7cb58c931..c11b7ec1f 100644 --- a/roles/httpd/defaults/main.yml +++ b/roles/httpd/defaults/main.yml @@ -1,3 +1,6 @@ +# Make this False to disable http://box/common/services/power_off.php button: +apache_allow_sudo: True + # For schools that use WordPress and/or Moodle intensively. See iiab/iiab #1147 # WARNING: Enabling this (might) cause excess use of RAM or other resources? apache_raise_php_limits: False From 0f6a9e4a65ecae7a0a37f8309871537633acee0b Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 19:00:56 -0400 Subject: [PATCH 05/13] Update default_vars.yml --- vars/default_vars.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 6cc6426ee..ff0ebb40e 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -160,10 +160,14 @@ wan_nameserver: # 3-BASE-SERVER -# Make this False to disable http://box/common/services/power_off.php button: -allow_apache_sudo: True +# roles/httpd (Apache configuration) runs here -# roles/httpd runs here +# Make this False to disable http://box/common/services/power_off.php button: +apache_allow_sudo: True + +# For schools that use WordPress and/or Moodle intensively. See iiab/iiab #1147 +# WARNING: Enabling this (might) cause excess use of RAM or other resources? +apache_raise_php_limits: False # roles/iiab-admin runs here @@ -280,9 +284,7 @@ nextcloud_enabled: False # WordPress wordpress_install: True wordpress_enabled: False -# For schools that use WordPress intensively. WARNING: Enabling this (might) -# cause excess use of RAM or other resources? github.com/iiab/iiab/issues/1147 -wordpress_raise_php_limits: False +# If using Moodle intensively, consider setting apache_raise_php_limits above # 7-EDU-APPS @@ -312,6 +314,7 @@ iiab_zim_path: /library/zims # Moodle moodle_install: False moodle_enabled: False +# If using Moodle intensively, consider setting apache_raise_php_limits above # Sugarizer # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 From 34009a2309c26e871a93ca81fd73611063053c42 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 19:03:23 -0400 Subject: [PATCH 06/13] Update default_vars.yml --- vars/default_vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/default_vars.yml b/vars/default_vars.yml index ff0ebb40e..47c80c776 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -284,7 +284,7 @@ nextcloud_enabled: False # WordPress wordpress_install: True wordpress_enabled: False -# If using Moodle intensively, consider setting apache_raise_php_limits above +# If using WordPress intensively, consider setting apache_raise_php_limits above # 7-EDU-APPS From cfe60f4f77168989586594eb4b4c088be4c2bf69 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 19:06:53 -0400 Subject: [PATCH 07/13] Update local_vars_min.yml --- vars/local_vars_min.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index 0a7988953..cb186fbd8 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -77,7 +77,11 @@ dansguardian_enabled: False # 3-BASE-SERVER # Make this False to disable http://box/common/services/power_off.php button: -allow_apache_sudo: True +apache_allow_sudo: True + +# For schools that use WordPress and/or Moodle intensively. See iiab/iiab #1147 +# WARNING: Enabling this (might) cause excess use of RAM or other resources? +apache_raise_php_limits: False # roles/mysql runs here (mandatory) @@ -154,9 +158,7 @@ nextcloud_enabled: False wordpress_install: False wordpress_enabled: False -# For schools that use WordPress intensively. WARNING: Enabling this (might) -# cause excess use of RAM or other resources? github.com/iiab/iiab/issues/1147 -wordpress_raise_php_limits: False +# If using WordPress intensively, consider setting apache_raise_php_limits above # 7-EDU-APPS @@ -176,6 +178,7 @@ kiwix_enabled: True # Warning: Moodle is a serious LMS, that takes a while to install moodle_install: False moodle_enabled: False +# If using Moodle intensively, consider setting apache_raise_php_limits above # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 From 3ff06682d55b8202cf20bafa6204f4407531c336 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 19:06:58 -0400 Subject: [PATCH 08/13] Update local_vars_medium.yml --- vars/local_vars_medium.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 81ac82f95..016cbc854 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -77,7 +77,11 @@ dansguardian_enabled: False # 3-BASE-SERVER # Make this False to disable http://box/common/services/power_off.php button: -allow_apache_sudo: True +apache_allow_sudo: True + +# For schools that use WordPress and/or Moodle intensively. See iiab/iiab #1147 +# WARNING: Enabling this (might) cause excess use of RAM or other resources? +apache_raise_php_limits: False # roles/mysql runs here (mandatory) @@ -154,9 +158,7 @@ nextcloud_enabled: True wordpress_install: True wordpress_enabled: True -# For schools that use WordPress intensively. WARNING: Enabling this (might) -# cause excess use of RAM or other resources? github.com/iiab/iiab/issues/1147 -wordpress_raise_php_limits: False +# If using WordPress intensively, consider setting apache_raise_php_limits above # 7-EDU-APPS @@ -176,6 +178,7 @@ kiwix_enabled: True # Warning: Moodle is a serious LMS, that takes a while to install moodle_install: False moodle_enabled: False +# If using Moodle intensively, consider setting apache_raise_php_limits above # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 From f7e51800ff2dfe41ae1a82b0bed9690a0a23e457 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 19:07:02 -0400 Subject: [PATCH 09/13] Update local_vars_big.yml --- vars/local_vars_big.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index 48416239f..e0ac1aeae 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -77,7 +77,11 @@ dansguardian_enabled: True # 3-BASE-SERVER # Make this False to disable http://box/common/services/power_off.php button: -allow_apache_sudo: True +apache_allow_sudo: True + +# For schools that use WordPress and/or Moodle intensively. See iiab/iiab #1147 +# WARNING: Enabling this (might) cause excess use of RAM or other resources? +apache_raise_php_limits: False # roles/mysql runs here (mandatory) @@ -154,9 +158,7 @@ nextcloud_enabled: True wordpress_install: True wordpress_enabled: True -# For schools that use WordPress intensively. WARNING: Enabling this (might) -# cause excess use of RAM or other resources? github.com/iiab/iiab/issues/1147 -wordpress_raise_php_limits: False +# If using WordPress intensively, consider setting apache_raise_php_limits above # 7-EDU-APPS @@ -176,6 +178,7 @@ kiwix_enabled: True # Warning: Moodle is a serious LMS, that takes a while to install moodle_install: True moodle_enabled: True +# If using Moodle intensively, consider setting apache_raise_php_limits above # Might stall MongoDB on Power Failure: github.com/xsce/xsce/issues/879 # Sugarizer 1.0.1+ strategies to solve? github.com/iiab/iiab/pull/957 From 4e5ddb2c601c0d8748d6031fca515e6d19f74654 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 19:12:22 -0400 Subject: [PATCH 10/13] Update main.yml --- roles/httpd/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 2091165f1..da8503823 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -69,7 +69,7 @@ with_items: - { src: '010-iiab.conf.j2', dest: '/etc/{{ apache_config_dir }}/010-iiab.conf', mode: '0755' } - { src: 'proxy_ajp.conf.j2', dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf', mode: '0644' } - - { src: 'php.ini.j2', dest: '/etc/php.ini', mode: '0644' } + #- { src: 'php.ini.j2', dest: '/etc/php.ini', mode: '0644' } # @jvonau suggests removing this in https://github.com/iiab/iiab/issues/1147 # remove symlinks for mpm-event, replace with mpm-prefork - name: Remove mpm event links (debuntu) @@ -207,10 +207,10 @@ src: 020_apache_poweroff.j2 dest: /etc/sudoers.d/020_apache_poweroff mode: 0755 - when: allow_apache_sudo + when: apache_allow_sudo - name: Remove apache_user permission to poweroff file: dest: /etc/sudoers.d/020_apache_poweroff state: absent - when: not allow_apache_sudo + when: not apache_allow_sudo From 66309fa56a693725bcf3268030194fa9a9eabde1 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 19:14:36 -0400 Subject: [PATCH 11/13] Update install.yml --- roles/wordpress/tasks/install.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/roles/wordpress/tasks/install.yml b/roles/wordpress/tasks/install.yml index 57d36b244..9a51aa587 100644 --- a/roles/wordpress/tasks/install.yml +++ b/roles/wordpress/tasks/install.yml @@ -47,21 +47,6 @@ mode: 0664 keep_newer: yes -# For schools that use WordPress intensively. WARNING: Enabling this (might) -# cause excess use of RAM or other resources? github.com/iiab/iiab/issues/1147 -- name: Raise php.ini limits in schools that use WordPress intensively - lineinfile: - path: "/etc/php/{{ php_version }}/{{ apache_service }}/php.ini" - regexp: "{{ item.regexp }}" - line: "{{ item.line }}" - when: wordpress_raise_php_limits - with_items: - - { regexp: '^upload_max_filesize', line: 'upload_max_filesize = 64M ; default is 2M' } - - { regexp: '^post_max_size', line: 'post_max_size = 128M ; default is 8M' } - - { regexp: '^memory_limit', line: 'memory_limit = 256M ; default is 128M' } - - { regexp: '^max_execution_time', line: 'max_execution_time = 300 ; default is 30' } - - { regexp: '^max_input_time', line: 'max_input_time = 300 ; default is 60' } - # - name: Rename /library/wordpress* to /library/wordpress # shell: if [ ! -d {{ wp_abs_path }} ]; then mv {{ wp_abs_path }}* {{ wp_abs_path }}; fi From 0555d7e4cc0ac6dd4363de950662ecdcb10ae8a6 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 19:25:45 -0400 Subject: [PATCH 12/13] Update main.yml --- roles/httpd/tasks/main.yml | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index da8503823..2d199f952 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -21,16 +21,16 @@ name: "php{{ php_version }}-sqlite3" when: is_debian and ansible_distribution_major_version == "9" -- name: Install httpd required packages (ubuntu) - package: - name: "{{ item }}" - state: present - with_items: - - apache2 - - php - tags: - - download - when: is_ubuntu +- name: Install httpd required packages (ubuntu) + package: + name: "{{ item }}" + state: present + with_items: + - apache2 + - php + tags: + - download + when: is_ubuntu - name: SQLite3 no longer included in another package (ubuntu-18) package: @@ -71,6 +71,21 @@ - { src: 'proxy_ajp.conf.j2', dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf', mode: '0644' } #- { src: 'php.ini.j2', dest: '/etc/php.ini', mode: '0644' } # @jvonau suggests removing this in https://github.com/iiab/iiab/issues/1147 +# For schools that use WordPress and/or Moodle intensively. See iiab/iiab #1147 +# WARNING: Enabling this (might) cause excess use of RAM or other resources? +- name: Raise php.ini limits if using WordPress and/or Moodle intensively + lineinfile: + path: "/etc/php/{{ php_version }}/{{ apache_service }}/php.ini" + regexp: "{{ item.regexp }}" + line: "{{ item.line }}" + when: apache_raise_php_limits + with_items: + - { regexp: '^upload_max_filesize', line: 'upload_max_filesize = 64M ; default is 2M' } + - { regexp: '^post_max_size', line: 'post_max_size = 128M ; default is 8M' } + - { regexp: '^memory_limit', line: 'memory_limit = 256M ; default is 128M' } + - { regexp: '^max_execution_time', line: 'max_execution_time = 300 ; default is 30' } + - { regexp: '^max_input_time', line: 'max_input_time = 300 ; default is 60' } + # remove symlinks for mpm-event, replace with mpm-prefork - name: Remove mpm event links (debuntu) file: From 215f00a954c22d8e31e9cadb962430d0de27dcf3 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 23 Sep 2018 19:34:05 -0400 Subject: [PATCH 13/13] Update main.yml --- roles/wordpress/defaults/main.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/roles/wordpress/defaults/main.yml b/roles/wordpress/defaults/main.yml index 3ea78d238..09887e457 100644 --- a/roles/wordpress/defaults/main.yml +++ b/roles/wordpress/defaults/main.yml @@ -4,11 +4,6 @@ wordpress_enabled: True # If using WordPress intensively, consider setting apache_raise_php_limits in: # /etc/iiab/local_vars.yml -See iiab/iiab #1147 -# WARNING: Enabling this (might) cause excess use of RAM or other resources? -apache_raise_php_limits: False -# roles/httpd/defaults/main.yml - wordpress_download_base_url: https://wordpress.org wordpress_src: latest.tar.gz