From 5e1a6273bbec39a043ae029a5d3bd124f82f7dc8 Mon Sep 17 00:00:00 2001
From: Roy Dumblauskas <roydumblauskas@gmail.com>
Date: Thu, 12 Jun 2025 22:29:53 -0500
Subject: [PATCH] acme root null

---
 homelab-services/minio-service/flake.nix | 15 ++-------------
 nixos/configuration.nix                  |  1 -
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/homelab-services/minio-service/flake.nix b/homelab-services/minio-service/flake.nix
index 0a9d92d..670a8d3 100644
--- a/homelab-services/minio-service/flake.nix
+++ b/homelab-services/minio-service/flake.nix
@@ -31,12 +31,6 @@
             description = "MinIO Admin Console port.";
           };
 
-          rootUser = lib.mkOption {
-            type = lib.types.str;
-            default = "minioadmin";
-            description = "MinIO root username.";
-          };
-
           credentialsFile = lib.mkOption {
             type = lib.types.path;
             description = "File containing MinIO credentials.";
@@ -66,12 +60,6 @@
             after = [ "network.target" ];
             wantedBy = [ "multi-user.target" ];
 
-            # preStart = ''
-            #   mkdir -p ${opts.dataDir}
-            #   chown -R minio:minio ${opts.dataDir}
-            #   chmod u+rxw ${opts.dataDir}
-            # '';
-
             serviceConfig = {
               ExecStart = ''
                 ${pkgs.minio}/bin/minio server ${opts.dataDir} \
@@ -92,6 +80,7 @@
             virtualHosts.${opts.default-nginx.hostname} = {
               forceSSL = true;
               enableACME = true;
+              acmeRoot = null;
               locations."/" = {
                 proxyPass = "http://localhost:${toString opts.dataPort}";
               };
@@ -102,7 +91,7 @@
           };
 
           networking.firewall.allowedTCPPorts = lib.mkMerge [
-            [ opts.dataPort opts.consolePort ]
+            (lib.mkIf opts.enable [ opts.dataPort opts.consolePort ])
             (lib.mkIf opts.default-nginx.enable [ 80 443 ])
           ];
         };
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 8b35b68..73da8c0 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -81,7 +81,6 @@
     enable = true;
 
     dataDir = "/data/minio";
-    rootUser = "admin";
     credentialsFile = config.sops.secrets."minio-credentials".path;
 
     dataPort = 9000;     # S3 API access