Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
654eeb83d8
|
|||
|
5bf0de1d0d
|
|||
|
a550bbf1e0
|
|||
|
6d9bd8256f
|
|||
|
5c859d9809
|
|||
|
68481b999b
|
|||
|
dfbed75cd9
|
|||
|
6237a0a0e7
|
|||
|
bd2263a0a9
|
|||
|
2faff6340c
|
|||
|
532e8b0eee
|
|||
|
eef3f8fe8b
|
|||
|
e17025aca6
|
|||
|
e062a849f3
|
|||
|
b0f81c9379
|
|||
|
2c819776f8
|
|||
|
c2d6989350
|
|||
|
2b4817b75a
|
|||
|
0e2a8ed3ed
|
|||
|
3372712e26
|
|||
|
7e586e082e
|
|||
|
47a744f68f
|
|||
|
da505d4fe2
|
@@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
|
inputs,
|
||||||
fp,
|
fp,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
@@ -35,6 +36,7 @@
|
|||||||
./services/prometheus-node-exporter.nix
|
./services/prometheus-node-exporter.nix
|
||||||
./services/prometheus-systemd-exporter.nix
|
./services/prometheus-systemd-exporter.nix
|
||||||
./services/roowho2.nix
|
./services/roowho2.nix
|
||||||
|
./services/scrutiny-collector.nix
|
||||||
./services/smartd.nix
|
./services/smartd.nix
|
||||||
./services/thermald.nix
|
./services/thermald.nix
|
||||||
./services/uptimed.nix
|
./services/uptimed.nix
|
||||||
@@ -42,6 +44,8 @@
|
|||||||
./services/userdbd.nix
|
./services/userdbd.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
system.nixos.tags = lib.optionals (inputs.self.sourceInfo ? dirtyRev) [ "dirty" ];
|
||||||
|
|
||||||
boot.tmp.cleanOnBoot = lib.mkDefault true;
|
boot.tmp.cleanOnBoot = lib.mkDefault true;
|
||||||
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
|
boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,12 @@ in
|
|||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
|
|
||||||
environment.etc."polkit-1/rules.d/9-nixos-overrides.rules".text = lib.mkIf cfg.enable ''
|
environment.etc."polkit-1/rules.d/9-nixos-overrides.rules".text = lib.mkIf cfg.enable ''
|
||||||
polkit.addAdminRule(function(action, subject) {
|
polkit.addRule(function(action, subject) {
|
||||||
if(subject.isInGroup("wheel")) {
|
if (
|
||||||
return ["unix-user:"+subject.user];
|
action.id.startsWith("org.freedesktop.systemd1.") &&
|
||||||
|
subject.isInGroup("wheel")
|
||||||
|
) {
|
||||||
|
return polkit.Result.AUTH_SELF_KEEP;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
{ config, ... }:
|
||||||
|
{
|
||||||
|
services.scrutiny.collector = {
|
||||||
|
enable = !config.services.qemuGuest.enable;
|
||||||
|
settings = {
|
||||||
|
version = 1;
|
||||||
|
host.id = config.networking.hostName;
|
||||||
|
api.endpoint = "https://scrutiny.pvv.ntnu.no/";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
Generated
+8
-8
@@ -316,11 +316,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764869785,
|
"lastModified": 1779774845,
|
||||||
"narHash": "sha256-FGTIpC7gB4lbeL0bfYzn1Ge0PaCpd7VqWBLhJBx0i4A=",
|
"narHash": "sha256-QJU1J4eupwjRrtvWGzRut0GY3woql92RS9O/acWkJkk=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "8ce7fb0b1918bdb3d1489a40d73895693955e8b2",
|
"rev": "13667cd216db260ab549e6f1b6281aa230d2f9e0",
|
||||||
"revCount": 23,
|
"revCount": 29,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Projects/calendar-bot.git"
|
"url": "https://git.pvv.ntnu.no/Projects/calendar-bot.git"
|
||||||
},
|
},
|
||||||
@@ -337,11 +337,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778960428,
|
"lastModified": 1779903528,
|
||||||
"narHash": "sha256-YAs3LbFGlBLJW3xHeoQfTq2GBBXTvuSKl2WXDtloczU=",
|
"narHash": "sha256-4rajaHeBeQ4PjbNSpslE9G3A5mZM1J/64ls+VoufWZo=",
|
||||||
"ref": "main",
|
"ref": "main",
|
||||||
"rev": "927748790b1f7159adfe32a3ad9ec01d22e9c5a2",
|
"rev": "bba7413a1c611d4918fbef4d3aa55e465ca3f3fb",
|
||||||
"revCount": 583,
|
"revCount": 585,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.pvv.ntnu.no/Projects/nettsiden.git"
|
"url": "https://git.pvv.ntnu.no/Projects/nettsiden.git"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -107,6 +107,7 @@ in {
|
|||||||
CodeEditor
|
CodeEditor
|
||||||
CodeMirror
|
CodeMirror
|
||||||
DeleteBatch
|
DeleteBatch
|
||||||
|
PdfHandler
|
||||||
PluggableAuth
|
PluggableAuth
|
||||||
Popups
|
Popups
|
||||||
Scribunto
|
Scribunto
|
||||||
@@ -181,12 +182,17 @@ in {
|
|||||||
];
|
];
|
||||||
|
|
||||||
# Misc program paths
|
# Misc program paths
|
||||||
$wgFFmpegLocation = '${pkgs.ffmpeg}/bin/ffmpeg';
|
$wgFFmpegLocation = '${lib.getExe pkgs.ffmpeg}';
|
||||||
$wgExiftool = '${pkgs.exiftool}/bin/exiftool';
|
$wgExiftool = '${lib.getExe pkgs.exiftool}';
|
||||||
$wgExiv2Command = '${pkgs.exiv2}/bin/exiv2';
|
$wgExiv2Command = '${lib.getExe pkgs.exiv2}';
|
||||||
# See https://gist.github.com/sergejmueller/088dce028b6dd120a16e
|
# See https://gist.github.com/sergejmueller/088dce028b6dd120a16e
|
||||||
$wgJpegTran = '${pkgs.mozjpeg}/bin/jpegtran';
|
$wgJpegTran = '${lib.getExe' pkgs.mozjpeg "jpegtran"}';
|
||||||
$wgGitBin = '${pkgs.git}/bin/git';
|
$wgGitBin = '${lib.getExe pkgs.git}';
|
||||||
|
$wgDiff3 = '${lib.getExe' pkgs.diffutils "diff3"}';
|
||||||
|
$wgDiff = '${lib.getExe' pkgs.diffutils "diff"}';
|
||||||
|
|
||||||
|
$wgUseImageMagick = true;
|
||||||
|
$wgImageMagickConvertCommand = '${lib.getExe pkgs.imagemagick}';
|
||||||
|
|
||||||
# Debugging
|
# Debugging
|
||||||
$wgShowExceptionDetails = false;
|
$wgShowExceptionDetails = false;
|
||||||
@@ -211,6 +217,13 @@ in {
|
|||||||
# EXT:WikiEditor
|
# EXT:WikiEditor
|
||||||
$wgWikiEditorRealtimePreview = true;
|
$wgWikiEditorRealtimePreview = true;
|
||||||
|
|
||||||
|
# EXT:PdfHandler
|
||||||
|
$wgPdfProcessor = '${lib.getExe pkgs.ghostscript_headless}';
|
||||||
|
$wgPdfPostProcessor = $wgImageMagickConvertCommand;
|
||||||
|
$wgPdfInfo = '${lib.getExe' pkgs.poppler-utils "pdfinfo"}';
|
||||||
|
$wgPdftoText = '${lib.getExe' pkgs.poppler-utils "pdftotext"}';
|
||||||
|
|
||||||
|
# Override key from hardcoded config in nixpkgs
|
||||||
$wgSecretKey = file_get_contents("${config.sops.secrets."mediawiki/secret-key".path}");
|
$wgSecretKey = file_get_contents("${config.sops.secrets."mediawiki/secret-key".path}");
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -56,10 +56,10 @@ in
|
|||||||
locations."/roundcube" = {
|
locations."/roundcube" = {
|
||||||
tryFiles = "$uri $uri/ =404";
|
tryFiles = "$uri $uri/ =404";
|
||||||
index = "index.php";
|
index = "index.php";
|
||||||
root = pkgs.runCommandLocal "roundcube-dir" { } ''
|
root = pkgs.linkFarm "roundcube-dir" {
|
||||||
mkdir -p $out
|
roundcube = "${cfg.package}";
|
||||||
ln -s ${cfg.package} $out/roundcube
|
};
|
||||||
'';
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
location ~ ^/roundcube/(${builtins.concatStringsSep "|" [
|
location ~ ^/roundcube/(${builtins.concatStringsSep "|" [
|
||||||
# https://wiki.archlinux.org/title/Roundcube
|
# https://wiki.archlinux.org/title/Roundcube
|
||||||
|
|||||||
@@ -119,6 +119,7 @@ in {
|
|||||||
services.nginx.virtualHosts."pvv.ntnu.no" = {
|
services.nginx.virtualHosts."pvv.ntnu.no" = {
|
||||||
globalRedirect = cfg.domainName;
|
globalRedirect = cfg.domainName;
|
||||||
redirectCode = 307;
|
redirectCode = 307;
|
||||||
|
kTLS = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "www.pvv.ntnu.no";
|
useACMEHost = "www.pvv.ntnu.no";
|
||||||
};
|
};
|
||||||
@@ -126,6 +127,7 @@ in {
|
|||||||
services.nginx.virtualHosts."www.pvv.org" = {
|
services.nginx.virtualHosts."www.pvv.org" = {
|
||||||
globalRedirect = cfg.domainName;
|
globalRedirect = cfg.domainName;
|
||||||
redirectCode = 307;
|
redirectCode = 307;
|
||||||
|
kTLS = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "www.pvv.ntnu.no";
|
useACMEHost = "www.pvv.ntnu.no";
|
||||||
};
|
};
|
||||||
@@ -133,11 +135,13 @@ in {
|
|||||||
services.nginx.virtualHosts."pvv.org" = {
|
services.nginx.virtualHosts."pvv.org" = {
|
||||||
globalRedirect = cfg.domainName;
|
globalRedirect = cfg.domainName;
|
||||||
redirectCode = 307;
|
redirectCode = 307;
|
||||||
|
kTLS = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
useACMEHost = "www.pvv.ntnu.no";
|
useACMEHost = "www.pvv.ntnu.no";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts.${cfg.domainName} = {
|
services.nginx.virtualHosts.${cfg.domainName} = {
|
||||||
|
kTLS = true;
|
||||||
locations = {
|
locations = {
|
||||||
# Proxy home directories
|
# Proxy home directories
|
||||||
"^~ /~" = {
|
"^~ /~" = {
|
||||||
|
|||||||
@@ -37,9 +37,22 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.pvv-nettsiden-gallery-update = {
|
systemd.services.pvv-nettsiden-gallery-update = {
|
||||||
path = with pkgs; [ imagemagick gnutar gzip ];
|
serviceConfig = {
|
||||||
|
WorkingDirectory = galleryDir;
|
||||||
|
User = config.services.pvv-nettsiden.user;
|
||||||
|
Group = config.services.pvv-nettsiden.group;
|
||||||
|
|
||||||
script = ''
|
ExecStart = lib.getExe (pkgs.writeShellApplication {
|
||||||
|
name = "pvv-nettsiden-gallery-update-exec-start.sh";
|
||||||
|
runtimeInputs = with pkgs; [
|
||||||
|
coreutils
|
||||||
|
findutils
|
||||||
|
gnused
|
||||||
|
gnutar
|
||||||
|
gzip
|
||||||
|
imagemagick
|
||||||
|
];
|
||||||
|
text = ''
|
||||||
tar ${lib.cli.toCommandLineShellGNU { } {
|
tar ${lib.cli.toCommandLineShellGNU { } {
|
||||||
extract = true;
|
extract = true;
|
||||||
file = "${transferDir}/gallery.tar.gz";
|
file = "${transferDir}/gallery.tar.gz";
|
||||||
@@ -47,7 +60,7 @@ in {
|
|||||||
}}
|
}}
|
||||||
|
|
||||||
# Delete files and directories that exists in the gallery that don't exist in the tarball
|
# Delete files and directories that exists in the gallery that don't exist in the tarball
|
||||||
filesToRemove=$(uniq -u <(sort <(find . -not -path './.thumbnails*') <(tar -tf '${transferDir}/gallery.tar.gz' | sed 's|/$||')))
|
filesToRemove="$(uniq -u <(sort <(find . -not -path './.thumbnails*') <(tar -tf '${transferDir}/gallery.tar.gz' | sed 's|/$||')))"
|
||||||
while IFS= read -r fname; do
|
while IFS= read -r fname; do
|
||||||
rm -f "$fname" ||:
|
rm -f "$fname" ||:
|
||||||
rm -f ".thumbnails/$fname.png" ||:
|
rm -f ".thumbnails/$fname.png" ||:
|
||||||
@@ -56,7 +69,7 @@ in {
|
|||||||
find . -type d -empty -delete
|
find . -type d -empty -delete
|
||||||
|
|
||||||
mkdir -p .thumbnails
|
mkdir -p .thumbnails
|
||||||
images=$(find . -type f -not -path './.thumbnails*')
|
images="$(find . -type f -not -path './.thumbnails*')"
|
||||||
|
|
||||||
while IFS= read -r fname; do
|
while IFS= read -r fname; do
|
||||||
# Skip this file if an up-to-date thumbnail already exists
|
# Skip this file if an up-to-date thumbnail already exists
|
||||||
@@ -72,11 +85,7 @@ in {
|
|||||||
touch -m -d "$(date -R -r "$fname")" ".thumbnails/$fname.png"
|
touch -m -d "$(date -R -r "$fname")" ".thumbnails/$fname.png"
|
||||||
done <<< "$images"
|
done <<< "$images"
|
||||||
'';
|
'';
|
||||||
|
});
|
||||||
serviceConfig = {
|
|
||||||
WorkingDirectory = galleryDir;
|
|
||||||
User = config.services.pvv-nettsiden.user;
|
|
||||||
Group = config.services.pvv-nettsiden.group;
|
|
||||||
|
|
||||||
AmbientCapabilities = [ "" ];
|
AmbientCapabilities = [ "" ];
|
||||||
CapabilityBoundingSet = [ "" ];
|
CapabilityBoundingSet = [ "" ];
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts."mirrors.pvv.ntnu.no" = {
|
services.nginx.virtualHosts."mirrors.pvv.ntnu.no" = {
|
||||||
|
kTLS = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
|
|
||||||
|
|||||||
@@ -146,6 +146,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts."hookshot.pvv.ntnu.no" = {
|
services.nginx.virtualHosts."hookshot.pvv.ntnu.no" = {
|
||||||
|
kTLS = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
addSSL = true;
|
addSSL = true;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts."ooye.pvv.ntnu.no" = {
|
services.nginx.virtualHosts."ooye.pvv.ntnu.no" = {
|
||||||
|
kTLS = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
locations."/".proxyPass = "http://localhost:${cfg.socket}";
|
locations."/".proxyPass = "http://localhost:${cfg.socket}";
|
||||||
|
|||||||
@@ -23,27 +23,28 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.minecraft-heatmap-ingest-logs = lib.mkIf cfg.enable {
|
systemd.services.minecraft-heatmap-ingest-logs = lib.mkIf cfg.enable {
|
||||||
serviceConfig.LoadCredential = [
|
serviceConfig = {
|
||||||
|
LoadCredential = [
|
||||||
"sshkey:${config.sops.secrets."minecraft-heatmap/ssh-key/private".path}"
|
"sshkey:${config.sops.secrets."minecraft-heatmap/ssh-key/private".path}"
|
||||||
];
|
];
|
||||||
|
ExecStartPre = let
|
||||||
preStart = let
|
|
||||||
knownHostsFile = pkgs.writeText "minecraft-heatmap-known-hosts" ''
|
knownHostsFile = pkgs.writeText "minecraft-heatmap-known-hosts" ''
|
||||||
innovation.pvv.ntnu.no ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9O/y5uqcLKCodg2Q+XfZPH/AoUIyBlDhigImU+4+Kn
|
innovation.pvv.ntnu.no ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9O/y5uqcLKCodg2Q+XfZPH/AoUIyBlDhigImU+4+Kn
|
||||||
innovation.pvv.ntnu.no ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQClR9GvWeVPZHudlnFXhGHUX5sGX9nscsOsotnlQ4uVuGsgvRifsVsuDULlAFXwoV1tYp4vnyXlsVtMddpLI5ANOIDcZ4fgDxpfSQmtHKssNpDcfMhFJbfRVyacipjA4osxTxvLox/yjtVt+URjTHUA1MWzEwc26KfiOvWO5tCBTan7doN/4KOyT05GwBxwzUAwUmoGTacIITck2Y9qp4+xFYqehbXqPdBb15hFyd38OCQhtU1hWV2Yi18+hJ4nyjc/g5pr6mW09ULlFghe/BaTUXrTisYC6bMcJZsTDwsvld9581KPvoNZOTQhZPTEQCZZ1h54fe0ZHuveVB3TIHovZyjoUuaf4uiFOjJVaKRB+Ig+Il6r7tMUn9CyHtus/Nd86E0TFBzoKxM0OFu88oaUlDtZVrUJL5En1lGoimajebb1JPxllFN5hqIT+gVyMY6nRzkcfS7ieny/U4rzXY2rfz98selftgh3LsBywwADv65i+mPw1A/1QdND1R6fV4U=
|
innovation.pvv.ntnu.no ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQClR9GvWeVPZHudlnFXhGHUX5sGX9nscsOsotnlQ4uVuGsgvRifsVsuDULlAFXwoV1tYp4vnyXlsVtMddpLI5ANOIDcZ4fgDxpfSQmtHKssNpDcfMhFJbfRVyacipjA4osxTxvLox/yjtVt+URjTHUA1MWzEwc26KfiOvWO5tCBTan7doN/4KOyT05GwBxwzUAwUmoGTacIITck2Y9qp4+xFYqehbXqPdBb15hFyd38OCQhtU1hWV2Yi18+hJ4nyjc/g5pr6mW09ULlFghe/BaTUXrTisYC6bMcJZsTDwsvld9581KPvoNZOTQhZPTEQCZZ1h54fe0ZHuveVB3TIHovZyjoUuaf4uiFOjJVaKRB+Ig+Il6r7tMUn9CyHtus/Nd86E0TFBzoKxM0OFu88oaUlDtZVrUJL5En1lGoimajebb1JPxllFN5hqIT+gVyMY6nRzkcfS7ieny/U4rzXY2rfz98selftgh3LsBywwADv65i+mPw1A/1QdND1R6fV4U=
|
||||||
innovation.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNjl3HfsDqmALWCL9uhz9k93RAD2565ndBqUh4N/rvI7MCwEJ6iRCdDev0YzB1Fpg24oriyYoxZRP24ifC2sQf8=
|
innovation.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNjl3HfsDqmALWCL9uhz9k93RAD2565ndBqUh4N/rvI7MCwEJ6iRCdDev0YzB1Fpg24oriyYoxZRP24ifC2sQf8=
|
||||||
'';
|
'';
|
||||||
in ''
|
rsyncArgs = lib.cli.toCommandLineShellGNU { } {
|
||||||
mkdir -p '${cfg.minecraftLogsDir}'
|
archive = true;
|
||||||
"${lib.getExe pkgs.rsync}" \
|
verbose = true;
|
||||||
--archive \
|
progress = true;
|
||||||
--verbose \
|
no-owner = true;
|
||||||
--progress \
|
no-group = true;
|
||||||
--no-owner \
|
};
|
||||||
--no-group \
|
sshCommand = ''${pkgs.openssh}/bin/ssh -o UserKnownHostsFile='${knownHostsFile}' -i \"$CREDENTIALS_DIRECTORY\"/sshkey'';
|
||||||
--rsh="${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=\"${knownHostsFile}\" -i \"$CREDENTIALS_DIRECTORY\"/sshkey" \
|
in [
|
||||||
root@innovation.pvv.ntnu.no:/ \
|
"${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.minecraftLogsDir}'"
|
||||||
'${cfg.minecraftLogsDir}'/
|
"${lib.getExe pkgs.rsync} ${rsyncArgs} --rsh=\"${sshCommand}\" root@innovation.pvv.ntnu.no:/ '${cfg.minecraftLogsDir}'/"
|
||||||
'';
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
./grafana.nix
|
./grafana.nix
|
||||||
./loki.nix
|
./loki.nix
|
||||||
./prometheus
|
./prometheus
|
||||||
|
./scrutiny.nix
|
||||||
./uptime-kuma.nix
|
./uptime-kuma.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{ config, values, ... }:
|
||||||
|
let
|
||||||
|
cfg = config.services.scrutiny;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.scrutiny = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
web.listen = {
|
||||||
|
host = "127.0.0.1";
|
||||||
|
port = 18293;
|
||||||
|
basepath = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
# notify.urls = [
|
||||||
|
# "matrix://username:password@host:port/[?rooms=!roomID1[,roomAlias2]]"
|
||||||
|
# ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."scrutiny.pvv.ntnu.no" = {
|
||||||
|
kTLS = true;
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://${cfg.settings.web.listen.host}:${toString cfg.settings.web.listen.port}";
|
||||||
|
};
|
||||||
|
|
||||||
|
# TODO: allow website access to the outside world, but restrict input api
|
||||||
|
extraConfig = ''
|
||||||
|
allow ${values.hosts.ildkule.ipv4}/32;
|
||||||
|
allow ${values.hosts.ildkule.ipv6}/128;
|
||||||
|
allow 127.0.0.1/32;
|
||||||
|
allow ::1/128;
|
||||||
|
allow ${values.ipv4-space};
|
||||||
|
allow ${values.ipv6-space};
|
||||||
|
deny all;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, values, ... }:
|
||||||
let
|
let
|
||||||
cfg = config.services.uptime-kuma;
|
cfg = config.services.uptime-kuma;
|
||||||
domain = "status.pvv.ntnu.no";
|
domain = "status.pvv.ntnu.no";
|
||||||
@@ -24,4 +24,21 @@ in {
|
|||||||
fsType = "bind";
|
fsType = "bind";
|
||||||
options = [ "bind" ];
|
options = [ "bind" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.rsync-pull-targets = {
|
||||||
|
enable = true;
|
||||||
|
locations.${stateDir} = {
|
||||||
|
user = "root";
|
||||||
|
rrsyncArgs.ro = true;
|
||||||
|
authorizedKeysAttrs = [
|
||||||
|
"restrict"
|
||||||
|
"from=\"principal.pvv.ntnu.no,${values.hosts.principal.ipv6},${values.hosts.principal.ipv4}\""
|
||||||
|
"no-agent-forwarding"
|
||||||
|
"no-port-forwarding"
|
||||||
|
"no-pty"
|
||||||
|
"no-X11-forwarding"
|
||||||
|
];
|
||||||
|
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXzcDm6cVr4NmWzUSroy33FlielKqaG83wY0RCMC0p/ uptime_kuma rsync backup";
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,9 +72,9 @@ in
|
|||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
User = cfg.user;
|
User = cfg.user;
|
||||||
Group = cfg.group;
|
Group = cfg.group;
|
||||||
};
|
PrivateNetwork = true;
|
||||||
|
|
||||||
script = let
|
ExecStart = let
|
||||||
logo-svg = fp /assets/logo_blue_regular.svg;
|
logo-svg = fp /assets/logo_blue_regular.svg;
|
||||||
logo-png = fp /assets/logo_blue_regular.png;
|
logo-png = fp /assets/logo_blue_regular.png;
|
||||||
|
|
||||||
@@ -102,20 +102,22 @@ in
|
|||||||
install -Dm444 '${cfg.package.src}/templates/repo/icon.tmpl' "$out/repo/icon.tmpl"
|
install -Dm444 '${cfg.package.src}/templates/repo/icon.tmpl' "$out/repo/icon.tmpl"
|
||||||
sed -i -e 's/24/60/g' "$out/repo/icon.tmpl"
|
sed -i -e 's/24/60/g' "$out/repo/icon.tmpl"
|
||||||
'';
|
'';
|
||||||
in ''
|
install = lib.getExe' pkgs.coreutils "install";
|
||||||
install -Dm444 '${logo-svg}' '${cfg.customDir}/public/assets/img/logo.svg'
|
in [
|
||||||
install -Dm444 '${logo-png}' '${cfg.customDir}/public/assets/img/logo.png'
|
"${install} -Dm444 '${logo-svg}' '${cfg.customDir}/public/assets/img/logo.svg'"
|
||||||
install -Dm444 '${./loading.apng}' '${cfg.customDir}/public/assets/img/loading.png'
|
"${install} -Dm444 '${logo-png}' '${cfg.customDir}/public/assets/img/logo.png'"
|
||||||
install -Dm444 '${extraLinks}' '${cfg.customDir}/templates/custom/extra_links.tmpl'
|
"${install} -Dm444 '${./loading.apng}' '${cfg.customDir}/public/assets/img/loading.png'"
|
||||||
install -Dm444 '${extraLinksFooter}' '${cfg.customDir}/templates/custom/extra_links_footer.tmpl'
|
"${install} -Dm444 '${extraLinks}' '${cfg.customDir}/templates/custom/extra_links.tmpl'"
|
||||||
install -Dm444 '${project-labels}' '${cfg.customDir}/options/label/project-labels.yaml'
|
"${install} -Dm444 '${extraLinksFooter}' '${cfg.customDir}/templates/custom/extra_links_footer.tmpl'"
|
||||||
|
"${install} -Dm444 '${project-labels}' '${cfg.customDir}/options/label/project-labels.yaml'"
|
||||||
|
|
||||||
install -Dm644 '${./emotes/bruh.png}' '${cfg.customDir}/public/assets/img/emoji/bruh.png'
|
"${install} -Dm644 '${./emotes/bruh.png}' '${cfg.customDir}/public/assets/img/emoji/bruh.png'"
|
||||||
install -Dm644 '${./emotes/huh.gif}' '${cfg.customDir}/public/assets/img/emoji/huh.png'
|
"${install} -Dm644 '${./emotes/huh.gif}' '${cfg.customDir}/public/assets/img/emoji/huh.png'"
|
||||||
install -Dm644 '${./emotes/grr.png}' '${cfg.customDir}/public/assets/img/emoji/grr.png'
|
"${install} -Dm644 '${./emotes/grr.png}' '${cfg.customDir}/public/assets/img/emoji/grr.png'"
|
||||||
install -Dm644 '${./emotes/okiedokie.jpg}' '${cfg.customDir}/public/assets/img/emoji/okiedokie.png'
|
"${install} -Dm644 '${./emotes/okiedokie.jpg}' '${cfg.customDir}/public/assets/img/emoji/okiedokie.png'"
|
||||||
|
|
||||||
'${lib.getExe pkgs.rsync}' -a '${customTemplates}/' '${cfg.customDir}/templates/'
|
"${lib.getExe pkgs.rsync} -a '${customTemplates}/' '${cfg.customDir}/templates/'"
|
||||||
'';
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,11 +38,11 @@ in
|
|||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
User = cfg.user;
|
User = cfg.user;
|
||||||
PrivateNetwork = true;
|
PrivateNetwork = true;
|
||||||
|
ExecStart = [
|
||||||
|
"${lib.getExe pkgs.gnupg} --import '${config.sops.secrets."gitea/gpg-signing-key-public".path}'"
|
||||||
|
"${lib.getExe pkgs.gnupg} --import '${config.sops.secrets."gitea/gpg-signing-key-private".path}'"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
script = ''
|
|
||||||
${lib.getExe pkgs.gnupg} --import ${config.sops.secrets."gitea/gpg-signing-key-public".path}
|
|
||||||
${lib.getExe pkgs.gnupg} --import ${config.sops.secrets."gitea/gpg-signing-key-private".path}
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.gitea.settings."repository.signing" = {
|
services.gitea.settings."repository.signing" = {
|
||||||
@@ -50,6 +50,8 @@ in
|
|||||||
SIGNING_NAME = "PVV Git";
|
SIGNING_NAME = "PVV Git";
|
||||||
SIGNING_EMAIL = "gitea@git.pvv.ntnu.no";
|
SIGNING_EMAIL = "gitea@git.pvv.ntnu.no";
|
||||||
INITIAL_COMMIT = "always";
|
INITIAL_COMMIT = "always";
|
||||||
|
MERGES = lib.concatStringsSep "," [ "always" ];
|
||||||
|
CRUD_ACTIONS = lib.concatStringsSep "," [ "always" ];
|
||||||
WIKI = "always";
|
WIKI = "always";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ in
|
|||||||
|
|
||||||
systemd.services.gitea-import-users = lib.mkIf cfg.enable {
|
systemd.services.gitea-import-users = lib.mkIf cfg.enable {
|
||||||
enable = true;
|
enable = true;
|
||||||
preStart=''${pkgs.rsync}/bin/rsync -e "${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=$CREDENTIALS_DIRECTORY/ssh-known-hosts -i $CREDENTIALS_DIRECTORY/sshkey" -a pvv@smtp.pvv.ntnu.no:/etc/passwd /run/gitea-import-users/passwd'';
|
|
||||||
environment.PASSWD_FILE_PATH = "/run/gitea-import-users/passwd";
|
environment.PASSWD_FILE_PATH = "/run/gitea-import-users/passwd";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
ExecStartPre = ''${pkgs.rsync}/bin/rsync -e "${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=$CREDENTIALS_DIRECTORY/ssh-known-hosts -i $CREDENTIALS_DIRECTORY/sshkey" -a pvv@smtp.pvv.ntnu.no:/etc/passwd /run/gitea-import-users/passwd'';
|
||||||
ExecStart = pkgs.writers.writePython3 "gitea-import-users" {
|
ExecStart = pkgs.writers.writePython3 "gitea-import-users" {
|
||||||
flakeIgnore = [
|
flakeIgnore = [
|
||||||
"E501" # Line over 80 chars lol
|
"E501" # Line over 80 chars lol
|
||||||
|
|||||||
@@ -18,9 +18,6 @@
|
|||||||
anyInterface = true;
|
anyInterface = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# There are no smart devices
|
|
||||||
services.smartd.enable = false;
|
|
||||||
|
|
||||||
# Don't change (even during upgrades) unless you know what you are doing.
|
# Don't change (even during upgrades) unless you know what you are doing.
|
||||||
# See https://search.nixos.org/options?show=system.stateVersion
|
# See https://search.nixos.org/options?show=system.stateVersion
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.restart-greg-ng = {
|
systemd.user.services.restart-greg-ng = {
|
||||||
script = "systemctl --user restart greg-ng.service";
|
serviceConfig.ExecStart = "${lib.getExe' pkgs.systemd "systemctl"} --user restart greg-ng.service";
|
||||||
startAt = "*-*-* 06:30:00";
|
startAt = "*-*-* 06:30:00";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -171,6 +171,9 @@ in
|
|||||||
requires = [ "matrix-ooye-pre-start.service" ];
|
requires = [ "matrix-ooye-pre-start.service" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
|
startLimitIntervalSec = 5;
|
||||||
|
startLimitBurst = 5;
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = lib.getExe config.services.matrix-ooye.package;
|
ExecStart = lib.getExe config.services.matrix-ooye.package;
|
||||||
WorkingDirectory = "/var/lib/matrix-ooye";
|
WorkingDirectory = "/var/lib/matrix-ooye";
|
||||||
@@ -182,8 +185,6 @@ in
|
|||||||
#PrivateDevices = true;
|
#PrivateDevices = true;
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
RestartSec = "5s";
|
RestartSec = "5s";
|
||||||
StartLimitIntervalSec = "5s";
|
|
||||||
StartLimitBurst = "5";
|
|
||||||
DynamicUser = true;
|
DynamicUser = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -38,18 +38,23 @@ lib.mergeAttrsList [
|
|||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "CodeMirror";
|
name = "CodeMirror";
|
||||||
commit = "f06dfd40a08562a841ddf11b4ae3444ef06c98c7";
|
commit = "7ab826eff8c4097589a3199c40c507717af23234";
|
||||||
hash = "sha256-5zXkBjOwFdoQezkPRJ2AcBZLZEEpGG6FawO2K3KzllI=";
|
hash = "sha256-kMIyGW9J4OSGSetByel7hEGgxPRJmQ53it6ndpYA/Hs=";
|
||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "DeleteBatch";
|
name = "DeleteBatch";
|
||||||
commit = "9bc75a753efefedfc88c598fb01f18a7e4b61f00";
|
commit = "b5920283cfe78b86a63a1037a81651c58ce764da";
|
||||||
hash = "sha256-1xA758fsvoioN9xuq0hRqZKtPXMQViVLtuRINDtowdk=";
|
hash = "sha256-LwuVX2s5Q4uc6o7hlTjFzRTwvSCwTk74gBpX0HoLDMA=";
|
||||||
|
})
|
||||||
|
(mw-ext {
|
||||||
|
name = "PdfHandler";
|
||||||
|
commit = "dc1a3ca04ac6ec7d7de7ce5355803510508a2575";
|
||||||
|
hash = "sha256-ltAQZtfTMMLRPATA7rclSNW8Yz4ctGc30CxlL3SRBWU=";
|
||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "PluggableAuth";
|
name = "PluggableAuth";
|
||||||
commit = "64133683b73d8eeea8069fe7ed9cb7237fd5c212";
|
commit = "4b57a23e32d72bd3f74184ff2734aa483a5b0c63";
|
||||||
hash = "sha256-wqpfgVLenZp6XC510nrsrbvK1IMEPcWVYq5YuAOt5+c=";
|
hash = "sha256-ZGw0Wgz0Sg04YDcOzkOGywmfQ6s6Ex17QbjmUDO1D8c=";
|
||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "Popups";
|
name = "Popups";
|
||||||
@@ -58,38 +63,38 @@ lib.mergeAttrsList [
|
|||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "Scribunto";
|
name = "Scribunto";
|
||||||
commit = "cbab0c740e03c8e6184fd647d95e24e0826d20cb";
|
commit = "35c85c96167922adc98e62dd6573789d906dd7d7";
|
||||||
hash = "sha256-vXS3+wrUBVtPsETa19pMvud9sALGt4Ao9mM5rQRbBQc=";
|
hash = "sha256-FEWADJW53cDOlLseM62VL66PENv/jNnwuCMo2Pb02ek=";
|
||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "SimpleSAMLphp";
|
name = "SimpleSAMLphp";
|
||||||
kebab-name = "simple-saml-php";
|
kebab-name = "simple-saml-php";
|
||||||
commit = "fc5ad4501434fe85198f0b1f0087d798efa91f9f";
|
commit = "70778bb02f972abbb51e6ba3e0f6545b00dcab00";
|
||||||
hash = "sha256-se0krTglo1fShJXj38bPLhw65tZC5P54Ywt7oeZrLes=";
|
hash = "sha256-wfmFJKy+ih84qFM9DVcCQFAZBx45s7Hl0lRnseMPhGY=";
|
||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "TemplateData";
|
name = "TemplateData";
|
||||||
commit = "d37b02f6ed194138ac7193a0782bbf6efb9164f8";
|
commit = "cca3b3430067f2161bf65de822f70dd38fe07bba";
|
||||||
hash = "sha256-NpzVBzX7qfXkIE+jh33ndooS9GE8ZF3/Jynm22in7IQ=";
|
hash = "sha256-OxLwiF8FlWizkpDF9GXYfjehKtrltX8ihiCE+fNJpgw=";
|
||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "TemplateStyles";
|
name = "TemplateStyles";
|
||||||
commit = "f85614c26a0057a9f418342f89214a04c9de9988";
|
commit = "101a159dd0190759a16551a86800144c18b6ff5c";
|
||||||
hash = "sha256-XZOtM3iadjE5vavsjkx7kfJNhLZlnnFt1CN+mv6XVHQ=";
|
hash = "sha256-IGQQVAx8/76ivHq9b97ec1AlFoqbRl7uhXhwoFimsG4=";
|
||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "UserMerge";
|
name = "UserMerge";
|
||||||
commit = "2f2432c909a36691ca0002daf6fb304d6c182beb";
|
commit = "6c0d105e07538c34bfde989bd26fa1945f8d1b79";
|
||||||
hash = "sha256-ZP8Tp6u+uJxx3I39YGMmkP0sTnjAQUSaxImAJaRv+Ek=";
|
hash = "sha256-w058Ihk0I98hIG1tkVJGy1bzbv7XXyUksGexXgCN540=";
|
||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "VisualEditor";
|
name = "VisualEditor";
|
||||||
commit = "1508d49d0dd71fdc1d18badd23671441b3bc327b";
|
commit = "8d8c6d7f179a5f799e1fa8cba207d81f58f722d2";
|
||||||
hash = "sha256-VNiCVNrCAImAr1tS9T28KPPzzNsKPz5ELFRIBtng+So=";
|
hash = "sha256-wbYHXi2vD521EMzUl7ttinG4YdLv/DwYvVUew7dka0g=";
|
||||||
})
|
})
|
||||||
(mw-ext {
|
(mw-ext {
|
||||||
name = "WikiEditor";
|
name = "WikiEditor";
|
||||||
commit = "aba5e7c6701877a6b43583709751658fec606d47";
|
commit = "f53000f0499858fe74e4f5008b2f5e467d9d9382";
|
||||||
hash = "sha256-XmbQy0NXuY3oVGkkgC233kkzfBfx32HDylloGYXU/Nc=";
|
hash = "sha256-+HTXZEVCwMD8z6c1kCZA3k686HzNd30pJljzRvf+gMg=";
|
||||||
})
|
})
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user