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 - restore iiab_home_url

Browse source
This commit is contained in:
Jerry Vonau 2019-12-17 09:25:22 -06:00
parent 383f6194f7
commit 1e47300e5b
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/nginx/tasks/main.yml
View file

@ -6,7 +6,7 @@
- { src: "server.conf",dest: "/etc/nginx/" } - { src: "server.conf",dest: "/etc/nginx/" }
- { src: "nginx.conf",dest: "/etc/nginx/" } - { src: "nginx.conf",dest: "/etc/nginx/" }
- { src: 'ports.conf' , dest: '/etc/{{ apache_service }}/' , mode: '0644' } - { src: 'ports.conf' , dest: '/etc/{{ apache_service }}/' , mode: '0644' }
- { src: "iiab.conf",dest: "/etc/nginx/conf.d/" } - { src: "iiab.conf.j2",dest: "/etc/nginx/conf.d/iiab.conf" }
when: nginx_enabled when: nginx_enabled
- name: Insure that apache2 is not running -- we may need port swap - name: Insure that apache2 is not running -- we may need port swap

11
roles/nginx/templates/iiab.conf → roles/nginx/templates/iiab.conf.j2
View file

@ -1,10 +1,14 @@
location / {
rewrite ^/$ $1/{{ iiab_home_url }};
}
location /usb { location /usb {
alias /library/www/html/local_content/; alias /library/www/html/local_content/;
autoindex on; autoindex on;
} }
location /local_content/ { location /local_content/ {
autoindex on; autoindex on;
} }
location /modules/ { location /modules/ {
@ -12,4 +16,3 @@ location /modules/ {
fancyindex_exact_size off; # Output human-readable file sizes. fancyindex_exact_size off; # Output human-readable file sizes.
fancyindex_ignore index.htmlf rachel-index.php; fancyindex_ignore index.htmlf rachel-index.php;
} }

1
roles/nginx/templates/server.conf
View file

@ -8,7 +8,6 @@ server {
access_log {{ apache_log_dir }}/scripts.log scripts; access_log {{ apache_log_dir }}/scripts.log scripts;
index index.php index.html index.htm; index index.php index.html index.htm;
rewrite ^/$ $scheme://$server_addr/home/;
# let individual services drop location blocks in conf.d # let individual services drop location blocks in conf.d
include /etc/nginx/conf.d/*; include /etc/nginx/conf.d/*;