treewide: rename options for 23.05

Gerschtli · Jun 6, 2023 · caf4e52 · caf4e52
1 parent da48699
commit caf4e52
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -151,7 +151,7 @@ sudo ln -snf bash /bin/sh
       ```nix
       {
         services.openssh.enable = true;
-        services.openssh.permitRootLogin = "yes";
+        services.openssh.settings.PermitRootLogin = "yes";
 
         users.users.root.password = "nixos";
         users.users.tobias = {

diff --git a/nixos/base/general.nix b/nixos/base/general.nix
@@ -40,7 +40,7 @@ in
 
   config = mkIf cfg.enable {
 
-    boot.cleanTmpDir = true;
+    boot.tmp.cleanOnBoot = true;
 
     console.keyMap = "de";
 

diff --git a/nixos/services/applications/gitea.nix b/nixos/services/applications/gitea.nix
@@ -52,9 +52,9 @@ in
       gitea = {
         enable = true;
         database.passwordFile = config.age.secrets.gitea-dbpassword.path;
-        rootUrl = "https://${domain}/";
 
         settings.service = {
+          ROOT_URL = "https://${domain}/";
           COOKIE_SECURE = true;
           DISABLE_REGISTRATION = true;
           REQUIRE_SIGNIN_VIEW = true;
@@ -64,7 +64,7 @@ in
       nginx.virtualHosts.${domain} = {
         enableACME = true;
         forceSSL = true;
-        locations."/".proxyPass = "http://localhost:${toString giteaCfg.httpPort}/";
+        locations."/".proxyPass = "http://localhost:${toString giteaCfg.settings.server.HTTP_PORT}/";
       };
     };
 

diff --git a/nixos/services/applications/openssh.nix b/nixos/services/applications/openssh.nix
@@ -31,12 +31,15 @@ in
   config = mkIf cfg.enable {
 
     services.openssh = {
-      inherit (cfg) forwardX11;
       enable = true;
       openFirewall = true;
-      permitRootLogin = mkIf (!cfg.rootLogin) "no";
-      passwordAuthentication = false;
-      extraConfig = "MaxAuthTries 3";
+
+      settings = {
+        MaxAuthTries = 3;
+        PasswordAuthentication = false;
+        PermitRootLogin = mkIf (!cfg.rootLogin) "no";
+        X11Forwarding = cfg.forwardX11;
+      };
     };
 
     users.users = {