updated flake lock
This commit is contained in:
parent
6e0650f73b
commit
d89d085409
4 changed files with 33 additions and 22 deletions
|
@ -45,8 +45,13 @@
|
|||
services.ssh-agent.enable = true;
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
compression = true;
|
||||
addKeysToAgent = "confirm";
|
||||
enableDefaultConfig = false;
|
||||
matchBlocks = {
|
||||
"*" = {
|
||||
compression = true;
|
||||
addKeysToAgent = "confirm";
|
||||
};
|
||||
};
|
||||
extraConfig = lib.strings.concatLines (
|
||||
builtins.map (hostKey: "IdentityFile ~/.ssh/${hostKey.path}") config.programs.openssh.hostKeys
|
||||
);
|
||||
|
|
|
@ -19,6 +19,12 @@ in {
|
|||
|
||||
config = lib.mkIf config.services.forgejo.enable (lib.mkMerge [
|
||||
{
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.services.forgejo.settings.server.BUILTIN_SSH_SERVER_USER == config.users.users.git.name;
|
||||
message = "Forgejo BUILTIN_SSH_SERVER_USER hardcoded value does not match expected git user name";
|
||||
}
|
||||
];
|
||||
host = {
|
||||
reverse_proxy.subdomains.${config.services.forgejo.subdomain} = {
|
||||
target = "http://localhost:${toString forgejoPort}";
|
||||
|
@ -52,7 +58,7 @@ in {
|
|||
START_SSH_SERVER = true;
|
||||
SSH_LISTEN_PORT = sshPort;
|
||||
SSH_PORT = 22;
|
||||
BUILTIN_SSH_SERVER_USER = config.users.users.git.name;
|
||||
BUILTIN_SSH_SERVER_USER = "git";
|
||||
ROOT_URL = "https://git.jan-leila.com";
|
||||
};
|
||||
service = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue