move forgejo out of container

This commit is contained in:
Sam 2025-02-22 08:32:20 +00:00
parent 520a063d3f
commit ba0ab222b8
8 changed files with 201 additions and 16 deletions

8
flake.lock generated
View file

@ -559,11 +559,11 @@
},
"nix-secrets": {
"locked": {
"lastModified": 1739387047,
"narHash": "sha256-KpogJP00vwuMIKkGJff3zp0YfV9GfOG//UzMK4nWWUw=",
"lastModified": 1740164526,
"narHash": "sha256-lpKNY9qLoIT1XbLzeY+tmkV1DjQQ3mWYWjko+necYhM=",
"ref": "refs/heads/master",
"rev": "be51e237b5b3d441a194f3e516175f6a543aee35",
"revCount": 280,
"rev": "ddf31a3a72504f36577ec341fbc84aa8f3dd3318",
"revCount": 283,
"type": "git",
"url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
},

View file

@ -30,16 +30,13 @@ in {
../common/optional/openssh.nix
../common/optional/distributed-builds/local-machine.nix
../common/optional/nixos-containers/semitamaps.nix
../common/optional/nixos-containers/vaultwarden.nix
../common/optional/nixos-containers/xmpp.nix
# ../common/optional/nixos-containers/semitamaps.nix
# ../common/optional/nixos-containers/vaultwarden.nix
# ../common/optional/nixos-containers/xmpp.nix
../common/optional/fail2ban.nix
../common/optional/restic-backup.nix
../common/optional/nginx/vaultwarden.nix
../common/optional/nginx/xmpp.nix
../common/optional/forgejo.nix
outputs.nixosModules.nixosAutoUpgrade
];

View file

@ -0,0 +1,37 @@
{
pkgs,
configVars,
...
}: let
forgejoDomain = configVars.domains.forgejo;
forgejoPort = configVars.networking.addresses.forgejo.port;
in {
imports = [./nginx/forgejo.nix];
environment.persistence."/persist" = {
hideMounts = true;
directories = [
"/var/lib/forgejo"
];
};
services.forgejo = {
enable = true;
package = pkgs.forgejo;
database.type = "sqlite3";
lfs.enable = true;
settings = {
server = {
DOMAIN = "git.${forgejoDomain}";
ROOT_URL = "https://git.${forgejoDomain}/";
HTTP_PORT = forgejoPort;
};
service.DISABLE_REGISTRATION = false;
actions = {
ENABLED = true;
DEFAULT_ACTIONS_URL = "github";
};
};
};
}

View file

@ -0,0 +1,27 @@
{configVars, ...}: let
email = configVars.email.user;
domain = configVars.domains.forgejo;
forgejoIp = configVars.networking.addresses.forgejo.localAddress;
forgejoPort = configVars.networking.addresses.forgejo.port;
in {
networking.firewall.allowedTCPPorts = [80 443];
security.acme = {
acceptTerms = true;
defaults.email = email;
};
services.nginx = {
enable = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
virtualHosts."git.${domain}" = {
enableACME = true;
forceSSL = true;
extraConfig = ''
client_max_body_size 1024M;
'';
locations."/" = {
proxyPass = "http://${forgejoIp}:${toString forgejoPort}";
};
};
};
}

View file

@ -0,0 +1,119 @@
{
pkgs,
lib,
configVars,
inputs,
...
}: let
containerName = "forgejo";
pubKeys = lib.filesystem.listFilesRecursive ../../users/keys;
hostAddress = configVars.networking.addresses.forgejo.hostAddress;
localAddress = configVars.networking.addresses.forgejo.localAddress;
forgejoPort = configVars.networking.addresses.forgejo.port;
forgejoDomain = configVars.domains.forgejo;
cloudnixIp = configVars.networking.addresses.cloudnix.ip;
sops-nix = inputs.sops-nix;
in {
networking = {
nat = {
enable = true;
internalInterfaces = ["ve-+"];
externalInterface = "enp1s0";
};
};
environment.persistence."/persist" = {
hideMounts = true;
directories = [
"/var/lib/nixos-containers/${containerName}"
];
};
imports = [../nginx/forgejo.nix];
containers."${containerName}" = {
autoStart = true;
privateNetwork = true;
hostAddress = hostAddress;
localAddress = localAddress;
nixpkgs = pkgs.path;
bindMounts = {
"/etc/ssh/ssh_host_ed25519_key" = {
hostPath = "/etc/ssh/ssh_host_ed25519_key";
isReadOnly = true;
};
};
config = {
pkgs,
lib,
...
}: let
secretsDirectory = builtins.toString inputs.nix-secrets;
secretsFile = "${secretsDirectory}/secrets.yaml";
in {
networking = {
defaultGateway = cloudnixIp;
firewall = {
enable = true;
allowedTCPPorts = [
forgejoPort
];
};
useHostResolvConf = lib.mkForce false;
};
services.resolved.enable = true;
sops = {
defaultSopsFile = "${secretsFile}";
validateSopsFiles = false;
age = {
sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
};
};
imports = [
sops-nix.nixosModules.sops
];
environment.systemPackages = [
pkgs.vim
pkgs.git
pkgs.lsof
];
services.forgejo = {
enable = true;
package = pkgs.forgejo;
database.type = "sqlite3";
lfs.enable = true;
settings = {
server = {
DOMAIN = "git.${forgejoDomain}";
ROOT_URL = "https://git.${forgejoDomain}/";
HTTP_PORT = forgejoPort;
};
service.DISABLE_REGISTRATION = false;
actions = {
ENABLED = true;
DEFAULT_ACTIONS_URL = "github";
};
};
};
services.openssh = {
enable = true;
settings.PasswordAuthentication = false;
};
users.users = {
root = {
openssh.authorizedKeys.keys = lib.lists.forEach pubKeys (key: builtins.readFile key);
};
};
system.stateVersion = "24.05";
};
};
}

View file

@ -29,6 +29,10 @@ in {
];
};
imports = [
../nginx/semitamaps.nix
];
containers."${containerName}" = {
autoStart = true;
privateNetwork = true;
@ -71,9 +75,6 @@ in {
services.resolved.enable = true;
imports = [
];
environment.systemPackages = [
pkgs.vim
pkgs.git

View file

@ -13,7 +13,6 @@
cloudnixIp = configVars.networking.addresses.cloudnix.ip;
sops-nix = inputs.sops-nix;
in {
networking = {
nat = {
enable = true;
@ -29,6 +28,8 @@ in {
];
};
imports = [../nginx/vaultwarden.nix];
containers."${containerName}" = {
autoStart = true;
privateNetwork = true;
@ -50,7 +51,6 @@ in {
secretsDirectory = builtins.toString inputs.nix-secrets;
secretsFile = "${secretsDirectory}/secrets.yaml";
in {
networking = {
defaultGateway = cloudnixIp;
firewall = {

View file

@ -43,6 +43,10 @@ in {
};
};
imports = [
../nginx/xmpp.nix
];
environment.persistence."/persist" = {
hideMounts = true;
directories = [