diff options
Diffstat (limited to '')
| -rw-r--r-- | flora/configuration.nix | 2 | ||||
| -rw-r--r-- | flora/services/blog.nix | 9 | ||||
| -rw-r--r-- | flora/services/cgit.nix | 8 | ||||
| -rw-r--r-- | flora/services/mail.nix | 2 | ||||
| -rw-r--r-- | flora/services/monit.nix | 16 |
5 files changed, 19 insertions, 18 deletions
diff --git a/flora/configuration.nix b/flora/configuration.nix index 40cd3a5..11d5a31 100644 --- a/flora/configuration.nix +++ b/flora/configuration.nix @@ -11,7 +11,7 @@ ./services/trainspotter.nix ./services/element.nix ./services/ntfy.nix - ./services/murmur.nix + # ./services/murmur.nix ./services/monit.nix ]; diff --git a/flora/services/blog.nix b/flora/services/blog.nix index e8335b1..e77cc7c 100644 --- a/flora/services/blog.nix +++ b/flora/services/blog.nix @@ -39,7 +39,14 @@ in services.nginx.virtualHosts."stuebinm.eu" = { enableACME = true; forceSSL = true; - locations."/".root = import inputs.blog { inherit pkgs; }; + locations."/".root = (import inputs.blog { inherit pkgs; }).overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ pkgs.exiftool pkgs.libxml2 ]; + + doCheck = true; + checkPhase = '' + xmllint _site/rss.xml + ''; + }); locations."/bookshelf/".alias = "${gtfsBooks.outPath}/"; }; } diff --git a/flora/services/cgit.nix b/flora/services/cgit.nix index b846ad4..5ee8103 100644 --- a/flora/services/cgit.nix +++ b/flora/services/cgit.nix @@ -2,7 +2,13 @@ let cgitconf = '' - source-filter=${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py + source-filter=${pkgs.writeScript ''highlighter'' '' + if [[ $1 == *.thy ]]; then + ${pkgs.isabelle-utils}/bin/isabelle2unicode | ${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py "$1" + else + ${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py "$1" + fi + ''} about-filter=${pkgs.cgit}/lib/cgit/filters/about-formatting.sh cache-size=1000 logo=/git/cgit.png diff --git a/flora/services/mail.nix b/flora/services/mail.nix index 523c32d..0ee8418 100644 --- a/flora/services/mail.nix +++ b/flora/services/mail.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, inputs, ... }: { - imports = [ inputs.simple-nixos-mailserver ]; + imports = [ inputs.nixos-mailserver ]; sops.secrets."mail/hashedPassword" = {}; diff --git a/flora/services/monit.nix b/flora/services/monit.nix index 19e7e88..cc5f3c4 100644 --- a/flora/services/monit.nix +++ b/flora/services/monit.nix @@ -30,23 +30,11 @@ if failed port 443 with protocol https then alert - check host hacc-uffd with address login.infra4future.de - if failed port 443 with protocol https - then alert - - check host hacc-onlyoffice with address onlyoffice.infra4future.de - if failed port 443 with protocol https and status 302 - then alert - - check host hacc-mattermost with address mattermost.infra4future.de - if failed port 443 with protocol https - then alert - - check host hacc-nextcloud with address cloud.infra4future.de + check host nobelium with address colorspace.club if failed port 443 with protocol https then alert - check host nobelium with address colorspace.club + check host billy with address preprint.books.exposed if failed port 443 with protocol https then alert ''; |