qo.is/infrastructure
3
0
Fork 0
Code Issues 12 Pull requests 2 Projects 1 Activity Actions

Compare commits

base: qo.is:4d70fd2bf861be382fbbe6114881ac0ab3cd7b04
Branches Tags
qo.is:main
qo.is:54-deploy-vms-automatically
qo.is:renovate/lock-file-maintenance
qo.is:18-caral
...
compare: qo.is:17d2b1f3886da5ff66691c885afddd6f23ecc8c4
Branches Tags
qo.is:54-deploy-vms-automatically
qo.is:renovate/lock-file-maintenance
qo.is:main
qo.is:18-caral

2 commits
4d70fd2bf8 ... 17d2b1f388

Author SHA1 Message Date
Renovate Bot
17d2b1f388 Lock file maintenance
All checks were successful
CI / build (push) Successful in 2m35s
Details
2025-02-25 21:40:08 +01:00
Fabian Hauser
26022cf3dd Switch mstmp password reader to coreutils for services
All checks were successful
CI / build (push) Successful in 2m46s
Details
2025-02-25 22:17:58 +02:00
3 changed files with 15 additions and 14 deletions
Show stats Expand all files Collapse all files

24
flake.lock generated
View file

@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737038063, "lastModified": 1740485968,
"narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +74,11 @@
}, },
"nixpkgs-nixos-stable": { "nixpkgs-nixos-stable": {
"locked": { "locked": {
"lastModified": 1737672001, "lastModified": 1740339700,
"narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +90,11 @@
}, },
"nixpkgs-nixos-unstable": { "nixpkgs-nixos-unstable": {
"locked": { "locked": {
"lastModified": 1737885589, "lastModified": 1740367490,
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +140,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737411508, "lastModified": 1739262228,
"narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
nixos-modules/outgoing-server-mail/default.nix
View file

@ -40,7 +40,7 @@ with lib;
host = "mail.cyon.ch"; host = "mail.cyon.ch";
user = "system@qo.is"; user = "system@qo.is";
from = "no-reply@qo.is"; from = "no-reply@qo.is";
passwordeval = "${pkgs.busybox}/bin/cat ${config.sops.secrets."msmtp/password".path}"; passwordeval = "${pkgs.coreutils}/bin/cat ${config.sops.secrets."msmtp/password".path}";
}; };
}; };
}; };

3
nixos-modules/vault/default.nix
View file

@ -34,6 +34,8 @@ with lib;
ROCKET_PORT = 8222; ROCKET_PORT = 8222;
USE_SENDMAIL = true; USE_SENDMAIL = true;
SENDMAIL_COMMAND = "${pkgs.msmtp}/bin/sendmail";
SMTP_FROM = "vault@qo.is"; SMTP_FROM = "vault@qo.is";
SMTP_FROM_NAME = cfg.domain; SMTP_FROM_NAME = cfg.domain;
@ -68,7 +70,6 @@ with lib;
# See https://search.nixos.org/options?channel=unstable&show=services.vaultwarden.environmentFile # See https://search.nixos.org/options?channel=unstable&show=services.vaultwarden.environmentFile
sops.secrets."vaultwarden/environment-file".restartUnits = [ "vaultwarden.service" ]; sops.secrets."vaultwarden/environment-file".restartUnits = [ "vaultwarden.service" ];
systemd.services.vaultwarden.path = [ pkgs.msmtp ];
users.users.vaultwarden.extraGroups = [ "postdrop" ]; users.users.vaultwarden.extraGroups = [ "postdrop" ];
networking.hosts."127.0.0.1" = [ cfg.domain ]; networking.hosts."127.0.0.1" = [ cfg.domain ];