summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authortg(x) <*@tg-x.net>2016-10-11 19:05:10 +0200
committertg(x) <*@tg-x.net>2016-10-11 19:05:10 +0200
commit9d1a9b0c3ad89a876111e81b5a1391ed35ec9782 (patch)
tree6e61d975b442e587ad080217ad3faa4a7e89203e /etc
parent4677ded041529d9d1a83a262b60c4a6975bbe968 (diff)
parent56bed8044fa170574faa07414cbc0b7b7edcea29 (diff)
downloaddeployment-9d1a9b0c3ad89a876111e81b5a1391ed35ec9782.tar.gz
deployment-9d1a9b0c3ad89a876111e81b5a1391ed35ec9782.tar.bz2
deployment-9d1a9b0c3ad89a876111e81b5a1391ed35ec9782.zip
Merge branch 'master' of taler.net:deployment
Diffstat (limited to 'etc')
-rw-r--r--etc/nginx/sites-enabled/demo.site1
-rw-r--r--etc/nginx/sites-enabled/test.site1
2 files changed, 2 insertions, 0 deletions
diff --git a/etc/nginx/sites-enabled/demo.site b/etc/nginx/sites-enabled/demo.site
index e0fb090..b712190 100644
--- a/etc/nginx/sites-enabled/demo.site
+++ b/etc/nginx/sites-enabled/demo.site
@@ -10,6 +10,7 @@ server {
listen 443 ssl;
listen [::]:443 ssl;
server_name demo.taler.net www.demo.taler.net;
+ rewrite /javascript /javascript.html break;
include conf.d/demo.redirects;
include conf.d/talerssl;
ssi on;
diff --git a/etc/nginx/sites-enabled/test.site b/etc/nginx/sites-enabled/test.site
index 30c72f7..dbfc748 100644
--- a/etc/nginx/sites-enabled/test.site
+++ b/etc/nginx/sites-enabled/test.site
@@ -11,6 +11,7 @@ server {
listen [::]:443 ssl;
server_name test.taler.net www.test.taler.net;
root /dev/null;
+ rewrite /javascript /javascript.html break;
include conf.d/test.redirects;
include conf.d/talerssl;
ssi on;