finally works
This commit is contained in:
parent
18f05807d2
commit
7019a80883
2 changed files with 23 additions and 16 deletions
|
|
@ -50,18 +50,34 @@ in {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
error_page 404 /404.html;
|
error_page 404 /404.html;
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
addSSL = true;
|
||||||
|
sslCertificate = "/var/www/portfolio/cert.pem";
|
||||||
|
sslCertificateKey = "/var/www/portfolio/key.pem";
|
||||||
};
|
};
|
||||||
|
|
||||||
"git.koendevLocal.nl" = {
|
"git.koendevLocal.nl" = {
|
||||||
|
# addSSL = false;
|
||||||
|
# enableACME = false;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://${osConfig.containers.forgejo.localAddress}:${toString osConfig.horseman.containers.forgejo.port}";
|
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" = {
|
"vault.koendevLocal.nl" = {
|
||||||
|
# addSSL = false;
|
||||||
|
# enableACME = false;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://${osConfig.containers.vaultwarden.localAddress}:${toString osConfig.horseman.containers.vaultwarden.port}";
|
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";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -69,7 +85,7 @@ in {
|
||||||
networking = {
|
networking = {
|
||||||
firewall = {
|
firewall = {
|
||||||
enable = true;
|
enable = true;
|
||||||
allowedTCPPorts = [80];
|
allowedTCPPorts = [80 443];
|
||||||
};
|
};
|
||||||
useHostResolvConf = lib.mkForce false;
|
useHostResolvConf = lib.mkForce false;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
in {
|
in {
|
||||||
options = {
|
options = {
|
||||||
horseman.containers.vaultwarden = {
|
horseman.containers.vaultwarden = {
|
||||||
enable = mkEnableOption "forgejo containers";
|
enable = mkEnableOption "Password manager";
|
||||||
|
|
||||||
port = mkOption {
|
port = mkOption {
|
||||||
default = 3000;
|
default = 3000;
|
||||||
|
|
@ -66,25 +66,16 @@ in {
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
environment.variables = {
|
environment.systemPackages = with pkgs; [
|
||||||
ROCKET_ADDRESS = "127.0.0.1";
|
vaultwarden.webvault
|
||||||
ROCKET_PORT = toString cfg.port;
|
];
|
||||||
WEB_VAULT_ENABLED = "false";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.vaultwarden = {
|
services.vaultwarden = {
|
||||||
enable = true;
|
enable = true;
|
||||||
backupDir = "/var/local/vaultwarden/backup";
|
|
||||||
# in order to avoid having ADMIN_TOKEN in the nix store it can be also set with the help of an environment file
|
|
||||||
# be aware that this file must be created by hand (or via secrets management like sops)
|
|
||||||
environmentFile = "/var/lib/vaultwarden/vaultwarden.env";
|
|
||||||
config = {
|
config = {
|
||||||
DOMAIN = cfg.url;
|
|
||||||
SIGNUPS_ALLOWED = false;
|
|
||||||
|
|
||||||
ROCKET_ADDRESS = "127.0.0.1";
|
|
||||||
ROCKET_PORT = cfg.port;
|
ROCKET_PORT = cfg.port;
|
||||||
ROCKET_LOG = "critical";
|
ROCKET_ADDRESS = "0.0.0.0";
|
||||||
|
WEB_VAULT_FOLDER = "${pkgs.vaultwarden.webvault}/share/vaultwarden/vault";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue