experiment with different config style

1 files changed, 7 insertions, 24 deletions

diff --git a/etc/nginx-sites-enabled/test.site b/etc/nginx-sites-enabled/test.site
index 372928c..2421199 100644
--- 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;
 }