diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index 795751153..d50a780ef 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -5,12 +5,8 @@ with_items: - { src: "server.conf",dest: "/etc/nginx/" } - { src: "nginx.conf",dest: "/etc/nginx/" } - - { src: "usb-lib.conf",dest: "/etc/nginx/conf.d/" } - - { src: "modules.conf",dest: "/etc/nginx/conf.d/" } -# - { src: "admin-console.ini",dest: "/etc/uwsgi/apps-enabled/" } -# the above should be enough once uwsgi is started -# - { src: "uwsgi.unit",dest: "/etc/systemd/system/uwsgi.socket" } - { src: 'ports.conf' , dest: '/etc/{{ apache_service }}/' , mode: '0644' } + - { src: "iiab.conf",dest: "/etc/nginx/conf.d/" } when: nginx_enabled - name: Insure that apache2 is not running -- we may need port swap diff --git a/roles/nginx/templates/modules.conf b/roles/nginx/templates/iiab.conf similarity index 61% rename from roles/nginx/templates/modules.conf rename to roles/nginx/templates/iiab.conf index 16d3cb641..3751d486c 100644 --- a/roles/nginx/templates/modules.conf +++ b/roles/nginx/templates/iiab.conf @@ -1,10 +1,15 @@ +location /usb { + alias /library/www/html/local_content/; + autoindex on; +} + +location /local_content/ { + autoindex on; +} location /modules/ { fancyindex on; # Enable fancy indexes. fancyindex_exact_size off; # Output human-readable file sizes. fancyindex_ignore index.htmlf rachel-index.php; -# autoindex on; -# autoindex_exact_size off; -# autoindex_format html; -# autoindex_localtime on; } + diff --git a/roles/nginx/templates/usb-lib.conf b/roles/nginx/templates/usb-lib.conf deleted file mode 100644 index 8feb6703d..000000000 --- a/roles/nginx/templates/usb-lib.conf +++ /dev/null @@ -1,7 +0,0 @@ -location /usb { - alias /library/www/html/local_content/; - autoindex on; -} -location /local_content/ { - autoindex on; -}