WIP
Eval nix flake / evals (push) Successful in 9m11s

This commit is contained in:
2026-01-30 02:04:19 +09:00
parent 0131e5af6d
commit 371b6409b4
2 changed files with 41 additions and 6 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, values, ... }:
let
# See microbel:/etc/exports
letters = [ "a" "b" "c" "d" "h" "i" "j" "k" "l" "m" "z" ];
letters = [ "a" "b" "c" "d" "h" "i" "j" "k" "l" "m" "z" ];
in
{
systemd.targets."pvv-homedirs" = {
+40 -5
View File
@@ -1,18 +1,51 @@
{ ... }:
{ config, lib, pkgs, ... }:
let
cfg = config.services.httpd;
in
{
services.httpd = {
enable = true;
adminAddr = "drift@pvv.ntnu.no";
# extraModules = [];
enablePHP = true;
phpPackage = pkgs.php.buildEnv {
extraConfig = ''
display_errors=0
post_max_size = 40M
upload_max_filesize = 40M
extension=sysvsem.so
'';
};
# enablePerl = true;
extraModules = [ "userdir" ];
# virtualHosts."userweb.pvv.ntnu.no" = {
virtualHosts."temmie.pvv.ntnu.no" = {
forceSSL = true;
enableACME = true;
extraConfig = ''
UserDir /home/pvv-merged/*/web-docs
UserDir disabled root
UserDir enabled oysteikt
AddHandler cgi-script .cgi
<Directory "/home/pvv-merged/*/web-docs">
Options MultiViews Indexes SymLinksIfOwnerMatch ExecCGI IncludesNoExec
AllowOverride All
Require all granted
</Directory>
'';
};
};
networking.firewall.allowedTCPPorts = [
80
443
];
systemd.services.httpd = {
after = [ "pvv-homedirs.target" ];
requires = [ "pvv-homedirs.target" ];
@@ -20,8 +53,10 @@
serviceConfig = {
ProtectHome = "tmpfs";
BindPaths = let
letters = [ "a" "b" "c" "d" "h" "i" "j" "k" "l" "m" "z" ];
in map (l: "/run/pvv-home-mounts/${l}:/home/pvv/${l}") letters;
homeLetters = [ "a" "b" "c" "d" "h" "i" "j" "k" "l" "m" "z" ];
in (map (l: "/run/pvv-home-mounts/${l}:/home/pvv/${l}") homeLetters) ++ [
"/run/pvv-home-mounts-merged:/home/pvv-merged/"
];
};
};