summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-03-04 17:15:10 +0100
committerFlorian Dold <florian.dold@gmail.com>2016-03-04 17:15:10 +0100
commit37f44c6818139453ad23f022a175b62eb573f900 (patch)
tree7c6a6ef12865a552bef3213baf6abc165d59d623
parentacdcd7fb26759c60e4c93bde886bed50e36e674c (diff)
downloaddeployment-37f44c6818139453ad23f022a175b62eb573f900.tar.gz
deployment-37f44c6818139453ad23f022a175b62eb573f900.tar.bz2
deployment-37f44c6818139453ad23f022a175b62eb573f900.zip
point demo to the right thing
-rw-r--r--etc/nginx/sites-enabled/demo-ssl.site2
-rw-r--r--etc/nginx/sites-enabled/demo.site8
2 files changed, 2 insertions, 8 deletions
diff --git a/etc/nginx/sites-enabled/demo-ssl.site b/etc/nginx/sites-enabled/demo-ssl.site
index 8dbf004..4d965c8 100644
--- a/etc/nginx/sites-enabled/demo-ssl.site
+++ b/etc/nginx/sites-enabled/demo-ssl.site
@@ -2,7 +2,7 @@ server {
listen 443 ssl; ## listen for ipv4; this line is default and implied
# listen [::]:80 default_server ipv6only=on; ## listen for ipv6
- root /home/test/landing/;
+ root /home/demo/landing/;
index index.html;
# Make site accessible from http://localhost/
diff --git a/etc/nginx/sites-enabled/demo.site b/etc/nginx/sites-enabled/demo.site
index a9b771d..ad4e170 100644
--- a/etc/nginx/sites-enabled/demo.site
+++ b/etc/nginx/sites-enabled/demo.site
@@ -1,12 +1,6 @@
server {
- listen 80; ## listen for ipv4; this line is default and implied
- # listen [::]:80 default_server ipv6only=on; ## listen for ipv6
-
- root /home/demo/landing/;
-
- # Make site accessible from http://localhost/
+ listen 80;
server_name demo.taler.net;
server_name www.demo.taler.net;
-
rewrite ^ https://$server_name$request_uri? permanent;
}