external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #503 from jvonau/apache_cleanup

Browse source 
Pull from jvonau:apache_cleanup -- Cleaner filesystem when Apache is not installed
This commit is contained in:
A Holt 2021-08-09 06:35:32 -04:00 committed by GitHub
commit 43b54ddc3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/nginx/tasks/install.yml
View file

@ -42,7 +42,7 @@
path: /etc/nginx/sites-enabled/default
state: absent
- 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'
- name: 'Install 3 (of 5) files from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/nginx/mime.types
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: 'apache-ports.conf', dest: '/etc/{{ apache_service }}/ports.conf' } # 2021-08-08: Restored from enable-or-disable.yml
# - { src: 'apache-ports.conf', dest: '/etc/{{ apache_service }}/ports.conf' } # 2021-08-09: Moved to pbx role
# - { 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:

7
roles/pbx/tasks/freepbx_dependencies.yml
View file

@ -60,6 +60,13 @@
# - proxy_http
# - rewrite
- name: 'Install /etc/{{ apache_service }}/ports.conf'
template:
src: roles/nginx/templates/apache-ports.conf
dest: /etc/{{ apache_service }}/ports.conf
# lineinfile?
# 2021-08-08: Security risks? But official install doc recommends this:
# https://wiki.freepbx.org/display/FOP/Installing+FreePBX+16+on+Debian+10.9
- name: Run "sed -i 's/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf"