mirror of
https://github.com/iiab/iiab.git
synced 2025-02-12 11:12:06 +00:00
nginx/tasks/install.yml: Overwrite /etc/apache2/ports.conf + Deprecate unmaintained Elgg
This commit is contained in:
parent
fc724ab386
commit
9f58a01b93
13 changed files with 9 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
|||
- name: Stop '{{ apache_service }}' systemd service, just in case it exists
|
||||
- name: Stop '{{ apache_service }}' systemd service, in case it exists -- REGARDLESS /etc/{{ apache_service }}/ports.conf WILL BE OVERWRITTEN BELOW
|
||||
systemd:
|
||||
name: "{{ apache_service }}" # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
|
||||
state: stopped
|
||||
|
@ -42,7 +42,7 @@
|
|||
path: /etc/nginx/sites-enabled/default
|
||||
state: absent
|
||||
|
||||
- name: 'Install 3 (of 5) files from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/nginx/mime.types'
|
||||
- name: 'Install 4 (of 5) files from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/nginx/mime.types, /etc/{{ apache_service }}/ports.conf'
|
||||
template:
|
||||
src: "{{ item.src }}"
|
||||
dest: "{{ item.dest }}"
|
||||
|
@ -50,7 +50,7 @@
|
|||
- { src: 'server.conf.j2', dest: '/etc/nginx/server.conf' }
|
||||
- { src: 'nginx.conf.j2', dest: '/etc/nginx/nginx.conf' }
|
||||
- { src: 'mime.types.j2', dest: '/etc/nginx/mime.types' }
|
||||
# - { src: 'ports.conf.j2', dest: '/etc/{{ apache_service }}/ports.conf' } # Moved to enable-or-disable.yml
|
||||
- { src: 'apache-ports.conf.j2', dest: '/etc/{{ apache_service }}/ports.conf' } # 2021-08-08: Restored from enable-or-disable.yml
|
||||
# - { src: 'iiab.conf.j2', dest: "{{ nginx_conf_dir }}/iiab.conf" } # Moved into homepage.yml, invoked later by roles/www_options/tasks/main.yml (see below!)
|
||||
|
||||
- debug:
|
||||
|
|
|
@ -2,7 +2,11 @@
|
|||
# have to change the VirtualHost statement in
|
||||
# /etc/apache2/sites-enabled/000-default.conf
|
||||
|
||||
Listen 127.0.0.1:{{ apache_port }}
|
||||
# Apache's stock default
|
||||
#Listen 80
|
||||
|
||||
# IIAB NGINX proxying to legacy svcs (Dec 2019 - Aug 2021)
|
||||
#Listen 127.0.0.1:{{ apache_port }}
|
||||
|
||||
#<IfModule ssl_module>
|
||||
# Listen 443
|
||||
|
@ -13,3 +17,4 @@ Listen 127.0.0.1:{{ apache_port }}
|
|||
#</IfModule>
|
||||
|
||||
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
|
||||
|
Loading…
Reference in a new issue