diff --git a/config/common/data/pubkeys/despondos_host_ed25519_key.pub b/config/common/data/pubkeys/despondos_host_ed25519_key.pub index 6367ffa..6c326b4 100644 --- a/config/common/data/pubkeys/despondos_host_ed25519_key.pub +++ b/config/common/data/pubkeys/despondos_host_ed25519_key.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH+ZQk80BU/OdQfV990yrkFwvsLVbVZ2Itof/qwxjTn7 +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG4C5OgZpxoF42L5rPqwejs+Q1ViN9TM9o/fEbpnPFtA diff --git a/config/hosts/wind/configuration.nix b/config/hosts/wind/configuration.nix index 094c57d..bb597df 100644 --- a/config/hosts/wind/configuration.nix +++ b/config/hosts/wind/configuration.nix @@ -7,6 +7,7 @@ ../../common/services/tailscale.nix ../../common/users.nix ./services/acme.nix + ./services/borg.nix ./services/coturn.nix ./services/nginx.nix ./services/nitter.nix diff --git a/config/hosts/wind/data/secrets/borg_pass b/config/hosts/wind/data/secrets/borg_pass new file mode 100644 index 0000000..1d65621 Binary files /dev/null and b/config/hosts/wind/data/secrets/borg_pass differ diff --git a/config/hosts/wind/data/secrets/secrets.nix b/config/hosts/wind/data/secrets/secrets.nix index b00061f..7b552e0 100644 Binary files a/config/hosts/wind/data/secrets/secrets.nix and b/config/hosts/wind/data/secrets/secrets.nix differ diff --git a/config/hosts/wind/data/secrets/ssh_key b/config/hosts/wind/data/secrets/ssh_key index 6dd0719..eb6c6ce 100644 Binary files a/config/hosts/wind/data/secrets/ssh_key and b/config/hosts/wind/data/secrets/ssh_key differ diff --git a/config/hosts/wind/data/secrets/ssh_key.pub b/config/hosts/wind/data/secrets/ssh_key.pub index 54b1d0b..de5e671 100644 Binary files a/config/hosts/wind/data/secrets/ssh_key.pub and b/config/hosts/wind/data/secrets/ssh_key.pub differ diff --git a/config/hosts/wind/services/borg.nix b/config/hosts/wind/services/borg.nix new file mode 100644 index 0000000..9c22666 --- /dev/null +++ b/config/hosts/wind/services/borg.nix @@ -0,0 +1,16 @@ +{ config, ... }: + +{ + services.borgbackup.jobs = { + gitea = { + paths = "/var/lib/gitea"; + repo = "ssh://borg@despondos.nao.sh//mnt/slab/backup/wind/gitea"; + encryption.mode = "repokey"; + encryption.passCommand = "cat ${config.secrets.files.borg_pass_gitea.file}"; + environment.BORG_RSH = "ssh -i ${config.secrets.files.ssh_key_gitea.file}"; + compression = "auto,zstd"; + startAt = "*-*-* 02:15:00"; + user = "gitea"; + }; + }; +} diff --git a/config/hosts/wind/services/gitea.nix b/config/hosts/wind/services/gitea.nix index b9a86a2..ec0d191 100644 --- a/config/hosts/wind/services/gitea.nix +++ b/config/hosts/wind/services/gitea.nix @@ -3,9 +3,6 @@ { services.gitea = { enable = true; - domain = "git.graven.dev"; - rootUrl = "https://git.graven.dev"; - enableUnixSocket = true; appName = "Graven Gitea"; settings = { "ui" = { "DEFAULT_THEME" = "arc-green"; }; }; database = { @@ -13,5 +10,8 @@ }; settings.service.DISABLE_REGISTRATION = true; settings.session.COOKIE_SECURE = true; + settings.server.DOMAIN = "git.graven.dev"; + settings.server.ROOT_URL = "https://git.graven.dev"; + settings.server.PROTOCOL = "http+unix"; }; }