about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-06-10T23·04+0000
committerVincent Ambo <tazjin@google.com>2020-06-11T21·13+0000
commitea3cab8755efd8f1d66644997a9b34963e5c5cd4 (patch)
treeb76ef84c0539b46515c7fd76a5b278760525296e
parentfba9d0b387d7be3c5c88bf6f604885b5f0296a85 (diff)
fix(monorepo-gerrit): Extract SSH username from LDAP correctly r/906
-rw-r--r--ops/nixos/modules/monorepo-gerrit.nix1
-rw-r--r--ops/nixos/modules/tvl-slapd/contents.ldif4
2 files changed, 3 insertions, 2 deletions
diff --git a/ops/nixos/modules/monorepo-gerrit.nix b/ops/nixos/modules/monorepo-gerrit.nix
index 52a96990c975..c0a06caee92c 100644
--- a/ops/nixos/modules/monorepo-gerrit.nix
+++ b/ops/nixos/modules/monorepo-gerrit.nix
@@ -25,6 +25,7 @@ in {
         accountPattern = "(&(objectClass=organizationalPerson)(cn=\${username}))";
         accountFullName = "cn";
         accountEmailAddress = "mail";
+        accountSshUserName = "cn";
         groupBase = "ou=groups,dc=tvl,dc=fyi";
 
         # TODO(tazjin): Assuming this is what we'll be doing ...
diff --git a/ops/nixos/modules/tvl-slapd/contents.ldif b/ops/nixos/modules/tvl-slapd/contents.ldif
index be623d978be0..de297dc0119e 100644
--- a/ops/nixos/modules/tvl-slapd/contents.ldif
+++ b/ops/nixos/modules/tvl-slapd/contents.ldif
@@ -31,8 +31,8 @@ userPassword: {SSHA}OhWQkPJgH1rRJqYIaMUbbKC4iLEzvCev
 dn: cn=riking,ou=users,dc=tvl,dc=fyi
 objectClass: organizationalPerson
 objectClass: inetOrgPerson
-cn: Kane York
-sn: riking
+cn: riking
+sn: Kane York
 title: riking
 mail: rikingcoding@gmail.com
 userPassword: {SSHA}6rPxMOofHMGNTEYdyBOYbza7NT/RmiGz