diff options
author | Richard Wall <richard@aziz> | 2010-08-22 22:38:05 +0100 |
---|---|---|
committer | Richard Wall <richard@aziz> | 2010-08-22 22:38:05 +0100 |
commit | 54b3c39b40077b045e7d10b78eaf85b11dad5a3a (patch) | |
tree | 613de63bd5fa0976e138be2601bd4caf991e61f9 /docs/nginx.conf.example | |
parent | fb130e633439f43a733f5de3bd36aa4f34a89fe2 (diff) | |
parent | 352f0ea3d709eced87f598b4058d43aff0d5664a (diff) |
Merge ~richardw/jarmon/auto-apidocumentationv10.8pre1
* Cleanup and add further doc strings for compatibility with yuidoc
* Add a tool to automatically download and run yuidoc on the source tree
* Add a tool to automatically create a releasable source archive containing apidocs
* Add documentation of the apidoc and release tools.
* Rearrange the source tree - moving all examples into the docs/examplesfolder
Diffstat (limited to 'docs/nginx.conf.example')
-rw-r--r-- | docs/nginx.conf.example | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/docs/nginx.conf.example b/docs/nginx.conf.example deleted file mode 100644 index 73420f1..0000000 --- a/docs/nginx.conf.example +++ /dev/null @@ -1,66 +0,0 @@ -# This is an example of a minimal nginx config file, demonstrating: -# * how to set the mime type of served RRD files -# * how to configure nginx to compress the rrd files on the fly -# * how to setup a /data url alias pointing to the collectd RRD folder -# -# Add the relevant parts of this example config to your existing nginx config -# files, or modify it and use it directly by running the following command line -# from your Jarmon working directory "nginx -p . -c docs/nginx.conf.example" eg: -# -# richard@aziz:~/Projects/Jarmon/trunk$ nginx -p . -c docs/nginx.conf.example -# [alert]: could not open error log file: open() "/var/log/nginx/error.log" failed (13: Permission denied) -# -# The error line is normal if you are running nginx as an unprivileged user. - - -daemon off; -pid nginx.pid; -error_log nginx.error.log info; - -events { - worker_connections 1024; -} - -http { - sendfile on; - keepalive_timeout 65; - tcp_nodelay on; - - gzip on; - gzip_disable "MSIE [1-6]\.(?!.*SV1)"; - - client_body_temp_path /tmp/nginx_body; - proxy_temp_path /tmp/nginx_proxy; - fastcgi_temp_path /tmp/nginx_fastcgi; - - types { - application/octet-stream rrd; - text/html html htm shtml; - text/css css; - text/xml xml rss; - image/gif gif; - image/jpeg jpeg jpg; - application/x-javascript js; - text/plain txt; - } - - server { - listen 8080 default; - server_name localhost; - - access_log nginx.localhost.access.log; - error_log nginx.localhost.error.log; - - gzip_types application/octet-stream; - - location / { - root .; - index index.html; - } - - location /data { - alias /var/lib/collectd/rrd/aziz; - autoindex on; - } - } -} |