mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2026-05-31 02:11:13 +02:00
Compare commits
2 Commits
main
...
bekkalokk-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
14623252a1 | ||
|
|
ffb2d261ae |
@@ -7,7 +7,6 @@
|
||||
|
||||
./services/alps.nix
|
||||
./services/bluemap.nix
|
||||
./services/radicle.nix
|
||||
./services/idp-simplesamlphp
|
||||
./services/kerberos.nix
|
||||
./services/mediawiki
|
||||
|
||||
@@ -107,6 +107,7 @@ in {
|
||||
CodeEditor
|
||||
CodeMirror
|
||||
DeleteBatch
|
||||
MediawikiMatrixNotifs
|
||||
PdfHandler
|
||||
PluggableAuth
|
||||
Popups
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
domain = "dav.pvv.ntnu.no";
|
||||
radicalePort = 5232;
|
||||
in {
|
||||
services.radicale = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
server = {
|
||||
hosts = [ "127.0.0.1:${toString radicalePort}" ];
|
||||
};
|
||||
|
||||
auth = {
|
||||
type = "imap";
|
||||
imap_host = "imap.pvv.ntnu.no";
|
||||
imap_security = "tls";
|
||||
};
|
||||
|
||||
storage = {
|
||||
filesystem_folder = "/var/lib/radicale/collections";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."${domain}" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
kTLS = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:${toString radicalePort}";
|
||||
extraConfig = ''
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Host $host;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_pass_header Authorization;
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ radicalePort ];
|
||||
}
|
||||
@@ -15,12 +15,13 @@ let
|
||||
, tracking-branch ? "REL1_45"
|
||||
, kebab-name ? kebab-case-name name
|
||||
, fetchgit ? pkgs.fetchgit
|
||||
, url ? "https://gerrit.wikimedia.org/r/mediawiki/extensions/${name}"
|
||||
}:
|
||||
{
|
||||
${name} = (fetchgit {
|
||||
name = "mediawiki-${kebab-name}-source";
|
||||
url = "https://gerrit.wikimedia.org/r/mediawiki/extensions/${name}";
|
||||
rev = commit;
|
||||
inherit url;
|
||||
inherit hash;
|
||||
}).overrideAttrs (_: {
|
||||
passthru = { inherit name kebab-name tracking-branch; };
|
||||
@@ -97,4 +98,12 @@ lib.mergeAttrsList [
|
||||
commit = "f53000f0499858fe74e4f5008b2f5e467d9d9382";
|
||||
hash = "sha256-+HTXZEVCwMD8z6c1kCZA3k686HzNd30pJljzRvf+gMg=";
|
||||
})
|
||||
|
||||
(mw-ext {
|
||||
name = "MediawikiMatrixNotifs";
|
||||
commit = "52d2a46c03f51af7c16ed4d7b3b07b0cbbffb4df";
|
||||
hash = "sha256-AADWunm2Rn2cfxeu9xyYBw5txnaIbJNdR3jxLqgzAy8=";
|
||||
url = "https://git.pvv.ntnu.no/oysteikt/mediawiki-matrix-notifs.git";
|
||||
tracking-branch = "master";
|
||||
})
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user