From be00428befc5565c36268d07417dc7f6ef4da2fb Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Sat, 2 Apr 2022 20:41:05 +0200
Subject: [PATCH] Decomissionned useless feature

---
 lib/default.nix             | 17 ++---------------
 modules/homer/default.nix   |  4 ++--
 modules/jackett/default.nix |  3 ---
 modules/lidarr/default.nix  |  2 --
 modules/radarr/default.nix  |  2 --
 modules/sonarr/default.nix  |  4 +---
 6 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 53a6505..d5e551e 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -54,24 +54,11 @@ in
     };
   };
 
-  mkPrivateSubdomain = name: port: {
-    luj.nginx.enable = true;
-    services.nginx.virtualHosts."${name}.julienmalka.me" = {
-      locations."/" = {
-        proxyPass = "http://localhost:${toString port}";
-        extraConfig = ''
-          allow 10.100.0.0/24;
-          deny all;
-        '';
-      };
-    };
-  };
-
   mkVPNSubdomain = name: port: {
     luj.nginx.enable = true;
     services.nginx.virtualHosts."${name}.luj" = {
-      sslCertificate = "/etc/nginx/certs/subdomains/cert.pem";
-      sslCertificateKey = "/etc/nginx/certs/subdomains/key.pem";
+      sslCertificate = "/etc/nginx/certs/${name}.luj/cert.pem";
+      sslCertificateKey = "/etc/nginx/certs/${name}.luj/key.pem";
       forceSSL = true;
       locations."/" = {
         proxyPass = "http://localhost:${toString port}";
diff --git a/modules/homer/default.nix b/modules/homer/default.nix
index 9aae4b6..4bfe373 100644
--- a/modules/homer/default.nix
+++ b/modules/homer/default.nix
@@ -13,8 +13,8 @@ in
       luj.nginx.enable = true;
 
       services.nginx.virtualHosts."home.luj" = {
-        sslCertificate = "/etc/nginx/certs/subdomains/cert.pem";
-        sslCertificateKey = "/etc/nginx/certs/subdomains/key.pem";
+        sslCertificate = "/etc/nginx/certs/home.luj/cert.pem";
+        sslCertificateKey = "/etc/nginx/certs/home.luj/key.pem";
         forceSSL = true;
         root = "/srv/homer/";
       };
diff --git a/modules/jackett/default.nix b/modules/jackett/default.nix
index 757730a..437d4b0 100644
--- a/modules/jackett/default.nix
+++ b/modules/jackett/default.nix
@@ -38,9 +38,6 @@ in
 
     }
 
-      (mkIf cfg.nginx.enable (mkPrivateSubdomain cfg.nginx.subdomain port))
-
-      
       (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
  
 
diff --git a/modules/lidarr/default.nix b/modules/lidarr/default.nix
index 09a5437..edc7121 100644
--- a/modules/lidarr/default.nix
+++ b/modules/lidarr/default.nix
@@ -38,8 +38,6 @@ in
       };
     }
 
-      (mkIf cfg.nginx.enable (mkPrivateSubdomain cfg.nginx.subdomain port) )
-
       
       (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
  
diff --git a/modules/radarr/default.nix b/modules/radarr/default.nix
index 9fad521..73bccdb 100644
--- a/modules/radarr/default.nix
+++ b/modules/radarr/default.nix
@@ -37,8 +37,6 @@ in
         group = cfg.group;
       };
     }
-
-      (mkIf cfg.nginx.enable (mkPrivateSubdomain cfg.nginx.subdomain port))
       
       (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
  
diff --git a/modules/sonarr/default.nix b/modules/sonarr/default.nix
index 411d3d6..da10bb3 100644
--- a/modules/sonarr/default.nix
+++ b/modules/sonarr/default.nix
@@ -38,10 +38,8 @@ in
       };
     }
 
-      (mkIf cfg.nginx.enable (mkPrivateSubdomain cfg.nginx.subdomain port) )
-      
       (mkIf cfg.nginx.enable (mkVPNSubdomain cfg.nginx.subdomain port))]);
- 
+