Fixes

essentialkaos · Aug 10, 2016 · b9faffb · b9faffb
1 parent cd351df
commit b9faffb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/SOURCES/ssl-wildcard.conf b/SOURCES/ssl-wildcard.conf
@@ -0,0 +1,3 @@
+# config to enable HSTS(HTTP Strict Transport Security) https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security
+# to avoid ssl stripping https://en.wikipedia.org/wiki/SSL_stripping#SSL_stripping
+add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload" always;
diff --git a/SOURCES/ssl.conf b/SOURCES/ssl.conf
@@ -1,6 +1,3 @@
 # config to enable HSTS(HTTP Strict Transport Security) https://developer.mozilla.org/en-US/docs/Security/HTTP_Strict_Transport_Security
 # to avoid ssl stripping https://en.wikipedia.org/wiki/SSL_stripping#SSL_stripping
-add_header Strict-Transport-Security "max-age=31536000; preload";
-
-# For wilcard certs you can use next rule
-# add_header Strict-Transport-Security "max-age=31536000; includeSubdomains; preload";
+add_header Strict-Transport-Security "max-age=31536000; preload" always;
diff --git a/webkaos-centos6.spec b/webkaos-centos6.spec
@@ -75,8 +75,9 @@ Source20:             pagespeed.conf
 Source21:             pagespeed-enabled.conf
 Source22:             pagespeed-access.pswd
 Source23:             ssl.conf
-Source24:             common.conf
-Source25:             bots.conf
+Source24:             ssl-wildcard.conf
+Source25:             common.conf
+Source26:             bots.conf
 
 Source30:             %{name}-index.html
 
@@ -331,6 +332,8 @@ install -pm 644 %{SOURCE24} \
                 %{buildroot}%{_sysconfdir}/%{name}/xtra/
 install -pm 644 %{SOURCE25} \
                 %{buildroot}%{_sysconfdir}/%{name}/xtra/
+install -pm 644 %{SOURCE26} \
+                %{buildroot}%{_sysconfdir}/%{name}/xtra/
 
 install -dm 755 %{buildroot}%{_sysconfdir}/sysconfig
 
@@ -425,6 +428,7 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/xtra/pagespeed-enabled.conf
 %config %{_sysconfdir}/%{name}/xtra/common.conf
 %config %{_sysconfdir}/%{name}/xtra/ssl.conf
+%config %{_sysconfdir}/%{name}/xtra/ssl-wildcard.conf
 %config %{_sysconfdir}/%{name}/xtra/bots.conf
 
 %config %{_sysconfdir}/%{name}/mime.types

diff --git a/webkaos-centos7.spec b/webkaos-centos7.spec
@@ -75,8 +75,9 @@ Source20:             pagespeed.conf
 Source21:             pagespeed-enabled.conf
 Source22:             pagespeed-access.pswd
 Source23:             ssl.conf
-Source24:             common.conf
-Source25:             bots.conf
+Source24:             ssl-wildcard.conf
+Source25:             common.conf
+Source26:             bots.conf
 
 Source30:             %{name}-index.html
 
@@ -327,6 +328,8 @@ install -pm 644 %{SOURCE24} \
                 %{buildroot}%{_sysconfdir}/%{name}/xtra/
 install -pm 644 %{SOURCE25} \
                 %{buildroot}%{_sysconfdir}/%{name}/xtra/
+install -pm 644 %{SOURCE26} \
+                %{buildroot}%{_sysconfdir}/%{name}/xtra/
 
 install -dm 755 %{buildroot}%{_sysconfdir}/sysconfig
 
@@ -421,6 +424,7 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/xtra/pagespeed-enabled.conf
 %config %{_sysconfdir}/%{name}/xtra/common.conf
 %config %{_sysconfdir}/%{name}/xtra/ssl.conf
+%config %{_sysconfdir}/%{name}/xtra/ssl-wildcard.conf
 %config %{_sysconfdir}/%{name}/xtra/bots.conf
 
 %config %{_sysconfdir}/%{name}/mime.types
@@ -460,6 +464,9 @@ fi
 ###############################################################################
 
 %changelog
+* Tue Aug 09 2016 Gleb Goncharov <[email protected]> - 1.11.3-0
+- Nginx updated to 1.11.3
+
 * Wed Jul 13 2016 Anton Novojilov <[email protected]> - 1.11.2-0
 - Nginx updated to 1.11.2
 - PCRE updated to 8.39