diff --git a/roles/httpd/tasks/main.yml b/roles/httpd/tasks/main.yml index 67e6984a1..0cc6889f1 100644 --- a/roles/httpd/tasks/main.yml +++ b/roles/httpd/tasks/main.yml @@ -1,15 +1,10 @@ - name: Install Apache's required packages (debian) package: - name: "{{ item }}" + name: [u'apache2', u'php{{ php_version }}', u'php{{ php_version }}-curl'] state: present - with_items: - - apache2 - - php{{ php_version }} - - php{{ php_version }}-curl - #- php{{ php_version }}-sqlite + when: is_debian tags: - download - when: is_debian - name: Debian changed SQLite name (debian-8) package: @@ -23,14 +18,11 @@ - name: Install Apache's required packages (ubuntu) package: - name: "{{ item }}" + name: [u'apache2', u'php'] state: present - with_items: - - apache2 - - php + when: is_ubuntu tags: - download - when: is_ubuntu - name: SQLite3 no longer included in another package (ubuntu-18) package: @@ -39,17 +31,11 @@ - name: Install Apache's required packages (redhat) package: - name: "{{ item }}" + name: [u'httpd', u'php', u'php-curl', u'mod_authnz_external'] state: present - with_items: - - httpd - - php - - php-curl - - mod_authnz_external -# - php-sqlite + when: is_redhat tags: - download - when: is_redhat # MOVED DOWN ~58 LINES #- name: Remove the default apache2 config file (debuntu)