From 8b6b3df5c42406f4c2c663f794565cf64804232b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 12 Jul 2020 14:30:42 +0100 Subject: fix(www/base): Add nginx fix timer Change-Id: Iec66fea0f3991ba74aede3911ea9f6ae5adb0188 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1082 Tested-by: BuildkiteCI Reviewed-by: lukegb --- ops/nixos/www/base.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/ops/nixos/www/base.nix b/ops/nixos/www/base.nix index a15db6bb8a..4b956cd95e 100644 --- a/ops/nixos/www/base.nix +++ b/ops/nixos/www/base.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { config = { @@ -10,5 +10,27 @@ recommendedGzipSettings = true; recommendedProxySettings = true; }; + + # NixOS 20.03 broke nginx and I can't be bothered to debug it + # anymore, all solution attempts have failed, so here's a + # brute-force fix. + # + # TODO(tazjin): Find a link to the upstream issue and see if + # they've sorted it after ~20.09 + systemd.services.fix-nginx = { + script = "${pkgs.coreutils}/bin/chown -f -R nginx: /var/spool/nginx /var/cache/nginx"; + + serviceConfig = { + User = "root"; + Type = "oneshot"; + }; + }; + + systemd.timers.fix-nginx = { + wantedBy = [ "multi-user.target" ]; + timerConfig = { + OnCalendar = "minutely"; + }; + }; }; } -- cgit 1.4.1