From a19f92d0dfa31a310fa26b927d06e22018382f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szekeres=20Ba=CC=81lint?= <szekeres.balint@hps.hu>
Date: Sun, 7 Jan 2018 22:53:27 +0100
Subject: [PATCH] typo fix, cdn default off, cdn gzip

---
 public/assets/js/app.js                |  4 +++-
 public/templates/_general.conf.html    |  2 +-
 public/templates/example.com.conf.html | 22 ++++++++++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/public/assets/js/app.js b/public/assets/js/app.js
index e36db75..ae49d98 100644
--- a/public/assets/js/app.js
+++ b/public/assets/js/app.js
@@ -13,7 +13,7 @@
 			https:				false,
 			http2:				true,
 			email:				'hello@example.com',
-			cdn:				true,
+			cdn:				false,
 			non_www:			true,
 			php:				'7.2',
 			index_html:			false,
@@ -50,6 +50,8 @@
 			docs:	'pdf|docx?|xlsx?|pptx?'
 		};
 
+		$scope.gzipTypes = 'text/plain text/css text/xml application/json application/javascript application/xml+rss application/atom+xml image/svg+xml';
+
 
 
 		/////////////////////
diff --git a/public/templates/_general.conf.html b/public/templates/_general.conf.html
index 571b906..89ba3ae 100644
--- a/public/templates/_general.conf.html
+++ b/public/templates/_general.conf.html
@@ -41,4 +41,4 @@ gzip on;
 gzip_vary on;
 gzip_proxied any;
 gzip_comp_level 6;
-gzip_types text/plain text/css text/xml application/json application/javascript application/xml+rss application/atom+xml image/svg+xml;</span>
\ No newline at end of file
+gzip_types {{ gzipTypes }};</span>
\ No newline at end of file
diff --git a/public/templates/example.com.conf.html b/public/templates/example.com.conf.html
index 2049e0e..4c30dca 100644
--- a/public/templates/example.com.conf.html
+++ b/public/templates/example.com.conf.html
@@ -40,7 +40,14 @@ server {
 
 	ssl_certificate /etc/letsencrypt/live/{{ data.domain }}/fullchain.pem;
 	ssl_certificate_key /etc/letsencrypt/live/{{ data.domain }}/privkey.pem;
-	ssl_trusted_certificate /etc/letsencrypt/live/{{ data.domain }}/fullchain.pem;
+	ssl_trusted_certificate /etc/letsencrypt/live/{{ data.domain }}/fullchain.pem;<span ng-if="data.gzip">
+
+	# gzip
+	gzip on;
+	gzip_vary on;
+	gzip_proxied any;
+	gzip_comp_level 6;
+	gzip_types {{ gzipTypes }};</span>
 
 	include _ssl.conf;
 
@@ -51,7 +58,7 @@ server {
 	}
 
 	location / {
-		deny all
+		deny all;
 	}
 }</span>
 
@@ -109,7 +116,14 @@ server {
 	server_name cdn.{{ data.domain }};
 	root /var/www/{{ data.domain }}{{ data.document_root }};<span ng-if="data.access_log !== ''">
 
-	access_log off;</span>
+	access_log off;</span><span ng-if="data.gzip">
+
+	# gzip
+	gzip on;
+	gzip_vary on;
+	gzip_proxied any;
+	gzip_comp_level 6;
+	gzip_types {{ gzipTypes }};</span>
 
 	location ~* \.(?:{{ extensions.assets }}|{{ extensions.fonts }}|{{ extensions.svg }}|{{ extensions.images }}|{{ extensions.audio }}|{{ extensions.video }}|{{ extensions.docs }})$ {
 		add_header Access-Control-Allow-Origin "*";
@@ -118,7 +132,7 @@ server {
 	}
 
 	location / {
-		deny all
+		deny all;
 	}
 }</span>