summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-09-06 11:32:10 +0200
committermakefu <github@syntax-fehler.de>2017-09-06 11:32:10 +0200
commitdbff0dea149f47cf339e22147ecda56ffe03624a (patch)
tree5a846183b26bf939328dde71522e366c36a04ff1
parenta8ec9307419151119a7ff151f2e6f335137ce6dd (diff)
ma nginx-config: forceSSL implies enableSSL
-rw-r--r--2configs/bepasty-dual.nix1
-rw-r--r--2configs/deployment/boot-euer.nix1
-rw-r--r--2configs/deployment/graphs.nix1
-rw-r--r--2configs/deployment/owncloud.nix1
-rw-r--r--2configs/nginx/euer.blog.nix1
-rw-r--r--2configs/nginx/euer.wiki.nix1
-rw-r--r--2configs/nginx/share-download.nix1
7 files changed, 0 insertions, 7 deletions
diff --git a/2configs/bepasty-dual.nix b/2configs/bepasty-dual.nix
index ecf5f8a38..701bf5b1d 100644
--- a/2configs/bepasty-dual.nix
+++ b/2configs/bepasty-dual.nix
@@ -36,7 +36,6 @@ in {
"${ext-dom}" = {
nginx = {
- enableSSL = true;
forceSSL = true;
enableACME = true;
};
diff --git a/2configs/deployment/boot-euer.nix b/2configs/deployment/boot-euer.nix
index be24209bc..f890ea7ad 100644
--- a/2configs/deployment/boot-euer.nix
+++ b/2configs/deployment/boot-euer.nix
@@ -16,7 +16,6 @@ in {
services.nginx = {
enable = mkDefault true;
virtualHosts."boot.euer.krebsco.de" = {
- enableSSL = true;
forceSSL = true;
enableACME = true;
locations."/" = {
diff --git a/2configs/deployment/graphs.nix b/2configs/deployment/graphs.nix
index b33ddece0..bde9892cd 100644
--- a/2configs/deployment/graphs.nix
+++ b/2configs/deployment/graphs.nix
@@ -28,7 +28,6 @@ in {
];
};
anonymous = {
- enableSSL = true;
forceSSL = true;
enableACME = true;
};
diff --git a/2configs/deployment/owncloud.nix b/2configs/deployment/owncloud.nix
index 65ac5c184..3a9d57dbb 100644
--- a/2configs/deployment/owncloud.nix
+++ b/2configs/deployment/owncloud.nix
@@ -21,7 +21,6 @@ let
services.nginx.virtualHosts."${domain}" = {
forceSSL = true;
enableACME = true;
- enableSSL = true;
serverAliases = domains;
extraConfig = ''
diff --git a/2configs/nginx/euer.blog.nix b/2configs/nginx/euer.blog.nix
index 3fb629394..65d36d9b6 100644
--- a/2configs/nginx/euer.blog.nix
+++ b/2configs/nginx/euer.blog.nix
@@ -33,7 +33,6 @@ in {
virtualHosts = {
"euer.krebsco.de" = {
#serverAliases = [ "blog.euer.krebsco.de" "blog.${hostname}" ];
- enableSSL = true;
enableACME = true;
forceSSL = true;
root = base-dir;
diff --git a/2configs/nginx/euer.wiki.nix b/2configs/nginx/euer.wiki.nix
index fefdd6dc7..ef2c17c63 100644
--- a/2configs/nginx/euer.wiki.nix
+++ b/2configs/nginx/euer.wiki.nix
@@ -79,7 +79,6 @@ in {
# "wiki.makefu.retiolum"
# "wiki.makefu"
#];
- enableSSL = true;
forceSSL = true;
enableACME = true;
# recommendedGzipSettings = true;
diff --git a/2configs/nginx/share-download.nix b/2configs/nginx/share-download.nix
index 65c44b294..828a66a74 100644
--- a/2configs/nginx/share-download.nix
+++ b/2configs/nginx/share-download.nix
@@ -10,7 +10,6 @@ with import <stockholm/lib>;
root = config.makefu.dl-dir;
extraConfig = "autoindex on;";
forceSSL = true;
- enableSSL = true;
enableACME = true;
basicAuth = import <secrets/dl.euer.krebsco.de-auth.nix>;
};