From c27f033f4d794e28f4a6939df87ba54336127af0 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Sat, 27 Jul 2013 14:47:45 -0400 Subject: use gzip_static only if nginx supports it --- .gitignore | 4 ++++ nginx.conf | 2 +- nginx.sh | 7 ++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5119d23..902d0ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ +# unrpyc built code /unrpyc/renpy +/unrpyc/*.json.o /unrpyc/*.json /unrpyc/*.rpyc +# generated nginx conf +/nginx.gen.conf # ignore 'copyrighted' contents similar to emulators /www/scripts /www/dump diff --git a/nginx.conf b/nginx.conf index db84ed0..9e94114 100644 --- a/nginx.conf +++ b/nginx.conf @@ -36,7 +36,7 @@ http { default_type application/octet-stream; gzip on; - gzip_static on; + include nginx.gen.conf; gzip_types text/plain text/css application/javascript application/json; gzip_vary on; diff --git a/nginx.sh b/nginx.sh index 998265e..c01b602 100755 --- a/nginx.sh +++ b/nginx.sh @@ -1,2 +1,7 @@ #!/bin/sh -exec nginx -p `dirname $0` -c nginx.conf +cd "`dirname $0`" +touch nginx.gen.conf +if nginx -V 2>&1 | grep -q -- --with-http_gzip_static_module; then + echo "gzip_static on" >> nginx.gen.conf +fi +exec nginx -p "$PWD" -c nginx.conf -- cgit v1.2.3-70-g09d2