Compare commits

...

32 commits

Author SHA1 Message Date
534cda6d91 WIP: add notes for missing persistence/backup
All checks were successful
ci/woodpecker/push/check Pipeline was successful
TODO:
* Look at for more inspiration https://github.com/nix-community/impermanence/pull/108
* Do home-manager
* Common files https://github.com/nix-community/impermanence/issues/10
2023-10-25 15:52:18 +00:00
4b6d332e9b modules: services: quassel: persist data 2023-10-25 15:52:18 +00:00
7c7eadbf45 modules: services: pirate: persist data 2023-10-25 15:52:18 +00:00
b83c917a9e modules: services: monitoring: persist data 2023-10-25 15:52:18 +00:00
9ebabb251b modules: services: nginx: persist SSL certificates 2023-10-25 15:52:18 +00:00
b48048aa5f modules: services: transmission: persist data 2023-10-25 15:52:18 +00:00
dbd33f7d62 modules: services: sabnzbd: persist data 2023-10-25 15:52:18 +00:00
30a632a261 modules: services: rss-bridge: persist data 2023-10-25 15:52:18 +00:00
1d23a6caa8 modules: services: podgrab: persist data 2023-10-25 15:52:18 +00:00
3328cf62d9 modules: services: nextcloud: persist data 2023-10-25 15:52:18 +00:00
b0622f5696 modules: services: navidrome: persist data 2023-10-25 15:52:18 +00:00
775ac42649 modules: services: lohr: persist data 2023-10-25 15:52:18 +00:00
993bdbd3e7 modules: services: jellyfin: persist data 2023-10-25 15:52:18 +00:00
843c4a8097 modules: services: indexers: persist data 2023-10-25 15:52:18 +00:00
3e28075906 modules: services: postgresql: persist data 2023-10-25 15:52:18 +00:00
72baa4e84f modules: services: postgresql-backup: persist data 2023-10-25 15:52:17 +00:00
706fad7e7f modules: services: paperless: persist data 2023-10-25 15:52:17 +00:00
4fcc69f34e modules: services: matrix: persist data 2023-10-25 15:52:17 +00:00
604d594dec modules: services: gitea: persist repositories 2023-10-25 15:52:17 +00:00
53af6d3fa6 modules: services: flood: persist data 2023-10-25 15:52:17 +00:00
a3b4b3072a modules: services: calibre-web: persist library 2023-10-25 15:52:17 +00:00
ea5f9d181f modules: services: blog: persist website data 2023-10-25 15:52:17 +00:00
e86ab34a62 modules: hardware: bluetooth: persist connections 2023-10-25 15:52:17 +00:00
86b42568ed modules: hardware: netowrking persist connections 2023-10-25 15:52:17 +00:00
5125ca329e modules: services: ssh-server: persist host keys 2023-10-25 15:52:17 +00:00
ab5ebae2cb WIP: modules: systems: add persist
This is the module that takes care of configuring impermanence at the
system level.

WIP:
    * address FIXMEs
    * activate home-manager persistence?
        * set `programs.fuse.userAllowOther = true;` ?
    * point `age` to persisted paths [1] ?
    * make sure all services and modules are persisted correctly...

[1]: b1d18d25b8
2023-10-25 15:52:17 +00:00
270f9f02a2 flake: add 'impermanence' 2023-10-25 15:52:17 +00:00
08212e49cd modules: services: matrix: add sliding sync
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2023-10-20 08:35:37 +00:00
e3a8d0e178 modules: services: matrix: register dummy vhosts
This is simply to make use of my infrastructure for port collision
detection.
2023-10-20 08:35:37 +00:00
ad976e2097 hosts: nixos: porthos: secrets: add matrix sync 2023-10-20 08:35:37 +00:00
31fbd7aa4f modules: services: matrix: refactor vhost 2023-10-20 08:35:37 +00:00
1398425b91 hosts: homes: cloudtop: disable gpg-agent
All checks were successful
ci/woodpecker/push/check Pipeline was successful
It doesn't work well in this environment anyway.
2023-10-19 10:42:22 +00:00
36 changed files with 303 additions and 7 deletions

17
flake.lock generated
View file

@ -145,6 +145,22 @@
"type": "github"
}
},
"impermanence": {
"locked": {
"lastModified": 1694622745,
"narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "impermanence",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1695644571,
@ -212,6 +228,7 @@
"flake-parts": "flake-parts",
"futils": "futils",
"home-manager": "home-manager",
"impermanence": "impermanence",
"nixpkgs": "nixpkgs",
"nur": "nur",
"pre-commit-hooks": "pre-commit-hooks"

View file

@ -39,6 +39,13 @@
};
};
impermanence = {
type = "github";
owner = "nix-community";
repo = "impermanence";
ref = "master";
};
nixpkgs = {
type = "github";
owner = "NixOS";

View file

@ -15,6 +15,8 @@
programs.git.package = lib.mkForce pkgs.emptyDirectory;
services.gpg-agent.enable = lib.mkForce false;
# I use scripts that use the passthrough sequence often on this host
my.home.tmux.enablePassthrough = true;
}

View file

@ -0,0 +1,9 @@
age-encryption.org/v1
-> ssh-ed25519 cKojmg N182xey8TWRVUWTRP16rT0zlhYZNr/pOZVR7YRnlIkk
HVqAag55z1cKLgjR3WsUj2wvaVjxm169JcDRJGRvCVU
-> ssh-ed25519 jPowng Dc+aaUTxDsMTY+oOst0SC3ldq1e6zX8F5A5uBL5RHhc
JWZou6+VaFc5f2OLRIrmFFWg3Er6WSY+TloXU0mP1K8
-> |9_9Aqh%-grease $ X8Mn|5 aKnl' fl<D{T-
+fAc0cajqxhYWu55HCY
--- SrmtWXQXGYxNTabSrb5tBRXHnK1F22Qoiy7hKYrrF+0
ñD·û²: ,õn0i<>½Àß^ÆŠ`üÔ2Æ#y'ý9ÖñÓÒŽéÿæ<C3BF>r]Àعx“³S=ú°ˆôuJéEÛóc€lH Ê~ ŸKtévo'êv+

View file

@ -35,6 +35,9 @@ in
owner = "matrix-synapse";
publicKeys = all;
};
"matrix/sliding-sync-secret.age" = {
publicKeys = all;
};
"miniflux/credentials.age".publicKeys = all;

View file

@ -64,6 +64,9 @@ in
mailConfigFile = secrets."matrix/mail".path;
# Only necessary when doing the initial registration
secretFile = secrets."matrix/secret".path;
slidingSync = {
secretFile = secrets."matrix/sliding-sync-secret".path;
};
};
miniflux = {
enable = true;

View file

@ -18,6 +18,13 @@ in
services.blueman.enable = true;
}
# Persist bluetooth files
{
my.system.persist.directories = [
"/var/lib/bluetooth"
];
}
# Support for additional bluetooth codecs
(lib.mkIf cfg.loadExtraCodecs {
hardware.pulseaudio = {

View file

@ -22,6 +22,11 @@ in
config = lib.mkMerge [
(lib.mkIf cfg.wireless.enable {
networking.networkmanager.enable = true;
# Persist NetworkManager files
my.system.persist.directories = [
"/etc/NetworkManager/system-connections"
];
})
];
}

View file

@ -42,5 +42,12 @@ in
# Those are all subdomains, no problem
my.services.nginx.virtualHosts = hostsInfo;
my.system.persist.directories = [
"/var/www/blog"
"/var/www/cv"
"/var/www/dev"
"/var/www/key"
];
};
}

View file

@ -54,6 +54,11 @@ in
];
};
my.system.persist.directories = [
"/var/lib/${config.services.calibre-web.dataDir}"
cfg.libraryPath
];
services.fail2ban.jails = {
calibre-web = ''
enabled = true

View file

@ -46,5 +46,9 @@ in
inherit (cfg) port;
}
];
my.system.persist.directories = [
"/var/lib/${cfg.stateDir}"
];
};
}

View file

@ -135,6 +135,11 @@ in
];
};
my.system.persist.directories = [
config.services.gitea.lfs.contentDir
config.services.gitea.repositoryRoot
];
services.fail2ban.jails = {
gitea = ''
enabled = true

View file

@ -36,5 +36,8 @@ in
forceSSL = true;
useACMEHost = config.networking.domain;
};
# FIXME: backup
# FIXME: persistence
};
}

View file

@ -34,6 +34,10 @@ in
port = jackettPort;
}
];
my.system.persist.directories = [
config.services.jackett.dataDir
];
})
(lib.mkIf cfg.nzbhydra.enable {
@ -47,6 +51,10 @@ in
port = nzbhydraPort;
}
];
my.system.persist.directories = [
config.services.nzbhydra2.dataDir
];
})
(lib.mkIf cfg.prowlarr.enable {
@ -61,6 +69,10 @@ in
}
];
my.system.persist.directories = [
"/var/lib/${config.systemd.services.prowlarr.serviceConfig.StateDirectory}"
];
services.fail2ban.jails = {
prowlarr = ''
enabled = true

View file

@ -35,5 +35,9 @@ in
};
}
];
my.system.persist.directories = [
"/var/lib/${config.systemd.services.jellyfin.serviceConfig.StateDirectory}"
];
};
}

View file

@ -104,5 +104,9 @@ in
inherit (cfg) port;
}
];
my.system.persist.directories = [
"/var/lib/${config.systemd.services.lohr.serviceConfig.StateDirectory}"
];
};
}

View file

@ -13,6 +13,7 @@ let
federationPort = { public = 8448; private = 11338; };
clientPort = { public = 443; private = 11339; };
domain = config.networking.domain;
matrixDomain = "matrix.${domain}";
in
{
options.my.services.matrix = with lib; {
@ -25,6 +26,21 @@ in
description = "Shared secret to register users";
};
slidingSync = {
port = mkOption {
type = types.port;
default = 8009;
example = 8084;
description = "Port used by sliding sync server";
};
secretFile = mkOption {
type = types.str;
example = "/var/lib/matrix/sliding-sync-secret-file.env";
description = "Secret file which contains SYNCV3_SECRET definition";
};
};
mailConfigFile = mkOption {
type = types.str;
example = "/var/lib/matrix/email-config.yaml";
@ -52,7 +68,7 @@ in
settings = {
server_name = domain;
public_baseurl = "https://matrix.${domain}";
public_baseurl = "https://${matrixDomain}";
enable_registration = false;
@ -88,6 +104,17 @@ in
extraConfigFiles = [
cfg.mailConfigFile
] ++ lib.optional (cfg.secretFile != null) cfg.secretFile;
sliding-sync = {
enable = true;
settings = {
SYNCV3_SERVER = "https://${matrixDomain}";
SYNCV3_BINDADDR = "127.0.0.1:${toString cfg.slidingSync.port}";
};
environmentFile = cfg.slidingSync.secretFile;
};
};
my.services.nginx.virtualHosts = [
@ -98,12 +125,15 @@ in
conf = {
default_server_config = {
"m.homeserver" = {
"base_url" = "https://matrix.${domain}";
"base_url" = "https://${matrixDomain}";
"server_name" = domain;
};
"m.identity_server" = {
"base_url" = "https://vector.im";
};
"org.matrix.msc3575.proxy" = {
"url" = "https://matrix-sync.${domain}";
};
};
showLabsSettings = true;
defaultCountryCode = "FR"; # cocorico
@ -116,11 +146,25 @@ in
};
};
}
# Dummy VHosts for port collision detection
{
subdomain = "matrix-federation";
port = federationPort.private;
}
{
subdomain = "matrix-client";
port = clientPort.private;
}
# Sliding sync
{
subdomain = "matrix-sync";
inherit (cfg.slidingSync) port;
}
];
# Those are too complicated to use my wrapper...
services.nginx.virtualHosts = {
"matrix.${domain}" = {
${matrixDomain} = {
onlySSL = true;
useACMEHost = domain;
@ -138,6 +182,11 @@ in
"/_matrix" = proxyToClientPort;
"/_synapse/client" = proxyToClientPort;
# Sliding sync
"~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = {
proxyPass = "http://${config.services.matrix-synapse.sliding-sync.settings.SYNCV3_BINDADDR}";
};
};
listen = [
@ -148,9 +197,9 @@ in
};
# same as above, but listening on the federation port
"matrix.${domain}_federation" = {
"${matrixDomain}_federation" = {
onlySSL = true;
serverName = "matrix.${domain}";
serverName = matrixDomain;
useACMEHost = domain;
locations."/".return = "404";
@ -171,7 +220,7 @@ in
locations."= /.well-known/matrix/server".extraConfig =
let
server = { "m.server" = "matrix.${domain}:${toString federationPort.public}"; };
server = { "m.server" = "${matrixDomain}:${toString federationPort.public}"; };
in
''
add_header Content-Type application/json;
@ -181,8 +230,9 @@ in
locations."= /.well-known/matrix/client".extraConfig =
let
client = {
"m.homeserver" = { "base_url" = "https://matrix.${domain}"; };
"m.homeserver" = { "base_url" = "https://${matrixDomain}"; };
"m.identity_server" = { "base_url" = "https://vector.im"; };
"org.matrix.msc3575.proxy" = { "url" = "https://matrix-sync.${domain}"; };
};
# ACAO required to allow element-web on any URL to request this json file
in
@ -207,5 +257,9 @@ in
config.services.matrix-synapse.dataDir
];
};
my.system.persist.directories = [
config.services.matrix-synapse.dataDir
];
};
}

View file

@ -49,5 +49,8 @@ in
inherit (cfg) port;
}
];
# FIXME: backup
# FIXME: persistence
};
}

View file

@ -131,5 +131,10 @@ in
inherit (cfg.grafana) port;
}
];
my.system.persist.directories = [
config.services.grafana.dataDir
"/var/lib/${config.services.prometheus.stateDir}"
];
};
}

View file

@ -53,5 +53,9 @@ in
inherit (cfg) port;
}
];
my.system.persist.directories = [
"/var/lib/${config.systemd.services.navidrome.serviceConfig.StateDirectory}"
];
};
}

View file

@ -83,5 +83,10 @@ in
"${config.services.nextcloud.home}/data/appdata_*/preview"
];
};
my.system.persist.directories = [
config.services.nextcloud.home
config.services.nextcloud.datadir
];
};
}

View file

@ -470,5 +470,9 @@ in
}
];
};
my.system.persist.directories = [
config.users.user.acme.home
];
};
}

View file

@ -164,5 +164,10 @@ in
config.services.paperless.mediaDir
];
};
my.system.persist.directories = [
config.services.paperless-ng.dataDir
config.services.paperless-ng.mediaDir
];
};
}

View file

@ -18,6 +18,11 @@ let
enable = true;
group = "media";
};
# Thankfully those old style services all define users with homes
my.system.persist.directories = [
config.users.user.${service}.home
];
};
mkRedirection = service: {

View file

@ -37,5 +37,10 @@ in
inherit (cfg) port;
}
];
my.system.persist.directories =
builtins.map
(d: "/var/lib/${d}")
config.systemd.services.podgrab.serviceConfig.StateDirectory;
};
}

View file

@ -24,5 +24,9 @@ in
(config.services.postgresqlBackup.location + "/*.prev.sql.gz")
];
};
my.system.persist.directories = [
config.services.postgresqlBackup.location
];
};
}

View file

@ -18,6 +18,13 @@ in
};
})
# Only persist directory if the actual service is enabled
(lib.mkIf config.services.postgresql.enable {
my.system.persist.directories = [
config.services.postgresql.dataDir
];
})
# Taken from the manual
(lib.mkIf cfg.upgradeScript {
containers.temp-pg.config.services.postgresql = {

View file

@ -46,5 +46,9 @@ in
# Because Quassel does not use the socket, I simply trust its connection
authentication = "host quassel quassel localhost trust";
};
my.system.persist.directories = [
config.services.quassel.dataDir
];
};
}

View file

@ -20,5 +20,9 @@ in
forceSSL = true;
useACMEHost = config.networking.domain;
};
my.system.persist.directories = [
config.services.rss-bridge.dataDir
];
};
}

View file

@ -25,6 +25,10 @@ in
}
];
my.system.persist.files = [
config.services.sabnzbd.configFile
];
services.fail2ban.jails = {
sabnzbd = ''
enabled = true

View file

@ -20,6 +20,14 @@ in
};
};
# Persist SSH keys
my.system.persist.files = [
"/etc/ssh/ssh_host_ed25519_key"
"/etc/ssh/ssh_host_ed25519_key.pub"
"/etc/ssh/ssh_host_rsa_key"
"/etc/ssh/ssh_host_rsa_key.pub"
];
# Opens the relevant UDP ports.
programs.mosh.enable = true;
};

View file

@ -75,5 +75,8 @@ in
inherit (cfg) port;
}
];
# FIXME: backup
# FIXME: persistence
};
}

View file

@ -91,5 +91,9 @@ in
allowedTCPPorts = [ cfg.peerPort ];
allowedUDPPorts = [ cfg.peerPort ];
};
my.system.persist.directories = [
config.services.transmission.home
];
};
}

View file

@ -119,5 +119,7 @@ in
config.services.vikunja.settings.files.basepath
];
};
# FIXME: persistence
};
}

View file

@ -9,6 +9,7 @@
./language
./nix
./packages
./persist
./podman
./users
];

View file

@ -0,0 +1,68 @@
# Ephemeral root configuration
{ config, inputs, lib, ... }:
let
cfg = config.my.system.persist;
in
{
imports = [
inputs.impermanence.nixosModules.impermanence
];
options.my.system.persist = with lib; {
enable = mkEnableOption "stateless system configuration";
mountPoint = lib.mkOption {
type = types.str;
default = "/persistent";
example = "/etc/nix/persist";
description = ''
Which mount point should be used to persist this system's files and
directories.
'';
};
files = lib.mkOption {
type = with types; listOf str;
default = [ ];
example = [
"/etc/nix/id_rsa"
];
description = ''
Additional files in the root to link to persistent storage.
'';
};
directories = lib.mkOption {
type = with types; listOf str;
default = [ ];
example = [
"/var/lib/libvirt"
];
description = ''
Additional directories in the root to link to persistent storage.
'';
};
};
config = lib.mkIf cfg.enable {
environment.persistence."${cfg.mountPoint}" = {
files = [
"/etc/machine-id"
]
++ cfg.files
;
directories = [
"/etc/nixos"
"/var/log"
"/var/lib/systemd/coredump"
]
++ (lib.optionals config.virtualisation.docker.enable [
"/var/lib/docker"
])
# FIXME: podman
++ cfg.directories
;
};
};
}