pass: fix paths

diff --git a/install/logical/friot.nix b/install/logical/friot.nix
index 52d841e8217b195b81dba250aa5b384196613e43..19770879b7806fd9efb2c63eb23146866bb13acb 100644 (file)
--- a/install/logical/friot.nix
+++ b/install/logical/friot.nix
@@ -3,7 +3,7 @@ let inherit (builtins.extraBuiltins) pass;
     inherit (lib) types;
     inherit (config) networking;
     inherit (config.services) dovecot2;
-    userPass = name: pass "${networking.domain}/${networking.hostName}/${name}/pass";
+    userPass = name: pass "${networking.domainBase}/${networking.hostName}/login/${name}";
 in {
 imports = [
   <nixpkgs-commonsoft/install/modules.nix>
@@ -90,7 +90,7 @@ config = {
       enable = config.deployment.targetEnv != "virtualbox";
       ssh = {
         enable = true;
-        authorizedKeys = [ (pass "${networking.domain}/${networking.hostName}/julm/ssh.pub") ];
+        authorizedKeys = [ (pass "${networking.domain}/ssh/pub/julm") ];
       };
     };
   };

diff --git a/install/logical/friot/gitolite.nix b/install/logical/friot/gitolite.nix
index a1e6f136888d109b59fa38099dcb020882193845..dd816b0917050b53e5dd80e12884862eedea0224 100644 (file)
--- a/install/logical/friot/gitolite.nix
+++ b/install/logical/friot/gitolite.nix
@@ -17,7 +17,7 @@ in
         enable = true;
         user   = "git";
         group  = users."git-daemon".name;
-        adminPubkey = pass "${networking.domain}/${networking.hostName}/${gitolite-admin}/ssh.pub";
+        adminPubkey = pass "${networking.domainBase}/ssh/pub/${gitolite-admin}";
         extraGitoliteRc = ''
           $RC{UMASK}           = 0027; # NOTE: no quote around in Perl, so it's octal
           $RC{LOG_DEST}        = 'repo-log,syslog';

diff --git a/install/logical/friot/nsd/commonsoft.nix b/install/logical/friot/nsd/commonsoft.nix
index 8b9d234f4b8c69b704101c82652d41a175e3c892..00129070c8500f2262bbafe347a27237d26c1601 100644 (file)
--- a/install/logical/friot/nsd/commonsoft.nix
+++ b/install/logical/friot/nsd/commonsoft.nix
@@ -53,7 +53,7 @@ in
 
             ; SOA (Start Of Authority)
             @ SOA ns admin (
-              ${serial networking.domain} ; Serial number
+              ${serial networking.domainBase} ; Serial number
               1d      ; Refresh
               15m     ; Retry
               2592000 ; Expire
@@ -72,7 +72,7 @@ in
 
             ; SOA (Start Of Authority)
             @ SOA ns admin (
-              ${serial networking.domain} ; Serial number
+              ${serial networking.domainBase} ; Serial number
               1d      ; Refresh
               15m     ; Retry
               2592000 ; Expire
@@ -91,7 +91,7 @@ in
 
             ; SOA (Start Of Authority)
             @ SOA ns admin (
-              ${serial networking.domain} ; Serial number
+              ${serial networking.domainBase} ; Serial number
               1d      ; Refresh
               15m     ; Retry
               2592000 ; Expire