mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2026-05-31 02:11:13 +02:00
Compare commits
1 Commits
bekkalokk-
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1eb6486baa |
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
./services/alps.nix
|
./services/alps.nix
|
||||||
./services/bluemap.nix
|
./services/bluemap.nix
|
||||||
|
./services/radicle.nix
|
||||||
./services/idp-simplesamlphp
|
./services/idp-simplesamlphp
|
||||||
./services/kerberos.nix
|
./services/kerberos.nix
|
||||||
./services/mediawiki
|
./services/mediawiki
|
||||||
|
|||||||
@@ -107,7 +107,6 @@ in {
|
|||||||
CodeEditor
|
CodeEditor
|
||||||
CodeMirror
|
CodeMirror
|
||||||
DeleteBatch
|
DeleteBatch
|
||||||
MediawikiMatrixNotifs
|
|
||||||
PdfHandler
|
PdfHandler
|
||||||
PluggableAuth
|
PluggableAuth
|
||||||
Popups
|
Popups
|
||||||
|
|||||||
43
hosts/bekkalokk/services/radicle.nix
Normal file
43
hosts/bekkalokk/services/radicle.nix
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
{ 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,13 +15,12 @@ let
|
|||||||
, tracking-branch ? "REL1_45"
|
, tracking-branch ? "REL1_45"
|
||||||
, kebab-name ? kebab-case-name name
|
, kebab-name ? kebab-case-name name
|
||||||
, fetchgit ? pkgs.fetchgit
|
, fetchgit ? pkgs.fetchgit
|
||||||
, url ? "https://gerrit.wikimedia.org/r/mediawiki/extensions/${name}"
|
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
${name} = (fetchgit {
|
${name} = (fetchgit {
|
||||||
name = "mediawiki-${kebab-name}-source";
|
name = "mediawiki-${kebab-name}-source";
|
||||||
|
url = "https://gerrit.wikimedia.org/r/mediawiki/extensions/${name}";
|
||||||
rev = commit;
|
rev = commit;
|
||||||
inherit url;
|
|
||||||
inherit hash;
|
inherit hash;
|
||||||
}).overrideAttrs (_: {
|
}).overrideAttrs (_: {
|
||||||
passthru = { inherit name kebab-name tracking-branch; };
|
passthru = { inherit name kebab-name tracking-branch; };
|
||||||
@@ -98,12 +97,4 @@ lib.mergeAttrsList [
|
|||||||
commit = "f53000f0499858fe74e4f5008b2f5e467d9d9382";
|
commit = "f53000f0499858fe74e4f5008b2f5e467d9d9382";
|
||||||
hash = "sha256-+HTXZEVCwMD8z6c1kCZA3k686HzNd30pJljzRvf+gMg=";
|
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