From b8434d30997c237a2ff5b8e6c02c7ac6a8b2ea65 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 6 Sep 2017 11:32:10 +0200
Subject: ma nginx-config: forceSSL implies enableSSL

---
 makefu/2configs/bepasty-dual.nix         | 1 -
 makefu/2configs/deployment/boot-euer.nix | 1 -
 makefu/2configs/deployment/graphs.nix    | 1 -
 makefu/2configs/deployment/owncloud.nix  | 1 -
 makefu/2configs/nginx/euer.blog.nix      | 1 -
 makefu/2configs/nginx/euer.wiki.nix      | 1 -
 makefu/2configs/nginx/share-download.nix | 1 -
 7 files changed, 7 deletions(-)

(limited to 'makefu/2configs')

diff --git a/makefu/2configs/bepasty-dual.nix b/makefu/2configs/bepasty-dual.nix
index ecf5f8a38..701bf5b1d 100644
--- a/makefu/2configs/bepasty-dual.nix
+++ b/makefu/2configs/bepasty-dual.nix
@@ -36,7 +36,6 @@ in {
 
       "${ext-dom}" = {
         nginx = {
-          enableSSL = true;
           forceSSL = true;
           enableACME = true;
         };
diff --git a/makefu/2configs/deployment/boot-euer.nix b/makefu/2configs/deployment/boot-euer.nix
index be24209bc..f890ea7ad 100644
--- a/makefu/2configs/deployment/boot-euer.nix
+++ b/makefu/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/makefu/2configs/deployment/graphs.nix b/makefu/2configs/deployment/graphs.nix
index b33ddece0..bde9892cd 100644
--- a/makefu/2configs/deployment/graphs.nix
+++ b/makefu/2configs/deployment/graphs.nix
@@ -28,7 +28,6 @@ in {
         ];
       };
       anonymous = {
-        enableSSL = true;
         forceSSL = true;
         enableACME = true;
       };
diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index 65ac5c184..3a9d57dbb 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/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/makefu/2configs/nginx/euer.blog.nix b/makefu/2configs/nginx/euer.blog.nix
index 3fb629394..65d36d9b6 100644
--- a/makefu/2configs/nginx/euer.blog.nix
+++ b/makefu/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/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index fefdd6dc7..ef2c17c63 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/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/makefu/2configs/nginx/share-download.nix b/makefu/2configs/nginx/share-download.nix
index 65c44b294..828a66a74 100644
--- a/makefu/2configs/nginx/share-download.nix
+++ b/makefu/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>;
     };
-- 
cgit v1.2.3