commit 7e51e4061085f0f110bfcfd07137e7a01456b097 parent d086ff164e1cf95e537f7e95574a72878079f69c Author: Florian Dold <florian.dold@gmail.com> Date: Tue, 1 Mar 2016 23:03:37 +0100 experiment with different config style Diffstat:
| M | etc/nginx-sites-enabled/test.site | | | 31 | +++++++------------------------ |
1 file changed, 7 insertions(+), 24 deletions(-)
diff --git a/etc/nginx-sites-enabled/test.site b/etc/nginx-sites-enabled/test.site @@ -1,26 +1,9 @@ server { - listen 80; ## listen for ipv4; this line is default and implied - # listen [::]:80 default_server ipv6only=on; ## listen for ipv6 - - root /home/test/landing/; - index index.html; - - # Make site accessible from http://localhost/ - server_name test.taler.net; - server_name www.test.taler.net; - - rewrite ^/bank $scheme://bank.test.taler.net/ redirect; - rewrite ^/shop $scheme://shop.test.taler.net/ redirect; - - location ~ \.php$ { - fastcgi_pass unix:/var/run/php5-fpm.sock; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - } - - location /extension { - root /home/test/wallet/wallet_button/firefox_src/xpi/; - rewrite /extension /taler-wallet.xpi break; - } - + listen 80; + include test; +} +server { + listen 443 ssl; + include test; + include /etc/nginx/taler-ssl.inc; }