colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

servo: mediawiki: remove dead commented-out code

Browse Source
This commit is contained in:
colin 2022-12-15 10:07:53 +00:00
parent 01db7e1f23
commit 700fef7df3
2 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hosts/servo/services/nginx.nix
View File

@ -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;

33
hosts/servo/services/wikipedia.nix
View File

@ -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 = ''
# <Directory "${pkg}/share/mediawiki">
# <FilesMatch "\.php$">
# <If "-f %{REQUEST_FILENAME}">
# SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
# </If>
# </FilesMatch>
# Require all granted
# DirectoryIndex index.php
# AllowOverride All
# </Directory>
# '' + optionalString (cfg.uploadsDir != null) ''
# Alias "/images" "${cfg.uploadsDir}"
# <Directory "${cfg.uploadsDir}">
# Require all granted
# </Directory>
# '';
# } ];
# };
}