mob next [ci-skip] [ci skip] [skip ci]

lastFile:machines/ramus/think-greater-chiangmai.nix

machines/ramus/think-greater-chiangmai.nix

@@ -51,7 +51,11 @@ in
 
   clan.core.vars.generators.greaterchiangmai = {
     files = {
-      app_key.secret = true;
+      app_key = {
+        secret = true;
+        owner = config.services.think-greaterchiangmai.user;
+        group = config.services.think-greaterchiangmai.group;
+      };
     };
 
     prompts = {
@@ -66,7 +70,11 @@ in
   clan.core.vars.generators.greaterchiangmai-s3 = {
     files = {
       access_key_id.secret = false;
-      secret_access_key.secret = true;
+      secret_access_key = {
+        secret = true;
+        owner = config.services.think-greaterchiangmai.user;
+        group = config.services.think-greaterchiangmai.group;
+      };
       endpoint.secret = false;
       region.secret = false;
       bucket.secret = false;
@@ -91,7 +99,7 @@ in
 
   services.think-greaterchiangmai = {
     enable = true;
-    domain = "think.greaterchiangmai.com";
+    domain = "think.wegetthingsmade.com";
     settings = {
       APP_SERVICES_CACHE = "/run/think-gtcm/cache/services.php";
       APP_PACKAGES_CACHE = "/run/think-gtcm/cache/packages.php";
@@ -103,7 +111,7 @@ in
   };
   services.think-backend-greaterchiangmai = {
     enable = true;
-    domain = "think-backend.greaterchiangmai.com";
+    domain = "think-backend.wegetthingsmade.com";
     settings = {
       APP_SERVICES_CACHE = "/run/think-backend-gtcm/cache/services.php";
       APP_PACKAGES_CACHE = "/run/think-backend-gtcm/cache/packages.php";

modules/nixos/think-backend-gtcm.nix

@@ -75,7 +75,7 @@ in
               ])
               (submodule {
                 options = {
-                  _secret = mkOption {
+                  _secret = lib.mkOption {
                     type = nullOr str;
                     description = ''
                       The path to a file containing the value the
@@ -115,7 +115,7 @@ in
 
   };
   config = lib.mkIf cfg.enable {
-    users.users.${cfg.user} = {
+    users.users.${cfg.user} = lib.mkForce {
       isSystemUser = true;
       home = cfg.dataDir;
       createHome = true;
@@ -270,7 +270,7 @@ in
 
     services.mysql = {
       enable = true;
-      package = pkgs.mariadb;
+      package = lib.mkForce pkgs.mariadb;
       ensureDatabases = [ cfg.settings.DB_DATABASE ];
       ensureUsers = [
         {

modules/nixos/think-gtcm.nix

@@ -77,7 +77,7 @@ in
               ])
               (submodule {
                 options = {
-                  _secret = mkOption {
+                  _secret = lib.mkOption {
                     type = nullOr str;
                     description = ''
                       The path to a file containing the value the

tests/tests/think-gtcm.nix

@@ -55,7 +55,7 @@
     in
     {
       gtcm1 =
-        { self, pkgs, ... }:
+        { self, ... }:
         {
           nixpkgs.overlays = [ self.overlays.packagesOverlay ];
           imports = [ self.nixosModules.think-gtcm ];
@@ -71,7 +71,7 @@
           };
         };
       backend1 =
-        { self, pkgs, ... }:
+        { self, ... }:
         {
           nixpkgs.overlays = [ self.overlays.packagesOverlay ];
           imports = [ self.nixosModules.think-backend-gtcm ];