diff --git a/machines/eva/modules/telegraf/private.nix b/machines/eva/modules/telegraf/private.nix index fb348b972..21d79b869 100644 --- a/machines/eva/modules/telegraf/private.nix +++ b/machines/eva/modules/telegraf/private.nix @@ -134,12 +134,6 @@ in #}; http_response = [ - { - urls = [ "https://adminer.thalheim.io/" ]; - tags.host = "eve"; - tags.org = "private"; - response_string_match = "Login"; - } { urls = [ "https://mail.thalheim.io" ]; tags.host = "eve"; diff --git a/machines/eve/configuration.nix b/machines/eve/configuration.nix index 7dfebbebc..e7e120eb1 100644 --- a/machines/eve/configuration.nix +++ b/machines/eve/configuration.nix @@ -28,7 +28,6 @@ inputs.nix-index-database.nixosModules.nix-index { programs.nix-index-database.comma.enable = true; } - ./modules/adminer.nix ./modules/atuin.nix ./modules/bitwarden.nix ./modules/buildbot.nix diff --git a/machines/eve/modules/adminer.nix b/machines/eve/modules/adminer.nix deleted file mode 100644 index 04a0b0568..000000000 --- a/machines/eve/modules/adminer.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ pkgs, config, ... }: -{ - services.phpfpm.pools.adminer = { - user = "adminer"; - group = "adminer"; - settings = { - "listen.owner" = "nginx"; - "listen.group" = "nginx"; - "pm" = "ondemand"; - "pm.max_children" = 32; - "pm.process_idle_timeout" = "10s"; - "pm.max_requests" = 500; - }; - }; - - services.nginx = { - virtualHosts."adminer.thalheim.io" = { - useACMEHost = "thalheim.io"; - forceSSL = true; - extraConfig = '' - index adminer.php; - ''; - locations."/".extraConfig = '' - try_files $uri $uri/ /index.php?$args; - ''; - locations."~* ^.+\.php$".extraConfig = '' - include ${pkgs.nginx}/conf/fastcgi_params; - fastcgi_pass unix:${config.services.phpfpm.pools.adminer.socket}; - fastcgi_index adminer.php; - fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name; - ''; - root = "${pkgs.adminer}"; - }; - }; - - users.users.adminer = { - isSystemUser = true; - createHome = true; - group = "adminer"; - }; - - users.groups.adminer = { }; -}