mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2026-07-04 09:51:47 +02:00
Compare commits
3 Commits
d84cc73819
...
d23adbd4c2
| Author | SHA1 | Date | |
|---|---|---|---|
| d23adbd4c2 | |||
| 48c0a4e504 | |||
| 374d9b1bc7 |
@@ -369,7 +369,12 @@
|
|||||||
//
|
//
|
||||||
# Machines
|
# Machines
|
||||||
lib.genAttrs allMachines
|
lib.genAttrs allMachines
|
||||||
(machine: self.nixosConfigurations.${machine}.config.system.build.toplevel)
|
(machine: self.nixosConfigurations.${machine}.config.system.build.toplevel.overrideAttrs (prev: {
|
||||||
|
passthru =
|
||||||
|
(prev.passthru or { })
|
||||||
|
// self.nixosConfigurations.${machine}.config.system.build
|
||||||
|
// { inherit (self.nixosConfigurations.${machine}) pkgs config; };
|
||||||
|
}))
|
||||||
//
|
//
|
||||||
# Nix-topology
|
# Nix-topology
|
||||||
(let
|
(let
|
||||||
|
|||||||
@@ -63,6 +63,10 @@ in
|
|||||||
];
|
];
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
<Directory "${pkgs.emptyDirectory}">
|
||||||
|
Require all denied
|
||||||
|
</Directory>
|
||||||
|
|
||||||
CustomLog "${cfg.logDir}/access.log" combined
|
CustomLog "${cfg.logDir}/access.log" combined
|
||||||
CustomLog "/run/httpd-log-processor-access.fifo" combined
|
CustomLog "/run/httpd-log-processor-access.fifo" combined
|
||||||
ErrorLog "/run/httpd-log-processor-error.fifo"
|
ErrorLog "/run/httpd-log-processor-error.fifo"
|
||||||
@@ -107,25 +111,25 @@ in
|
|||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
${lib.concatMapStringsSep "\n" (d: ''
|
${lib.concatMapStringsSep "\n" (d: ''
|
||||||
<Directory "${d}">
|
<DirectoryMatch "/${d}(/|$)">
|
||||||
Require all denied
|
Require all denied
|
||||||
</Directory>
|
</DirectoryMatch>
|
||||||
'') [
|
'') [
|
||||||
".git"
|
"\\.git"
|
||||||
".hg"
|
"\\.hg"
|
||||||
".svn"
|
"\\.svn"
|
||||||
".ssh"
|
"\\.ssh"
|
||||||
".bzr"
|
"\\.bzr"
|
||||||
".venv"
|
"\\.venv"
|
||||||
"CVS"
|
"CVS"
|
||||||
"RCS"
|
"RCS"
|
||||||
|
|
||||||
"*.bak"
|
".*\\.bak"
|
||||||
"*.bak*"
|
".*\\.bak.*"
|
||||||
"*.bkp"
|
".*\\.bkp"
|
||||||
"*.bkp*"
|
".*\\.bkp.*"
|
||||||
"*.backup"
|
".*\\.backup"
|
||||||
"*.backup*"
|
".*\\.backup.*"
|
||||||
]}
|
]}
|
||||||
|
|
||||||
${lib.concatMapStringsSep "\n" (d: ''
|
${lib.concatMapStringsSep "\n" (d: ''
|
||||||
|
|||||||
Reference in New Issue
Block a user