wip

Author: MartinNikov

packages/secret/default.nix

@@ -11,6 +11,7 @@ in
       #!/usr/bin/env bash
       set -euo pipefail
 
+      machine-folder="./."
       machine=""
       service=""
       secret=""
@@ -22,6 +23,9 @@ in
               --machine=*)
                   machine="''${1#*=}"
                   ;;
+              --machine-folder=*)
+                  machine-folder="''${1#*=}"
+                  ;;
               --service=*)
                   service="''${1#*=}"
                   ;;
@@ -43,6 +47,8 @@ in
           you are using agenix. Secret must be used with mcl-secrets and mcl-host-info\n\
           modules from nixos-modules repository to work properly.\n\n\
       OPTIONS\n\
+          --machine-folder - The machine folder. Specifying this will save the secret\n\
+          directly to the /machine-folder/machine/secrets/service/, if it exists.\n\
           --machine - Machine for which you want to create a secret.\n\
           --service - Service for which you want to create a secret.\n\
           --secret  - Secret you want to encrypt.\n\
@@ -57,16 +63,28 @@ in
           shift
       done
 
+
+
       if [[ -z "$machine" || -z "$service" || -z "$secret" ]]; then
           echo "You must specify machine, service, and secret"
           exit 1
       fi
 
+      if [ "$machine-folder != "./." ]; then
+        secrets-folder="$machine-folder/$machine/secrets/$service"
+        if [ ! -d "$secrets-folder" ]; then
+            echo "$secrets-folder doesn\'t exist. Create it or go directly into the folder and don\'t specify the machine-folder option.";
+            exit 1
+        fi
+      else
+        secrets-folder="./."
+      fi
+
       if [ "$vm" = "true" ]; then
           RULES="$(nix eval --raw ".#nixosConfigurations.$machine-vm.config.virtualisation.vmVariant.mcl.secrets.services.$service.nix-file")"
       else
           RULES="$(nix eval --raw ".#nixosConfigurations.$machine.config.mcl.secrets.services.$service.nix-file")"
       fi
-      "${agenix}/bin/agenix" -e "$secret.age"
+      "${agenix}/bin/agenix" -e "$secrets-folder/$secret.age"
     '';
   }