WIP

hosts/bekkalokk/services/website/default.nix

@@ -60,8 +60,10 @@ in {
       DOOR_SECRET = includeFromSops "door_secret";
 
       DB = {
-        DSN = "mysql:dbname=www-data_nettside;host=mysql.pvv.ntnu.no";
+        # DSN = "mysql:dbname=www-data_nettside;host=mysql.pvv.ntnu.no";
-        USER = "www-data_nettsi";
+        # USER = "www-data_nettsi";
+        DSN = "pgsql:dbname=pvv_nettsiden;host=postgres.pvv.ntnu.no";
+        USER = "pvv_nettsiden";
         PASS = includeFromSops "mysql_password";
       };
 
@@ -81,6 +83,7 @@ in {
 
   services.phpfpm.pools."pvv-nettsiden".settings = {
     "php_admin_value[error_log]" = "syslog";
+    "php_flag[display_errors]" = true;
     "php_admin_flag[log_errors]" = true;
     "catch_workers_output" = true;
 

hosts/temmie/services/userweb/mail.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   services.postfix.enable = lib.mkForce false;
 
@@ -9,26 +9,4 @@
       remotes = "mail.pvv.ntnu.no smtp --port=25";
     };
   };
-
-  systemd.sockets.userweb-sendmail-sandbox-proxy = {
-    wantedBy = [ "sockets.target" ];
-    listenStreams = [ "/run/userweb-sendmail-sandbox-proxy.sock" ];
-    socketConfig = {
-      # Accept = true;
-      SocketUser = "httpd";
-      SocketGroup = "httpd"; # TODO: is wwwrun(54) in this group?
-      SocketMode = "0660";
-    };
-  };
-
-  systemd.services.userweb-sendmail-sandbox-proxy = {
-    serviceConfig = {
-      User = "root";
-      Group = "root";
-      Sockets = [
-        "userweb-sendmail-sandbox-proxy.socket"
-      ];
-      ExecStart = "${lib.getExe pkgs.hello}";
-    };
-  };
 }