diff --git a/hosts/servo/services/nginx.nix b/hosts/servo/services/nginx.nix
index 8da4d0db..ad47880d 100644
--- a/hosts/servo/services/nginx.nix
+++ b/hosts/servo/services/nginx.nix
@@ -298,32 +298,6 @@ in
locations."/".proxyPass = "http://127.0.0.1:8013";
};
- # services.nginx.virtualHosts."w.uninsane.org" = let
- # fpm = config.services.phpfpm.pools.mediawiki;
- # in {
- # forceSSL = true;
- # enableACME = true;
- # inherit kTLS;
- # # we want fcgi, actually
- # # locations."~ ^.+?\.php(/.*)?$".extraConfig = ''
- # locations."/".extraConfig = ''
- # # fastcgi_pass unix:${fpm.socket}|fcgi://localhost/;
- # fastcgi_pass unix:${fpm.socket};
- # # some of this might be wrong
- # fastcgi_split_path_info ^(.+\.php)(/.*)$;
- # set $path_info $fastcgi_path_info;
- # fastcgi_param PATH_INFO $path_info;
- # include ${pkgs.nginx}/conf/fastcgi_params;
- # include ${pkgs.nginx}/conf/fastcgi.conf;
- # '';
-
- # # locations."/" = {
- # # tryFiles = "$uri $uri/ index.php";
- # # index = "index.php index.html index.htm";
- # # };
- # # TODO: consider /images directory
- # };
-
services.nginx.virtualHosts."rss.uninsane.org" = {
addSSL = true;
enableACME = true;
diff --git a/hosts/servo/services/wikipedia.nix b/hosts/servo/services/wikipedia.nix
index b342d27d..a30f9295 100644
--- a/hosts/servo/services/wikipedia.nix
+++ b/hosts/servo/services/wikipedia.nix
@@ -6,11 +6,6 @@
owner = config.users.users.mediawiki.name;
sopsFile = ../../../secrets/servo.yaml;
};
- # # mediawiki wants to serv itself over apache httpd:
- # # that doesn't work because nginx already binds port 80
- # services.httpd.enable = lib.mkForce false;
- # services.httpd.user = "nginx";
- # services.httpd.group = "nginx";
users.users.mediawiki.uid = config.sane.allocations.mediawiki-uid;
@@ -31,32 +26,4 @@
services.mediawiki.virtualHost.hostName = "w.uninsane.org";
services.mediawiki.virtualHost.adminAddr = "admin+mediawiki@uninsane.org";
# services.mediawiki.extensions = TODO: wikipedia sync extension?
-
- # original apache config for MW
- # services.httpd = {
- # enable = true;
- # extraModules = [ "proxy_fcgi" ];
- # virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
- # documentRoot = mkForce "${pkg}/share/mediawiki";
- # extraConfig = ''
- #
- #
- #
- # SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
- #
- #
-
- # Require all granted
- # DirectoryIndex index.php
- # AllowOverride All
- #
- # '' + optionalString (cfg.uploadsDir != null) ''
- # Alias "/images" "${cfg.uploadsDir}"
- #
- # Require all granted
- #
- # '';
- # } ];
- # };
-
}