From 9271611c189a3ed4129d3b98422f86ab3f774f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Tue, 5 May 2020 12:54:06 +0200 Subject: Upgrade roundcube --- modules/private/monitoring/objects_monitoring-1.nix | 2 +- modules/private/websites/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'modules/private') diff --git a/modules/private/monitoring/objects_monitoring-1.nix b/modules/private/monitoring/objects_monitoring-1.nix index 741860a..46916f4 100644 --- a/modules/private/monitoring/objects_monitoring-1.nix +++ b/modules/private/monitoring/objects_monitoring-1.nix @@ -418,7 +418,7 @@ service_description = "roundcube website is running on mail.immae.eu"; host_name = "eldiron.immae.eu"; use = "external-web-service"; - check_command = ["check_https_code" "mail.immae.eu" "/roundcube/" "401" "Roundcube"]; + check_command = ["check_https" "mail.immae.eu" "/roundcube/" "<title>Roundcube"]; servicegroups = "webstatus-webapps,webstatus-email"; _webstatus_name = "Roundcube"; diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix index aba30e3..a3dcbb9 100644 --- a/modules/private/websites/default.nix +++ b/modules/private/websites/default.nix @@ -3,6 +3,19 @@ let www_root = "/run/current-system/webapps/_www"; theme_root = "/run/current-system/webapps/_theme"; apacheConfig = { + cache = { + # This setting permits to ignore time-based cache for files in the + # nix store: + # If a client requires an If-Modified-Since from timestamp 1, then + # this header is removed, and if the response contains a + # too old Last-Modified tag, then it is removed too + extraConfig = '' + <If "%{HTTP:If-Modified-Since} =~ /01 Jan 1970 00:00:01/" > + RequestHeader unset If-Modified-Since + </If> + Header unset Last-Modified "expr=%{LAST_MODIFIED} < 19991231235959" + ''; + }; gzip = { modules = [ "deflate" "filter" ]; extraConfig = '' -- cgit v1.2.3