From e9a2891e576ac4a77f64e3f6e97c0754430b4b4c Mon Sep 17 00:00:00 2001
From: Kristian Rekstad <krirek@msn.com>
Date: Sun, 1 Dec 2019 20:59:47 +0100
Subject: [PATCH] Use one server_name for all names

---
 .../no/ntnu/tdt4250/nginx/dsl/generator/main/generate.mtl  | 6 ++----
 .../ntnu/tdt4250/nginx/dsl/generator/main/mysite.no.nginx  | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/no.ntnu.tdt4250.nginx.dsl.generator/src/no/ntnu/tdt4250/nginx/dsl/generator/main/generate.mtl b/no.ntnu.tdt4250.nginx.dsl.generator/src/no/ntnu/tdt4250/nginx/dsl/generator/main/generate.mtl
index d02c95a..16eb2ac 100644
--- a/no.ntnu.tdt4250.nginx.dsl.generator/src/no/ntnu/tdt4250/nginx/dsl/generator/main/generate.mtl
+++ b/no.ntnu.tdt4250.nginx.dsl.generator/src/no/ntnu/tdt4250/nginx/dsl/generator/main/generate.mtl
@@ -121,10 +121,7 @@ location / {
 
 [template public servernames(site: Site)]
 # sitename
-server_name: [site.name/];
-[for (alternative: String | site.alternativeNames)]
-server_name: [alternative/];
-[/for]
+server_name: [site.name/][for (alternative: String | site.alternativeNames)] [alternative/][/for];
 [/template]
 
 [template public error_pages(site: Site)]
@@ -183,3 +180,4 @@ gzip_types text/plain text/css application/json application/x-javascript text/xm
 	else site.gzip
 	endif
 /]
+
diff --git a/no.ntnu.tdt4250.nginx.dsl.generator/src/no/ntnu/tdt4250/nginx/dsl/generator/main/mysite.no.nginx b/no.ntnu.tdt4250.nginx.dsl.generator/src/no/ntnu/tdt4250/nginx/dsl/generator/main/mysite.no.nginx
index 74d95c6..0b61476 100644
--- a/no.ntnu.tdt4250.nginx.dsl.generator/src/no/ntnu/tdt4250/nginx/dsl/generator/main/mysite.no.nginx
+++ b/no.ntnu.tdt4250.nginx.dsl.generator/src/no/ntnu/tdt4250/nginx/dsl/generator/main/mysite.no.nginx
@@ -8,4 +8,9 @@ mysite.no from site.no:
   error_page: 500 502 503 504 "/50x.html"
   https_redirect: true
   template: php7.2 
-  gzip: true
\ No newline at end of file
+  gzip: true
+  
+qore.no
+www.qore.no:
+	port: 3000
+	log_name: "/var/log/qore.no.access.log"