Skip to content

Commit

Permalink
Merge pull request #247 from HenningTimm/apache_proxy_task_order
Browse files Browse the repository at this point in the history
Apache proxy task order
  • Loading branch information
donsizemore authored Aug 26, 2022
2 parents 71e1d9d + bb8256f commit 635426b
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions tasks/dataverse-apache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
when: ansible_os_family == "Debian"

- name: install Apache for RedHat/Rocky
yum:
yum:
name: ['httpd', 'mod_ssl']
state: latest
when: ansible_os_family == "RedHat"
Expand All @@ -34,15 +34,6 @@
when: ansible_os_family == "Debian"
notify: enable and restart apache

- name: install unified http proxy config
template:
src: http.proxy.conf.j2
dest: "{{ apache_virtualhost_dir }}/http.proxy.conf"
owner: root
group: root
mode: '0644'
notify: enable and restart apache

- name: enable apache mods on Debian
apache2_module:
state: present
Expand All @@ -54,6 +45,15 @@
when: ansible_os_family == "Debian" ## CHECKME -- does this need to be Debian-specific?
notify: enable and restart apache

- name: install unified http proxy config
template:
src: http.proxy.conf.j2
dest: "{{ apache_virtualhost_dir }}/http.proxy.conf"
owner: root
group: root
mode: '0644'
notify: enable and restart apache

- name: disable default Debian site
file:
path: "{{ apache_virtualhost_dir }}/000-default.conf"
Expand All @@ -73,7 +73,7 @@
template:
src: ports.conf.j2
dest: "{{ apache_config_base_dir }}/ports.conf"
when: ansible_os_family == "Debian" ## TODO where is this in RedHat? ## it would be nicer to use than the Listen statement at the start of the virtualhost
when: ansible_os_family == "Debian" ## TODO where is this in RedHat? ## it would be nicer to use than the Listen statement at the start of the virtualhost
notify: enable and restart apache

- include: dataverse-apache-ssl.yml
Expand Down

0 comments on commit 635426b

Please sign in to comment.