prescientmoon/satellite
prescientmoon/satellite
1
Fork 0
Code Activity

Update server to newer nixpkgs

Browse source
This commit is contained in:
prescientmoon 2025-06-11 23:58:47 +02:00
commit 7b2dff7dcf
Signed by: prescientmoon
SSH key fingerprint: SHA256:WFp/cO76nbarETAoQcQXuV+0h7XJsEsOCI0UsyPIy6U
5 changed files with 30 additions and 19 deletions

7
hosts/nixos/lapetus/secrets.example.yaml
View file

@ -22,3 +22,10 @@ vpn_env: |
WIREGUARD_ADDRESSES=...
SERVER_CITIES=...
OPENVPN_USER=...
glass_server_admin_password: ...
glass_server_secret_key: ...
glass_server_admin_token: ...
shimmering_discord_token: ...
# Generate using
# nix-shell -p apacheHttpd --run "htpasswd -5 -c ./temp <username>"
radicale_auth: ...

12
hosts/nixos/lapetus/secrets.yaml
View file

@ -13,11 +13,8 @@ glass_server_admin_password: ENC[AES256_GCM,data:i6nLp5Jo4LmdsBQilSh9,iv:E3ukSNR
glass_server_secret_key: ENC[AES256_GCM,data:lfrUSUfNk9yuX++2UxDZddP5iyk+zYdA2lbTNwOvrZRRQLVHky0HE8G/D3g=,iv:E6ET35pG/4Xo83sOo9Ukb4b+zvussaDsq2Nr5vyDFRI=,tag:1CamjtZNnlMjqdO75TKTBg==,type:str]
glass_server_admin_token: ENC[AES256_GCM,data:VkJtLAGcK3j5jAOJKKVk3fe3xNQ5RmljQP/XCCmej3VNU+w1byT2TQOeAQ==,iv:EJOpNit3ykEWvyZpJZC//2zad5dRYy3paN+gKggLVOY=,tag:LPWE0DMCc33KnMhNnZBHZQ==,type:str]
shimmering_discord_token: ENC[AES256_GCM,data:UszOvKnsCI3CrM6Xx7EcwuYw3UuL/50xBGTQwUBFXI3lLVF8O/2FTERSZj3BDfkwJ8cOfZjXeXajDEAv9PBp7sUMaQdQvAvd,iv:cl51JIpYW4fgDPmeljkievM87+narjvIC2ViIfJAmWg=,tag:HrcQ4uVRQAYwrOuTdjtN8g==,type:str]
radicale_auth: ENC[AES256_GCM,data:1qslwuJNp7Hbe7P5dTw5v1FeDpP1N42WnVNncL0rovlFTfqO1mblLPvJ3AEXF+rEJcTtF2UlLP7wA5MVgybPahvy03vxftlvwTnC5kalRQ/KoVPHZjTCZvNw954qELvx4X2Iq3jG1nMidVufbCzT8abnva2Yn7Vc,iv:xwoSEJXGIIfzBEgwptknOCewTdq3o3uf/nQGMqxzyGw=,tag:cMa4nu6hRwgfjwDTdv485A==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age14mga4r0xa82a2uus3wq5q7rqnvflms3jmhknz4f3hsda8wttk9gsv2k9fs
enc: |
@ -55,8 +52,7 @@ sops:
RkpibTJpVzVtR0txL1dHbmFkdlkvUk0KDgqO8c7CggeXhEMzx/tcLqtMG6MmuOi/
UmG9eSUO9im0Q7q7FG4Z+/lZ7+Iu15Dj8qA2/5MtDYPW+vxN3gzZrg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-02-11T05:19:04Z"
mac: ENC[AES256_GCM,data:W1gAmZ6A+cDYFZodb7cFvONFNOnlWuo4hjZKA1TIWAAa40161eNlAgWpxhZP90Ia8yJTtUQysfdywmSs/gCaGn38c7hhWyeJjMmX8+DavBg+fLf9Gw8EU2elXDtJucU9k0UUneJ5RO+lmrnUGqYMRomBPeNwUyeNCqa7tvL8vX8=,iv:uFmXTB9pTiiIbH3V72ik39SEQ1SVytcrjlANuzpp658=,tag:TXkkMqANU1uS1G27VMkIfw==,type:str]
pgp: []
lastmodified: "2025-06-10T21:03:15Z"
mac: ENC[AES256_GCM,data:Gp2PVFHzoOEQXt44NQc6imBvGJrcsyKnaHFuqSnrAcow9rcqcF9jzk/76PrIkspZk9tSRyL00JtS5ZUXa5g1yJSEYdTlyAlEmIN24KjOE81eodc06PWFxBI2YyEVTtNosreB4SMY5+SbSxhXbtsQOLe421T0XbkbbmcsTkxYiho=,iv:D79robuqGOGtrncfxUHL1MvNxOnC85uGPwNaM8hSLB8=,tag:nJJTKRIxGeRfuSfvf4g4MA==,type:str]
unencrypted_suffix: _unencrypted
version: 3.9.1
version: 3.10.2

8
hosts/nixos/lapetus/services/5d-diplomacy/generated.nix
View file

@ -2,12 +2,12 @@
{ pkgs, lib, ... }:
{
# Containers
virtualisation.oci-containers.containers."5d-diplomacy-backend" = {
image = "compose2nix/5d-diplomacy-backend";
environment = {
"ConnectionStrings__Database" = "Server=mssql;Database=diplomacy;User=SA;Password=Passw0rd@;Encrypt=True;TrustServerCertificate=True";
"ConnectionStrings__Database" =
"Server=mssql;Database=diplomacy;User=SA;Password=Passw0rd@;Encrypt=True;TrustServerCertificate=True";
};
log-driver = "journald";
extraOptions = [
@ -106,7 +106,7 @@
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
TimeoutSec = 300;
TimeoutSec = 900;
};
script = ''
docker build -t compose2nix/5d-diplomacy-backend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:server
@ -122,7 +122,7 @@
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
TimeoutSec = 300;
TimeoutSec = 900;
};
script = ''
docker build -t compose2nix/5d-diplomacy-frontend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:client

10
hosts/nixos/lapetus/services/cloudflared.nix
View file

@ -1,10 +1,6 @@
{ config, ... }: {
sops.secrets.cloudflare_tunnel_credentials = {
sopsFile = ../secrets.yaml;
owner = config.services.cloudflared.user;
group = config.services.cloudflared.group;
};
{ config, ... }:
{
sops.secrets.cloudflare_tunnel_credentials.sopsFile = ../secrets.yaml;
satellite.cloudflared.tunnel = "347d9ead-a523-4f8b-bca7-3066e31e2952";
services.cloudflared = {
enable = true;

12
hosts/nixos/lapetus/services/radicale.nix
View file

@ -4,12 +4,24 @@ let
dataDir = "/persist/data/radicale";
in
{
sops.secrets.radicale_auth = {
sopsFile = ../secrets.yaml;
owner = config.systemd.services.radicale.serviceConfig.User;
group = config.systemd.services.radicale.serviceConfig.Group;
};
services.radicale = {
enable = true;
settings = {
server.hosts = [ "localhost:${toString port}" ];
storage.filesystem_folder = dataDir;
auth = {
type = "htpasswd";
htpasswd_filename = config.sops.secrets.radicale_auth.path;
htpasswd_encryption = "autodetect";
};
};
};