pub-solar/infra
6
1
Fork 3
Code Issues 16 Pull requests 7 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'NixOS 23.11 fixes' (#75) from fix/nixos-23.11-fixes into main

Browse source 
Reviewed-on: #75
This commit is contained in:
teutat3s 2023-12-03 13:20:51 +00:00
parent 35a4ac5619 790848ef69
commit 5c664a0401
Signed by: pub.solar gitea
GPG key ID: F0332B04B7054873
4 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -184,11 +184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689875310, "lastModified": 1701601812,
"narHash": "sha256-gJxh8fVX24nZXBxstZcrzZhMRFG9jyOnQEfkgoRr39I=", "narHash": "sha256-ZasiO0UOpDYumIjoUcfInVST7vBsCUaXZ8ZfnSxwXz8=",
"ref": "main", "ref": "main",
"rev": "c2c86bbf9855f16a231a596b75b443232a7b9395", "rev": "bba54d2f5cd616ff5fded4c95f1e4f99faa2f5d0",
"revCount": 24, "revCount": 26,
"type": "git", "type": "git",
"url": "https://git.pub.solar/pub-solar/keycloak-theme" "url": "https://git.pub.solar/pub-solar/keycloak-theme"
}, },

7
hosts/nachtigall/apps/matrix/irc.nix
View file

@ -1,5 +1,10 @@
{lib, ...}: {pkgs, lib, ...}:
{ {
systemd.services.matrix-appservice-irc.serviceConfig.SystemCallFilter = lib.mkForce [
"@system-service @pkey"
"~@privileged @resources"
"@chown"
];
services.matrix-appservice-irc = { services.matrix-appservice-irc = {
enable = true; enable = true;
localpart = "irc_bot"; localpart = "irc_bot";

5
hosts/nachtigall/apps/matrix/synapse.nix
View file

@ -218,6 +218,11 @@ in {
"/var/lib/matrix-synapse/telegram-registration.yaml" "/var/lib/matrix-synapse/telegram-registration.yaml"
]; ];
extras = [
"oidc"
"redis"
];
plugins = [ plugins = [
config.services.matrix-synapse.package.plugins.matrix-synapse-shared-secret-auth config.services.matrix-synapse.package.plugins.matrix-synapse-shared-secret-auth
]; ];

26
terraform/dns.tf
View file

@ -8,7 +8,6 @@ resource "namecheap_domain_records" "pub-solar" {
hostname = "flora-6" hostname = "flora-6"
type = "A" type = "A"
address = "80.71.153.210" address = "80.71.153.210"
ttl = 60
} }
record { record {
hostname = "auth" hostname = "auth"
@ -19,7 +18,6 @@ resource "namecheap_domain_records" "pub-solar" {
hostname = "ci" hostname = "ci"
type = "A" type = "A"
address = "80.71.153.210" address = "80.71.153.210"
ttl = 60
} }
record { record {
hostname = "git" hostname = "git"
@ -52,19 +50,16 @@ resource "namecheap_domain_records" "pub-solar" {
hostname = "cache" hostname = "cache"
type = "A" type = "A"
address = "95.217.225.160" address = "95.217.225.160"
ttl = 60
} }
record { record {
hostname = "factorio" hostname = "factorio"
type = "A" type = "A"
address = "80.244.242.2" address = "80.244.242.2"
ttl = 60
} }
record { record {
hostname = "collabora" hostname = "collabora"
type = "CNAME" type = "CNAME"
address = "nachtigall.pub.solar." address = "nachtigall.pub.solar."
ttl = 60
} }
record { record {
hostname = "@" hostname = "@"
@ -76,19 +71,17 @@ resource "namecheap_domain_records" "pub-solar" {
hostname = "chat" hostname = "chat"
type = "CNAME" type = "CNAME"
address = "nachtigall.pub.solar." address = "nachtigall.pub.solar."
ttl = 60
} }
record { record {
hostname = "cloud" hostname = "cloud"
type = "CNAME" type = "CNAME"
address = "nachtigall.pub.solar." address = "nachtigall.pub.solar."
ttl = 60
} }
record { record {
hostname = "coturn" hostname = "turn"
type = "A" type = "A"
address = "80.71.153.239" address = "138.201.80.102"
ttl = 60 ttl = 300
} }
record { record {
hostname = "hpb" hostname = "hpb"
@ -96,18 +89,6 @@ resource "namecheap_domain_records" "pub-solar" {
address = "80.71.153.239" address = "80.71.153.239"
ttl = 60 ttl = 60
} }
record {
hostname = "dimension"
type = "A"
address = "85.88.23.162"
ttl = 60
}
record {
hostname = "element"
type = "A"
address = "85.88.23.162"
ttl = 60
}
record { record {
hostname = "files" hostname = "files"
type = "CNAME" type = "CNAME"
@ -132,7 +113,6 @@ resource "namecheap_domain_records" "pub-solar" {
hostname = "matrix" hostname = "matrix"
type = "CNAME" type = "CNAME"
address = "nachtigall.pub.solar." address = "nachtigall.pub.solar."
ttl = 60
} }
record { record {
hostname = "www" hostname = "www"