diff --git a/roles/httpd/tasks/install.yml b/roles/httpd/tasks/install.yml index 04df3f7bf..8ba36841e 100644 --- a/roles/httpd/tasks/install.yml +++ b/roles/httpd/tasks/install.yml @@ -5,8 +5,8 @@ name: - "{{ apache_service }}" # apache2 on Debuntu - libapache2-mod-php{{ php_version }} # 2020-06-15: Required (e.g. for Elgg, Moodle & possibly others) now that mysql/tasks/install.yml installs "php{{ php_version }}-common" rather than the full "php{{ php_version }}" -# - "php{{ php_version }}" -# - "php{{ php_version }}-curl" + #- "php{{ php_version }}" + #- "php{{ php_version }}-curl" state: present # when: is_debian @@ -38,29 +38,29 @@ # when: is_debuntu and (not is_debian_8) and (not is_ubuntu_16) # #when: (is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18 -- name: 'Install 4 packages: httpd, mod_authnz_external, php, php-curl (redhat)' - package: - #name: [u'httpd', u'php', u'php-curl', u'mod_authnz_external'] # FAILS ('u' for Unicode strings) - #name: ['httpd', 'php', 'php-curl', 'mod_authnz_external'] # WORKS - name: - - httpd - - mod_authnz_external - - php - - php-curl - state: present - when: is_redhat +#- name: 'Install 4 packages: httpd, mod_authnz_external, php, php-curl (redhat)' +# package: +# #name: [u'httpd', u'php', u'php-curl', u'mod_authnz_external'] # FAILS ('u' for Unicode strings) +# #name: ['httpd', 'php', 'php-curl', 'mod_authnz_external'] # WORKS +# name: +# - httpd +# - mod_authnz_external +# - php +# - php-curl +# state: present +# when: is_redhat # Remove symlinks for mpm_event, replace with mpm_prefork -- name: Remove both mpm_event symlinks from /etc/apache2/mods-enabled (debuntu) +- name: Remove both mpm_event symlinks from /etc/apache2/mods-enabled file: path: "/etc/apache2/mods-enabled/{{ item }}" state: absent with_items: - mpm_event.conf - mpm_event.load - when: is_debuntu + #when: is_debuntu -- name: Create both mpm_prefork symlinks from /etc/apache2/mods-enabled to /etc/apache2/mods-available (debuntu) +- name: Create both mpm_prefork symlinks from /etc/apache2/mods-enabled to /etc/apache2/mods-available file: src: "/etc/apache2/mods-available/{{ item }}" path: "/etc/apache2/mods-enabled/{{ item }}" @@ -68,9 +68,9 @@ with_items: - mpm_prefork.conf - mpm_prefork.load - when: is_debuntu + #when: is_debuntu -- name: 'Enable 5 Apache modules, as with "a2enmod" command: headers, proxy, proxy_html, proxy_http, rewrite (for http://box/kiwix, http://box/kolibri, http://box/nodered, etc--if debuntu)' +- name: 'Enable 5 Apache modules, as with "a2enmod" command: headers, proxy, proxy_html, proxy_http, rewrite (for http://box/kiwix, http://box/kolibri, http://box/nodered, etc)' apache2_module: name: "{{ item }}" with_items: @@ -79,16 +79,16 @@ - proxy_html - proxy_http - rewrite - when: is_debuntu + #when: is_debuntu -- name: Remove 000-default.conf from /etc/apache2 and /etc/apache2/sites-enabled (debuntu) +- name: Remove 000-default.conf from /etc/apache2 and /etc/apache2/sites-enabled file: path: "{{ item }}" state: absent with_items: - /etc/apache2/000-default.conf # Not nec on Raspbian. Is this really still needed elsewhere? - /etc/apache2/sites-enabled/000-default.conf - when: is_debuntu + #when: is_debuntu - name: Create Apache's pid dir /var/run/{{ apache_user }} file: