wurzel/fruitbasket
9
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

manually patch the portunus regex

Browse source
This commit is contained in:
Rouven Seifert 2023-07-04 15:10:00 +02:00
parent 8b3e42dbb6
commit 0d7a9738b0
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
3 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -40,7 +40,7 @@
./modules/options.nix ./modules/options.nix
./modules/base.nix ./modules/base.nix
./modules/sops.nix ./modules/sops.nix
./modules/ldap.nix ./modules/ldap
# ./modules/keycloak.nix replaced by portunus # ./modules/keycloak.nix replaced by portunus
./modules/mail.nix ./modules/mail.nix
./modules/mailman.nix ./modules/mailman.nix
@ -67,7 +67,7 @@
./hosts/quitte/configuration.nix ./hosts/quitte/configuration.nix
./modules/options.nix ./modules/options.nix
./modules/base.nix ./modules/base.nix
./modules/ldap.nix ./modules/ldap
# ./modules/keycloak.nix replaced by portunus # ./modules/keycloak.nix replaced by portunus
./modules/nginx.nix ./modules/nginx.nix
./modules/mail.nix ./modules/mail.nix

25
modules/ldap/0001-update-user-validation-regex.patch Normal file
View file

@ -0,0 +1,25 @@
From a3fb0c82f09db0b5655c949d5e4dbea55279ff10 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Tue, 4 Jul 2023 15:02:02 +0200
Subject: [PATCH] update user validation regex
---
internal/core/validation.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/internal/core/validation.go b/internal/core/validation.go
index 3be9dfa..b1368a7 100644
--- a/internal/core/validation.go
+++ b/internal/core/validation.go
@@ -30,7 +30,7 @@ import (
)
// this regexp copied from useradd(8) manpage
-const posixAccountNamePattern = `[a-z_][a-z0-9_-]*\$?`
+const posixAccountNamePattern = `[a-z_][a-z0-9._-]*\$?`
var (
errIsMissing = errors.New("is missing")
--
2.41.0

23
modules/ldap.nix → modules/ldap/default.nix
View file

@ -65,7 +65,7 @@ in
#tls = true; #tls = true;
}; };
seedPath = ../config/portunus_seeds.json; seedPath = ../../config/portunus_seeds.json;
}; };
#users.ldap = { #users.ldap = {
@ -124,17 +124,12 @@ in
}; };
}; };
# nixpkgs.overlays = [ nixpkgs.overlays = [
# (self: super: (self: super:
# { {
# portunus = super.portunus.overrideAttrs (old: { portunus = super.portunus.overrideAttrs (old: {
# src = super.fetchFromGitHub { patches = [ ./0001-update-user-validation-regex.patch ];
# owner = "revol-xut"; });
# repo = "portunus"; })
# rev = "4dc29febacb11c613785bc95352fa00e0ca9b14a"; ];
# sha256 = "sha256-6O2392aHXhgvgZf6ftDY5Bh6hG3OzzCnlriig/Vkkz8=";
# };
# });
# })
# ];
} }