fw/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync

Browse source
This commit is contained in:
fwastring 2026-03-27 20:22:28 +01:00
parent 0843a7a737
commit 1a874f68d8
5 changed files with 39 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
moduler/programs.nix
View file

@ -79,6 +79,8 @@
slurp
bitwarden-desktop
bitwarden-cli
lagrange
jujutsu
dbeaver-bin

38
moduler/services/monitoring/default.nix
View file

@ -68,27 +68,27 @@ in
config = mkMerge [
(mkIf config.grafana.enable {
services.grafana = {
enable = true;
settings = {
server = {
domain = config.grafana.domain;
http_port = config.grafana.port;
http_addr = config.grafana.host;
};
};
};
# services.grafana = {
# enable = true;
# settings = {
# server = {
# domain = config.grafana.domain;
# http_port = config.grafana.port;
# http_addr = config.grafana.host;
# };
# };
# };
# nginx reverse proxy
services.nginx.virtualHosts."${config.grafana.domain}" = {
enableACME = true;
forceSSL = true;
locations."/" = {
proxyPass = "http://${config.grafana.host}:${toString config.grafana.port}";
proxyWebsockets = true;
extraConfig = "proxy_ssl_server_name on;" + "proxy_pass_header Authorization;";
};
};
# services.nginx.virtualHosts."${config.grafana.domain}" = {
# enableACME = true;
# forceSSL = true;
# locations."/" = {
# proxyPass = "http://${config.grafana.host}:${toString config.grafana.port}";
# proxyWebsockets = true;
# extraConfig = "proxy_ssl_server_name on;" + "proxy_pass_header Authorization;";
# };
# };
})
(mkIf config.loki.enable {
networking.firewall.allowedTCPPorts = [ 3100 ];

2
moduler/wedding.nix
View file

@ -18,7 +18,7 @@ in
passwordFile = config.sops.secrets.github_password.path;
registry = "https://ghcr.io";
};
image = "ghcr.io/fwastring/wedding:74a8cfe49568f1e0ffebb51f3f5d1178c527a907";
image = "ghcr.io/fwastring/wedding:6de68dab52d1675283b8766d401088c9c541b170";
ports = [ "127.0.0.1:8083:8080" ];
};
};