simon
/
nixos-config
1
1
Fork 0
Code Issues 8 Pull Requests Projects Releases Activity

vueko/murmur: Migrate to renge

pull/64/head
Simon Bruder 2022-03-23 18:07:16 +01:00
parent dbb2007f22
commit ea8700ffcd
Signed by: simon
GPG Key ID: 8D3C82F9F309F8EC
7 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
machines/default.nix
View File

@ -12,9 +12,6 @@ in
};
vueko = {
system = "x86_64-linux";
extraModules = [
"${inputs.infinisilSystem}/config/new-modules/murmur.nix"
];
targetHost = "vueko.sbruder.de";
};
@ -48,6 +45,9 @@ in
};
renge = {
system = "x86_64-linux";
extraModules = [
"${inputs.infinisilSystem}/config/new-modules/murmur.nix"
];
targetHost = "renge.sbruder.de";
};

5
machines/okarin/secrets.yaml
View File

@ -1,4 +1,3 @@
murmur-superuser: ENC[AES256_GCM,data:yPiP2Vh6Zf9OSy0hlP0DsNykbhR2VvCLzA==,iv:+GEChmJtE2bnQ35uke4QXRDO3vY3MVPz2rWDwN6EUYI=,tag:paqTIe97dF83ExwAoQnSlQ==,type:str]
wg-home-private-key: ENC[AES256_GCM,data:UMNY28f8D4VN86s8RqhBbfCgBzLWOmAu1Id7RyIfp1Ta/BvgtfOz70Y3hvs=,iv:ph2O/wBwwThHnNQ5sHIc9ZOC6EXHM3fv4z3esTpJuj0=,tag:pROjuUte4+OZxPlhppceWA==,type:str]
wg-qbittorrent-private-key: ENC[AES256_GCM,data:PIoaHruI5+jnhXx7qaB16Xc7XV9xow2lhQy2/ILVhjwt5G2CN3CpfYQKep4=,iv:ZIoKe0FEwaJD850EUcnqQqC5Jg9FtqNin+1wdN6iQq8=,tag:0YveFfJlhgU0Z3kxrSMSQw==,type:str]
sops:
@ -7,8 +6,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
lastmodified: "2022-03-23T16:43:39Z"
mac: ENC[AES256_GCM,data:xD6GnHsyMe1nmgoYKpUxq6O45zpAKTfUFO4m7qHRTlfrEPmIkC8DoENb+qbhT2fHpvFAMEhP0IvhGoQUTcdhROIacEVQFuBpoVfNgNmMaDqvK4nB3XT2fGv1Z5tPDwPYFyxJ5Ashzp5iGPzrkBomZxCkT104b25sC441s8R3Sik=,iv:KkkV/y+ATd26O/357vpSm0ZchNz+pIPcZf+dYFpK1EI=,tag:HYtHaKxrWN1i9eP972SWYw==,type:str]
lastmodified: "2022-03-23T16:58:24Z"
mac: ENC[AES256_GCM,data:AU13cxWvqcuUFQI7HGO9TyUZZAIwxd2aGkKxmxjf8ehSozdPxBTE2ZgefuTc3dd71RutIM4MAAnAdVZumsMYFaHAjKm+0JAsP3JLXddavIxkhQOtRg8R65zEGIClrWvz6i8TiZx6Tg/UL0ZcjmmQbH21O+F1b2B4tKFikzngRvw=,iv:STYhrRmfZ//vvagRhsT3+9OuhV634zpFgs2/cD1EYJg=,tag:js/FQct+jcOm8Swvx0B5KA==,type:str]
pgp:
- created_at: "2022-03-03T09:13:41Z"
enc: |

1
machines/renge/configuration.nix
View File

@ -8,6 +8,7 @@
./services/hedgedoc.nix
./services/invidious
./services/libreddit.nix
./services/murmur.nix
./services/nitter.nix
./services/sbruder.xyz
];

5
machines/renge/secrets.yaml
View File

@ -1,5 +1,6 @@
gitea-mail: ENC[AES256_GCM,data:593Ks8r3W6i7oTsTu7d9NUQpeX64l2bU9/fo6jYHkPU=,iv:NLPh2B85CWmr9n8mbB/XrprG8kfu9AR3v8PqjgEsIjQ=,tag:q2fPoOtuFrEmXIe7Rvfj2Q==,type:str]
invidious-extra-settings: ENC[AES256_GCM,data:njAVRilLVlNLgFY5g0FMn7uZsSX3mWK8PnWW/oJoaUj7L0g597eRmL76LfvScz6+pbSYaY2H2Olt+YL0LWY0jt+gM0+FwG2+0ddrtrpjGeGa,iv:rNwvSV9YXqnQqNtzW79hEUKx6c0rddEcC31EVE7qr3w=,tag:iGiDNj5zDHXiO+mhmAwK4Q==,type:str]
murmur-superuser: ENC[AES256_GCM,data:Jac1Vs3tiSmL/qLwDhPhSoVzMNT0nAP+cg==,iv:ReUkEjCkEqUJKzHzIKdp77szhHitiDBXaxQnNWKQU9c=,tag:HfVrtSJwDPrHgZlKxcUiuA==,type:str]
wg-home-private-key: ENC[AES256_GCM,data:j+L7Egy3coCajL/LBGcaEbN3WuFzj7aenEQoktcIeKOTMmrA4643bCSDuUE=,iv:gKJQfrMMaeF2muJhtfq0h/GJ7VXGk1axGPtRFccLhHc=,tag:Bsqe3QBNdXo8vWo1p9pxfw==,type:str]
sops:
kms: []
@ -7,8 +8,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
lastmodified: "2022-03-23T16:43:51Z"
mac: ENC[AES256_GCM,data:D3HnEDwmJPue8Fes3tZ8R7AsjORJyc+l1/AI308DE4OUCs/551xgwpkd9h3w/WiMfSE70oAQRCeyCy50fKsLvlVIEy7R5EZGXidQfV+USFvqCExfiGzzn4Yn/cMgG7P7eyV6hWFZMtU/qWcaQxL8mLRdXxknkMu2UmqRjhZX2sI=,iv:rzbPVa+ja1KxkXqdD9ciHglArXaPfD8c99bw5mYqc6o=,tag:g8B169qyDGmwROeh79rQ1g==,type:str]
lastmodified: "2022-03-23T17:00:11Z"
mac: ENC[AES256_GCM,data:JguwJushHrsKc7y5LwRRHJp6+nxo7gJ4IjU5gdvbdWBqWQe2WTO+ZLzl08mh4mnPnGdHSdFlTyGbns8lpBuE/lTvEgQS27Jjc5vS4EltpJ7WM7P13gNKf+jD4gU9tsTs7SomZhB891s6ssTRbrbF/WcMZAMy/4kjFswqiGe476c=,iv:OZAIc2rO69BflOkl94zs6/lzuOEHVZeRVCDa25o7PxE=,tag:3HWMIKqKZDW4CZjN7jaGIw==,type:str]
pgp:
- created_at: "2022-03-23T13:59:53Z"
enc: |

28
machines/renge/services/murmur.nix Normal file
View File

@ -0,0 +1,28 @@
{ config, ... }:
{
sops.secrets.murmur-superuser = {
owner = config.users.users.murmur.name;
sopsFile = ../secrets.yaml;
};
users.users.murmur.isSystemUser = true; # Infinisil’s module does not set that
services.murmur = {
enable = true;
openFirewall = true;
superuserPasswordFile = config.sops.secrets.murmur-superuser.path;
acmeDomain = "mumble.sbruder.de";
config = {
bandwidth = "128000";
obfuscate = true;
logfile = ""; # log to stdout
channelname = ''[ \\-=\\w\\#\\[\\]\\{\\}\\(\\)\\@\\|]+'';
};
};
services.nginx.virtualHosts."mumble.sbruder.de" = {
enableACME = true;
forceSSL = true;
};
}

24
machines/vueko/configuration.nix
View File

@ -58,10 +58,6 @@
locations."/".proxyPass = "http://localhost:5232";
};
"mumble.sbruder.de" = {
enableACME = true;
forceSSL = true;
};
"bangs.sbruder.de" = {
enableACME = true;
forceSSL = true;
@ -91,26 +87,6 @@
};
};
sops.secrets.murmur-superuser = {
owner = config.users.users.murmur.name;
sopsFile = ./secrets.yaml;
};
users.users.murmur.isSystemUser = true; # Infinisil’s module does not set that
services.murmur = {
enable = true;
openFirewall = true;
superuserPasswordFile = config.sops.secrets.murmur-superuser.path;
acmeDomain = "mumble.sbruder.de";
config = {
bandwidth = "128000";
obfuscate = true;
logfile = ""; # log to stdout
channelname = ''[ \\-=\\w\\#\\[\\]\\{\\}\\(\\)\\@\\|]+'';
};
};
services.bang-evaluator = {
enable = true;
listenAddress = ":8000";

5
machines/vueko/secrets.yaml
View File

@ -1,4 +1,3 @@
murmur-superuser: ENC[AES256_GCM,data:jTVEa1KmbGAIxxFS2/uIlDCnnJTtGmKFZQ==,iv:YJIfcXlgKEwIRzFEY94dgReNjWZqLAqL0Rb6TG4IHIE=,tag:MVzaRkb24QyyNyFCEMwmzQ==,type:str]
wg-home-private-key: ENC[AES256_GCM,data:/RHNF6Zw6CTWa9ahUhGWRfkR8KIj+HdqUIojA1w6HQBFbZ/+Vo+CcYTYO5I=,iv:2sDH1P3VRjmLw6Ilkq0rw/hossHrNWP5uRvX9yr5fLE=,tag:KIT5GCfXuhg6RjA8+Nmtnw==,type:str]
turn-static-auth-secret: ENC[AES256_GCM,data:Nz94xw5sBuAgEqVpwiV44Rd3km16H46X6jVf2gzE+mbbVt2TXExv/7yegQtXI++eBo6q4wbpOfxwl0b1Pvsa/A==,iv:HSdqj43Vmq5McWAbMoxeNUa38UD75Xe4PJEwY5mKjOQ=,tag:cFpFsVwhisWt7JMMzJemCA==,type:str]
sops:
@ -7,8 +6,8 @@ sops:
azure_kv: []
hc_vault: []
age: []
lastmodified: "2021-12-01T16:49:21Z"
mac: ENC[AES256_GCM,data:wLy9If4/YdAVILwz1vSzCQsjG0U8Z2GvpME/+xW9pS/xmKoXTwaxP2QQpy8ReTmtikpbKS327j5pz2dSMiweqaUFSVb1nIEvUFxV4PKnxf5ubJalPZAGa82Cw0aassMKz0IAd8rDF/xK9RoB3ayRluYKAP/qnbEcFrys0BokGE0=,iv:Yw3tG1J135QImJqXEGrpSq3k8Lo++uUXfEKmCCNCpDg=,tag:FChnsJ1qIzalpVypMIilrg==,type:str]
lastmodified: "2022-03-23T16:58:43Z"
mac: ENC[AES256_GCM,data:bZS3P4xzIv3nWJaXGLvzCl2T3MALFrjPMXk7MMW1gXppsqwyZJQvBUxjwEMMHGlaYRrnDkraDDiRZtLvaCO708+Z2XtScHY9HhzN0+/zdCROVRFkM8d1Qt1FqHAcWvGoFXuddnCDUFw4dhfmUuzlrKEUNRq6MP2oP5KccxtiWjA=,iv:RtkdqwuYQWiS0mRfz7rl8aaOjvHWlv3BMGEtIijjPlg=,tag:lcOpben3QCJ0Y3adPBOTVQ==,type:str]
pgp:
- created_at: "2021-04-06T11:13:54Z"
enc: |