python shop

3 files changed, 13 insertions, 101 deletions

diff --git a/etc/nginx/sites-enabled/bank-test-ssl.site b/etc/nginx/sites-enabled/bank-test-ssl.site
index 0b455dc..26de0d7 100644
--- a/etc/nginx/sites-enabled/bank-test-ssl.site
+++ b/etc/nginx/sites-enabled/bank-test-ssl.site
@@ -3,26 +3,16 @@ upstream talerbank-test {
 }
 
 server {
-	listen   443 ssl; ## listen for ipv4; this line is default and implied
+	listen 443 ssl;
 
-	# Make site accessible from http://localhost/
 	server_name bank.test.taler.net;
         ssi on;
 
-	ssl_certificate /etc/letsencrypt/live/taler.net/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/taler.net/privkey.pem;
-	ssl_prefer_server_ciphers on;
-        ssl_session_cache shared:SSL:10m;
-        ssl_dhparam /etc/ssl/certs/dhparam.pem;
-	ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
-	ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH';
-
-	add_header Strict-Transport-Security "max-age=63072000; preload";
-
 	location / {
 		uwsgi_pass  talerbank-test;
 		include     /etc/nginx/uwsgi_params;
 	}
 
 	include conf.d/test.redirects;
+	include conf.d/talerssl;
 }
diff --git a/etc/nginx/sites-enabled/shop-test-ssl.site b/etc/nginx/sites-enabled/shop-test-ssl.site
index ef6aa8c..c631e49 100644
--- a/etc/nginx/sites-enabled/shop-test-ssl.site
+++ b/etc/nginx/sites-enabled/shop-test-ssl.site
@@ -1,53 +1,18 @@
+upstream talershop-test {
+	server 127.0.0.1:8003;
+}
+
 server {
-	listen   443 ssl; ## listen for ipv4; this line is default and implied
- 	# 	listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
+	listen 443 ssl;
 
 	server_name shop.test.taler.net;
-	ssi on;
-	root /home/test/merchant/examples/shop/;
-        index index.php;
-
-	ssl_certificate /etc/letsencrypt/live/taler.net/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/taler.net/privkey.pem;
-	ssl_prefer_server_ciphers on;
-        ssl_session_cache shared:SSL:10m;
-        ssl_dhparam /etc/ssl/certs/dhparam.pem;
-	ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
-	ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH';
-
-	add_header Strict-Transport-Security "max-age=63072000; preload";
-
-	# Make site accessible from http://localhost/
+        ssi on;
 
 	location / {
-            try_files $uri $uri/ =404;
-            rewrite /taler/pay /pay.php;
-            rewrite /taler/contract /generate_taler_contract.php;
+		uwsgi_pass  talershop-test;
+		include     /etc/nginx/uwsgi_params;
 	}
 
-	location /fullfillment {
-            rewrite /(.*) /$1.php;	
-	}
-
-        location /test/contract {
-                rewrite (.*) /generate_taler_contract.php?cli_debug=yes;
-        }
-
-        location /test/contract/frontend {
-                rewrite (.*) /generate_taler_contract.php?backend_test=no;
-        }
-
-	location ~ \.php$ {
-        	fastcgi_pass unix:/var/run/php5-fpm.sock;
-		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-                include fastcgi_params;
-        }
-
-       	location /backend {
-                rewrite /backend/(.*) /$1 break;
-	        proxy_pass http://127.0.0.1:19966;
-	        proxy_redirect off;
-	        proxy_set_header Host $host;
-	}
 	include conf.d/test.redirects;
+	include conf.d/talerssl;
 }
diff --git a/etc/nginx/sites-enabled/shop-test.site b/etc/nginx/sites-enabled/shop-test.site
index 0b890c0..e066710 100644
--- a/etc/nginx/sites-enabled/shop-test.site
+++ b/etc/nginx/sites-enabled/shop-test.site
@@ -1,48 +1,5 @@
 server {
-	listen   80; ## listen for ipv4; this line is default and implied
- 	# 	listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
-        ssi on;
+	listen 80;
 	server_name shop.test.taler.net;
-
-	root /home/test/merchant/examples/shop;
-        index index.php;
-
-	# Make site accessible from http://localhost/
-
-	location / {
-            try_files $uri $uri/ =404;
-            rewrite /taler/pay /pay.php;
-            rewrite /taler/contract /generate_taler_contract.php;
-	
-	}
-
-	location /fullfillment {
-            rewrite /(.*) /$1.php;
-	
-	}
-
-        location /test/contract {
-                rewrite (.*) /generate_taler_contract.php?cli_debug=yes;
-        }
-
-        location /test/contract/frontend {
-                rewrite (.*) /generate_taler_contract.php?backend_test=no;
-        }
-
-	location ~ \.php$ {
-
-        	fastcgi_pass unix:/var/run/php5-fpm.sock;
-		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-                include fastcgi_params;
-	
-        }
-
-       	location /backend {
-                rewrite /backend/(.*) /$1 break;
-	        proxy_pass http://127.0.0.1:19966;
-	        proxy_redirect off;
-	        proxy_set_header Host $host;
-	}
-
-	include conf.d/test.redirects;
+	rewrite ^ https://$server_name$request_uri? permanent;
 }