From 7fedd0a9db482ea451394aef67ddad5860bfca46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ba=CC=81lint=20Szekeres?= <balint.szekeres@feat.agency>
Date: Wed, 22 May 2019 19:31:08 +0200
Subject: [PATCH] added security.conf with higher precedence fixes again #88

---
 public/index.html                               |  9 +++++++++
 .../conf/nginxconfig.io/general.conf.html       | 17 -----------------
 .../conf/nginxconfig.io/security.conf.html      | 16 ++++++++++++++++
 .../conf/sites-available/example.com.conf.html  | 14 ++++++++++++++
 4 files changed, 39 insertions(+), 17 deletions(-)
 create mode 100644 public/templates/conf/nginxconfig.io/security.conf.html

diff --git a/public/index.html b/public/index.html
index 9dac48a..ba79655 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1065,6 +1065,15 @@
 							<pre><code class="nginx" ng-include="'templates/conf/nginxconfig.io/letsencrypt.conf.html?v=COMMIT_HASH'" onload="refreshHighlighting()"></code></pre>
 						</div><div id="file-letsencrypt" class="code highlighted"></div>
 					</section>
+					<section class="col-xl-6 grid-item file" ng-if="isModularized()" ng-cloak>
+						<strong>/etc/nginx/nginxconfig.io/security.conf</strong>
+						<button class="btn btn-light btn-clipboard" ngclipboard data-clipboard-target="#file-security" ngclipboard-success="clipboardSuccess('security.conf')">
+							<img src="assets/img/clipboard-dark.svg" alt="Copy to clipboard">
+						</button>
+						<div class="code source" data-filename="nginxconfig.io/security.conf">
+							<pre><code class="nginx" ng-include="'templates/conf/nginxconfig.io/security.conf.html?v=COMMIT_HASH'" onload="refreshHighlighting()"></code></pre>
+						</div><div id="file-security" class="code highlighted"></div>
+					</section>
 					<section class="col-xl-6 grid-item file" ng-if="isModularized()" ng-cloak>
 						<strong>/etc/nginx/nginxconfig.io/general.conf</strong>
 						<button class="btn btn-light btn-clipboard" ngclipboard data-clipboard-target="#file-general" ngclipboard-success="clipboardSuccess('general.conf')">
diff --git a/public/templates/conf/nginxconfig.io/general.conf.html b/public/templates/conf/nginxconfig.io/general.conf.html
index 705485d..f3969b1 100644
--- a/public/templates/conf/nginxconfig.io/general.conf.html
+++ b/public/templates/conf/nginxconfig.io/general.conf.html
@@ -1,20 +1,3 @@
-# security headers
-add_header X-Frame-Options "SAMEORIGIN" always;
-add_header X-XSS-Protection "1; mode=block" always;
-add_header X-Content-Type-Options "nosniff" always;
-add_header Referrer-Policy "{{ data.referrer_policy }}" always;<!--
-
-✔ CSP --><span ng-if="isCSP()">
-add_header Content-Security-Policy "{{ data.content_security_policy }}" always;</span><!--
-
-✔ HSTS--><span ng-if="hasCommonHSTS()">
-add_header Strict-Transport-Security "max-age=31536000{{ isHSTSSubdomains() ? '; includeSubDomains' : '' }}{{ isHSTSPreload() ? '; preload' : '' }}" always;</span>
-
-# . files
-location ~ /\.(?!well-known) {
-	deny all;
-}
-
 # favicon.ico
 location = /favicon.ico {
 	log_not_found off;<!--
diff --git a/public/templates/conf/nginxconfig.io/security.conf.html b/public/templates/conf/nginxconfig.io/security.conf.html
new file mode 100644
index 0000000..9fa4180
--- /dev/null
+++ b/public/templates/conf/nginxconfig.io/security.conf.html
@@ -0,0 +1,16 @@
+# security headers
+add_header X-Frame-Options "SAMEORIGIN" always;
+add_header X-XSS-Protection "1; mode=block" always;
+add_header X-Content-Type-Options "nosniff" always;
+add_header Referrer-Policy "{{ data.referrer_policy }}" always;<!--
+
+✔ CSP --><span ng-if="isCSP()">
+add_header Content-Security-Policy "{{ data.content_security_policy }}" always;</span><!--
+
+✔ HSTS--><span ng-if="hasCommonHSTS()">
+add_header Strict-Transport-Security "max-age=31536000{{ isHSTSSubdomains() ? '; includeSubDomains' : '' }}{{ isHSTSPreload() ? '; preload' : '' }}" always;</span>
+
+# . files
+location ~ /\.(?!well-known) {
+	deny all;
+}
diff --git a/public/templates/conf/sites-available/example.com.conf.html b/public/templates/conf/sites-available/example.com.conf.html
index a249928..e244e92 100644
--- a/public/templates/conf/sites-available/example.com.conf.html
+++ b/public/templates/conf/sites-available/example.com.conf.html
@@ -37,6 +37,19 @@ server {<!--
 	# HSTS
 	add_header Strict-Transport-Security "max-age=31536000{{ isHSTSSubdomains(_site) ? '; includeSubDomains' : '' }}{{ isHSTSPreload(_site) ? '; preload' : '' }}" always;</span><!--
 
+	✔ modularized --><span ng-if="isModularized()">
+
+	# security
+	include nginxconfig.io/security.conf;</span><!--
+
+	✔ unified --><span ng-if="isUnified()"><!--
+
+-->
+
+<!--
+
+--><ng-include ng-include-tabs="2" src="'templates/conf/nginxconfig.io/security.conf.html?v=COMMIT_HASH'" onload="refreshHighlighting()"></ng-include></span><!--
+
 	✔ access log domain || error log domain --><span ng-if="isAccessLogDomain(_site) || isErrorLogDomain(_site)">
 
 	# logging<!--
@@ -119,6 +132,7 @@ server {<!--
 
 
 	✔ modularized --><span ng-if="isModularized()">
+	# additional config
 	include nginxconfig.io/general.conf;</span><!--
 
 	✔ modularized && ✔ WordPress --><span ng-if="isModularized() && isWordPress(_site)">