diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/nginx/sites-enabled/blog-test-ssl.site | 39 | ||||
| -rw-r--r-- | etc/nginx/sites-enabled/blog-test.site | 46 |
2 files changed, 11 insertions, 74 deletions
diff --git a/etc/nginx/sites-enabled/blog-test-ssl.site b/etc/nginx/sites-enabled/blog-test-ssl.site index ed9739f..a335a3f 100644 --- a/etc/nginx/sites-enabled/blog-test-ssl.site +++ b/etc/nginx/sites-enabled/blog-test-ssl.site @@ -1,11 +1,12 @@ +upstream talerblog-test { + server 127.0.0.1:8002; +} + 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 blog.test.taler.net; - ssi on; - root /home/test/merchant/examples/blog/; - index index.html; + ssi on; ssl_certificate /etc/letsencrypt/live/taler.net/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/taler.net/privkey.pem; @@ -17,34 +18,10 @@ server { add_header Strict-Transport-Security "max-age=63072000; preload"; - # 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; + uwsgi_pass talerblog-test; + include /etc/nginx/uwsgi_params; } - location /articles { - - internal; - } - - 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; } diff --git a/etc/nginx/sites-enabled/blog-test.site b/etc/nginx/sites-enabled/blog-test.site index 99a1e21..6da16d2 100644 --- a/etc/nginx/sites-enabled/blog-test.site +++ b/etc/nginx/sites-enabled/blog-test.site @@ -1,45 +1,5 @@ server { - listen 80; ## listen for ipv4; this line is default and implied - # listen [::]:80 default_server ipv6only=on; ## listen for ipv6 - - server_name blog.test.taler.net; - - ssi on; - root /home/test/merchant/examples/blog; - index index.html; - - # 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 /articles { - - internal; - } - - 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; + listen 80; + server_name bank.test.taler.net; + rewrite ^ https://$server_name$request_uri? permanent; } |