gonna deploy now

This commit is contained in:
KoenDR06 2026-02-09 13:45:20 +01:00
parent c340cf4ff3
commit a6bff8a467
5 changed files with 54 additions and 52 deletions

View file

@ -1,10 +1,18 @@
{...}: {
{lib, ...}: let
inherit (lib) mkOption types;
in {
imports = [
./nginx.nix
./forgejo.nix
./vaultwarden.nix
];
options = {
backupDir = mkOption {
type = types.str;
};
};
config = {
networking.nat = {
enable = true;

View file

@ -10,8 +10,8 @@
cfg = config.horseman.containers.forgejo;
username = config.horseman.username;
BACKUP_DIR = config.horseman.containers.backupDir;
DATA_DIR = "/home/${username}/backups/volumes/forgejo";
BACKUP_FILE = "/home/${username}/backups/forgejo.tar";
in {
options = {
horseman.containers.forgejo = {
@ -46,7 +46,8 @@ in {
environment.systemPackages = [pkgs.gnutar];
systemd.services."backup-forgejo" = {
script = ''
${pkgs.gnutar}/bin/tar -cf ${BACKUP_FILE} ${DATA_DIR}
cd ${BACKUP_DIR}
${pkgs.gnutar}/bin/tar -cf forgejo-$(date +'%Y-%m-%d').tar ${DATA_DIR}
'';
serviceConfig = {
User = "root";

View file

@ -13,12 +13,15 @@ in {
options = {
horseman.containers.nginx = {
enable = mkEnableOption "nginx container";
domain = mkOption {
type = types.str;
default = "koendev.nl";
};
};
};
config = mkIf cfg.enable {
networking.extraHosts = "192.168.100.1 koendevLocal.nl public.koendevLocal.nl git.koendevLocal.nl vault.koendevLocal.nl";
containers.nginx = {
autoStart = true;
privateNetwork = true;
@ -27,11 +30,11 @@ in {
bindMounts = {
"/var/www/portfolio" = {
hostPath = "/home/horseman/Programming/portfolio/_site";
hostPath = "/var/www/portfolio";
isReadOnly = true;
};
"/var/www/public" = {
hostPath = "/home/horseman/Public";
hostPath = "/var/www/public";
isReadOnly = true;
};
};
@ -46,50 +49,40 @@ in {
enable = true;
virtualHosts = {
"koendevLocal.nl" = {
# addSSL = false;
# enableACME = false;
"${cfg.domain}" = {
forceSSL = true;
enableACME = true;
root = "/var/www/portfolio";
default = true;
extraConfig = ''
error_page 404 /404.html;
'';
addSSL = true;
sslCertificate = "/var/www/portfolio/cert.pem";
sslCertificateKey = "/var/www/portfolio/key.pem";
};
"public.koendevLocal.nl" = {
"public.${cfg.domain}" = {
forceSSL = true;
enableACME = true;
root = "/var/www/public";
addSSL = true;
sslCertificate = "/var/www/portfolio/cert.pem";
sslCertificateKey = "/var/www/portfolio/key.pem";
};
"git.koendevLocal.nl" = {
# addSSL = false;
# enableACME = false;
"git.${cfg.domain}" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://${osConfig.containers.forgejo.localAddress}:${toString osConfig.horseman.containers.forgejo.port}";
};
addSSL = true;
sslCertificate = "/var/www/portfolio/cert.pem";
sslCertificateKey = "/var/www/portfolio/key.pem";
};
"vault.koendevLocal.nl" = {
# addSSL = false;
# enableACME = false;
"vault.${cfg.domain}" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://${osConfig.containers.vaultwarden.localAddress}:${toString osConfig.horseman.containers.vaultwarden.port}";
};
forceSSL = true;
sslCertificate = "/var/www/portfolio/cert.pem";
sslCertificateKey = "/var/www/portfolio/key.pem";
};
};
};

View file

@ -10,8 +10,8 @@
cfg = config.horseman.containers.vaultwarden;
username = config.horseman.username;
BACKUP_DIR = config.horseman.containers.backupDir;
DATA_DIR = "/home/${username}/backups/volumes/vaultwarden";
BACKUP_FILE = "/home/${username}/backups/vaultwarden.tar";
in {
options = {
horseman.containers.vaultwarden = {
@ -41,7 +41,8 @@ in {
environment.systemPackages = [pkgs.gnutar];
systemd.services."backup-vaultwarden" = {
script = ''
${pkgs.gnutar}/bin/tar -cf ${BACKUP_FILE} ${DATA_DIR}
cd ${BACKUP_DIR}
${pkgs.gnutar}/bin/tar -cf vaultwarden-$(date +'%Y-%m-%d').tar ${DATA_DIR}
'';
serviceConfig = {
User = "root";