bekkalokk/well-known: advertise TLS SMTP in autoconfig/mail

hosts/bekkalokk/configuration.nix

@@ -13,7 +13,6 @@
     ./services/mediawiki
     ./services/nginx.nix
     ./services/phpfpm.nix
-    ./services/prometheus-phpfpm-exporter.nix
     ./services/vaultwarden.nix
     ./services/webmail
     ./services/website

hosts/bekkalokk/services/prometheus-phpfpm-exporter.nix

@@ -1,54 +0,0 @@
-{ config, lib, values, ... }:
-let
-  cfg = config.services.prometheus.exporters.php-fpm;
-  pools = [
-    "idp"
-    "mediawiki"
-    "pvv-nettsiden"
-    "roundcube"
-    "snappymail"
-  ];
-in
-{
-  services.phpfpm.pools = lib.genAttrs pools (_: {
-    settings."pm.status_path" = "/status";
-  });
-
-  services.prometheus.exporters.php-fpm = {
-    enable = true;
-    listenAddress = "127.0.0.1";
-    extraFlags = [
-      "--phpfpm.scrape-uri=${lib.concatMapStringsSep "," (name: "unix://${config.services.phpfpm.pools.${name}.socket};/status") pools}"
-    ];
-  };
-
-  systemd.services.prometheus-php-fpm-exporter.serviceConfig = {
-    Slice = "system-monitoring.slice";
-    SupplementaryGroups = [ config.services.nginx.group ];
-    RestrictAddressFamilies = lib.mkForce [
-      "AF_INET"
-      "AF_INET6"
-      "AF_UNIX"
-    ];
-  };
-
-  services.nginx = lib.mkIf cfg.enable {
-    virtualHosts."www.pvv.ntnu.no" = lib.mkIf config.services.nginx.enable {
-      forceSSL = true;
-      enableACME = true;
-      kTLS = true;
-
-      locations."/prometheus-php-fpm-exporter/metrics" = {
-        proxyPass = "http://localhost:${toString cfg.port}/metrics";
-
-        extraConfig = ''
-          allow 127.0.0.1;
-          allow ::1;
-          allow ${values.hosts.ildkule.ipv4};
-          allow ${values.hosts.ildkule.ipv6};
-          deny all;
-        '';
-      };
-    };
-  };
-}

hosts/bekkalokk/services/well-known/root/autoconfig/mail/config-v1.1.xml

@@ -16,8 +16,8 @@
 
     <outgoingServer type="smtp">
       <hostname>smtp.pvv.ntnu.no</hostname>
-      <port>587</port>
-      <socketType>STARTTLS</socketType>
+      <port>465</port>
+      <socketType>SSL</socketType>
       <username>%EMAILLOCALPART%</username>
       <authentication>password-cleartext</authentication>
       <useGlobalPreferredServer>true</useGlobalPreferredServer>

hosts/ildkule/services/monitoring/prometheus/default.nix

@@ -7,7 +7,6 @@ in {
     ./machines.nix
     ./matrix-synapse.nix
     ./mysqld.nix
-    ./phpfpm.nix
     ./postgres.nix
   ];
 

hosts/ildkule/services/monitoring/prometheus/phpfpm.nix

@@ -1,15 +0,0 @@
-{ ... }:
-{
-  services.prometheus.scrapeConfigs = [{
-    job_name = "phpfpm";
-    scheme = "https";
-    metrics_path = "/prometheus-php-fpm-exporter/metrics";
-
-    static_configs = [
-      {
-        labels.hostname = "bekkalokk";
-        targets = [ "www.pvv.ntnu.no:443" ];
-      }
-    ];
-  }];
-}