diff options
| -rw-r--r-- | nixos/hosts/tente/default.nix | 16 | ||||
| -rw-r--r-- | nixos/hosts/tente/monitoring.nix | 4 | ||||
| -rw-r--r-- | nixos/npins/sources.json | 19 |
3 files changed, 33 insertions, 6 deletions
diff --git a/nixos/hosts/tente/default.nix b/nixos/hosts/tente/default.nix index e87b74b..7ecb793 100644 --- a/nixos/hosts/tente/default.nix +++ b/nixos/hosts/tente/default.nix @@ -23,6 +23,7 @@ in ./headscale.nix ./matrix.nix ./monitoring.nix + "${sources.my-lex-surf}/service.nix" "${sources.my-osm-proposals}/service.nix" "${sources.my-geopos-link}/service.nix" "${sources.my-rust-features}/service.nix" @@ -42,6 +43,21 @@ in }; users.groups.www-generator = {}; + services.lex-surf = + let + domain = "lex.surf"; + in + { + enable = true; + domain = domain; + enableACME = true; + fetchUser = "www-generator"; + nginx = { + forceSSL = true; + extraConfig = helpers.mkNginxConfig domain; + }; + }; + services.osm_proposals = let domain = "osm-proposals.${baseDomain}"; diff --git a/nixos/hosts/tente/monitoring.nix b/nixos/hosts/tente/monitoring.nix index 668e1ef..eaddacb 100644 --- a/nixos/hosts/tente/monitoring.nix +++ b/nixos/hosts/tente/monitoring.nix @@ -180,8 +180,8 @@ in forward_to = [loki.write.default.receiver] stage.match { - // Select messages from systemd services that have LogExtraFields=log_format=logfmt. - selector = "{__journal_log_format=\"logfmt\"}" + // Select messages from systemd services that have LogExtraFields=LOG_FORMAT=logfmt. + selector = "{__journal_LOG_FORMAT=\"logfmt\"}" stage.logfmt { mapping = { time = "", level = "" } } diff --git a/nixos/npins/sources.json b/nixos/npins/sources.json index 28c4145..1431463 100644 --- a/nixos/npins/sources.json +++ b/nixos/npins/sources.json @@ -26,6 +26,17 @@ "url": null, "hash": "0r2m5q7zwxms9spbg12gq6q5pc5hz2x6i14qq5s2nxvvf4fsmnnv" }, + "my-lex-surf": { + "type": "Git", + "repository": { + "type": "Git", + "url": "https://git.push-f.com/lex-surf" + }, + "branch": "master", + "revision": "ef3318a78050ea8aa4f6a65dd4673958c0eadf85", + "url": null, + "hash": "0v1xmv3slsb965047wi968j3n58dzy227pc5y2g79g2zdppvx94d" + }, "my-osm-proposals": { "type": "Git", "repository": { @@ -33,9 +44,9 @@ "url": "https://git.push-f.com/osm-proposals" }, "branch": "master", - "revision": "2ee6afdf3356dea2aebdd48d20dfe9eb07037ba3", + "revision": "0a531bcbd4778ef754583d52d1a6b525ee9702d4", "url": null, - "hash": "14j48alysvx4n06my3kspsbplx23sv07nvswrya1x3swmwn4mnnc" + "hash": "0phmc0c4di6hial8l5017k03c9zn8iz2zk8cgrzsgypaw1wwsn67" }, "my-rust-features": { "type": "Git", @@ -44,9 +55,9 @@ "url": "https://git.push-f.com/rust-features" }, "branch": "master", - "revision": "455778d2db961c36c54550ed3fc02a23aeaac34b", + "revision": "60c929acab8bfcd3fdc355288f1a72c1ed303f11", "url": null, - "hash": "1x2nk4wbd9xr02biphyrdjsksk3gj934w216k5mcvz86z7rfj8gj" + "hash": "1vnwhgqqi8ihic6fz6grzikc1dra6myl2b2aly2fgzrcbzrd5390" }, "my-spec-pub": { "type": "Git", |