commit c32cb0bdbc8a49df73d0b6fed6ebcb2d88b40154 Author: iwakeh iwakeh@torproject.org Date: Thu Nov 17 14:35:08 2016 +0100

Addendum to task-20562: File 'nginx-collector' moved to src/main/resources as it is not part of the webapp files. Adapted path in INSTALL.md to match the new location. --- INSTALL.md | 2 +- src/main/resources/nginx-collector | 33 +++++++++++++++++++++++++++++++++ src/main/webapp/nginx-collector | 33 --------------------------------- 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md index 9e3cf1a..7e6c4d4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -167,7 +167,7 @@ refer to settings in `collector.properties`): You can also configure nginx as the web server of your choice. If you use nginx you will need to use the FancyIndex module to be able to include the provided footer and header of the webapp. Copy -`collector-<version>/src/main/webapp/nginx-collector` to +`collector-<version>/src/main/resources/nginx-collector` to `/etc/nginx/sites-available/` and make a symbolic link in `/etc/nginx/sites-enabled/` to enable it.

diff --git a/src/main/resources/nginx-collector b/src/main/resources/nginx-collector new file mode 100644 index 0000000..fda655a --- /dev/null +++ b/src/main/resources/nginx-collector @@ -0,0 +1,33 @@ +## +# The following is a simple nginx configuration to run CollecTor. +## +server { + + # We assume the you have copied the content of webapp to + # /var/www/collector/html + + root /var/www/collector/html; + + # This option make sure that nginx will follow symlinks to the appropriate + # CollecTor folders + autoindex on; + + index index.html; + + # You can change the specified servername. If you leave it as it is you will + # need to add an entry on /etc/hosts for collector + server_name collector; + + location / { + fancyindex on; + fancyindex_exact_size off; + fancyindex_header /header.html; + fancyindex_footer /footer.html; + try_files $uri $uri/ =404; + } + + location ~/.ht { + deny all; + } +} + diff --git a/src/main/webapp/nginx-collector b/src/main/webapp/nginx-collector deleted file mode 100644 index fda655a..0000000 --- a/src/main/webapp/nginx-collector +++ /dev/null @@ -1,33 +0,0 @@ -## -# The following is a simple nginx configuration to run CollecTor. -## -server { - - # We assume the you have copied the content of webapp to - # /var/www/collector/html - - root /var/www/collector/html; - - # This option make sure that nginx will follow symlinks to the appropriate - # CollecTor folders - autoindex on; - - index index.html; - - # You can change the specified servername. If you leave it as it is you will - # need to add an entry on /etc/hosts for collector - server_name collector; - - location / { - fancyindex on; - fancyindex_exact_size off; - fancyindex_header /header.html; - fancyindex_footer /footer.html; - try_files $uri $uri/ =404; - } - - location ~/.ht { - deny all; - } -} -