external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

nginx softcoding

Browse source
This commit is contained in:
Jerry Vonau 2021-06-28 16:34:55 -05:00
parent 2e6017405d
commit 2e109bf096
2 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,11 @@
# append: yes
- name: Insure alternate nginx path is present
file:
state: directory
path: "{{ nginx_conf_dir }}"
- name: Remove NGINX default config /etc/nginx/sites-enabled/default
file:
path: /etc/nginx/sites-enabled/default
@ -48,9 +53,9 @@
src: "{{ item.src }}"
dest: "{{ item.dest }}"
with_items:
- { 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: 'server.conf.j2', dest: '{{ nginx_dir }}/server.conf' }
- { src: 'nginx.conf.j2', dest: '{{ nginx_dir }}/nginx.conf' }
- { src: 'mime.types.j2', dest: '{{ nginx_dir }}/mime.types' }
# - { src: 'ports.conf', dest: '/etc/{{ apache_service }}/ports.conf' } # 2021-08-09: Restored from enable-or-disable.yml then moved to roles/pbx/tasks/apache.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!)
@ -58,12 +63,26 @@
msg: roles/nginx/tasks/homepage.yml will run LATER (invoked by roles/www_options/tasks/main.yml) SO THAT NGINX CAN REDIRECT http://box TO http://box{{ iiab_home_url }} (based on var iiab_home_url)
# - include_tasks: roles/nginx/tasks/homepage.yml
#ubuntu@box:/opt/iiab/iiab$ grep -r 'fastcgi_pass' roles
#roles/awstats/templates/awstats-nginx.conf: fastcgi_pass php;
#roles/nextcloud/templates/nextcloud-nginx.conf.j2: fastcgi_pass php;
#roles/moodle/templates/moodle-nginx.conf.j2: fastcgi_pass php;
#roles/osm-vector-maps/templates/osm-vector-maps-nginx.conf.j2: fastcgi_pass php;
#roles/pbx/templates/freepbx-nginx.conf.j2: fastcgi_pass unix:/run/php/php-asterisk.sock;
#roles/mediawiki/templates/mediawiki-nginx.conf.j2: fastcgi_pass php; # or whatever port your PHP-FPM listens on
#roles/mediawiki/templates/mediawiki-nginx.conf.j2:# fastcgi_pass 127.0.0.1:9000; # or whatever port your PHP-FPM listens on
#roles/wordpress/templates/wordpress-nginx.conf.j2: fastcgi_pass php;
#roles/wordpress/templates/wordpress-nginx.conf.j2: fastcgi_pass php;
#roles/nginx/templates/admin-console-nginx.conf.unused: fastcgi_pass php;
# should really be 'state: stopped' 'enabled: no' and each role should enable and restart as needed to keep system resources in check when
# php{{ php_version }}-fpm is not required by any selected roles.
- name: Restart php{{ php_version }}-fpm systemd service
systemd:
name: "php{{ php_version }}-fpm"
state: restarted
# RECORD NGINX AS INSTALLED
- name: "Set 'nginx_installed: True'"

3
roles/nginx/templates/server.conf.j2
View file

@ -3,7 +3,7 @@ server {
server_name $hostname; # e.g. box.lan, set dynamically when NGINX starts
#server_name {{ iiab_hostname }}.{{ iiab_domain }};
#server_name {{ iiab_hostname }};
listen 80;
listen {{ nginx_port }};
index index.php index.html index.htm;
@ -19,6 +19,7 @@ server {
# let individual services drop location blocks in conf.d
include {{ nginx_conf_dir }}/*;
# why is everything below here even present?
location ~ .*\.php$ {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr;