diff --git a/.sops.yaml b/.sops.yaml index b5d01e1..5321930 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -2,6 +2,7 @@ keys: - &snuff age1w4hw2ntxrtfqhht63s9lf7nhjxjmdcc927hndn5ygcqqj532qssq4m2m6p - &yukkop age1r25zdeqq8nac6dgca9en28r57ffyz9u9d8z5yc25gc8xqz747vaqmdtk0h - &bfs-server age15yzgmsvl3ku2w863h6gw2vpmw37m9aruv6xrj4fue6n2jpm7pyuqk9xjmj + - &bfs-pol-server age1fpytf05sg9n6ywpwkmn09lhpfvgtud9h75h76jhxha475zpnasqq952rpu - &neuro-server age15yzgmsvl3ku2w863h6gw2vpmw37m9aruv6xrj4fue6n2jpm7pyuqk9xjmj - &games-server age15yzgmsvl3ku2w863h6gw2vpmw37m9aruv6xrj4fue6n2jpm7pyuqk9xjmj @@ -17,6 +18,7 @@ creation_rules: - *snuff - *yukkop - *bfs-server + - *bfs-pol-server - path_regex: sus/neuro.yaml$ key_groups: diff --git a/nixos/system/bfs/bfs.nix b/nixos/system/bfs/bfs.nix index b08a36b..6cb4381 100644 --- a/nixos/system/bfs/bfs.nix +++ b/nixos/system/bfs/bfs.nix @@ -21,23 +21,23 @@ in { imports = [ self.nixosModules.hectic inputs.sops-nix.nixosModules.sops - ./voice-tune.nix - ./matrix.nix - ./element-rtc.nix - ./element.nix + #./voice-tune.nix + #./matrix.nix + #./element-rtc.nix + #./element.nix ]; - currentServer = { - matrix = { - secretsFile = config.sops.secrets."matrix/secrets".path; - turnSecretFile = config.sops.secrets."matrix/turn-secret".path; - postgresql = { - port = 5432; - initialEnvFile = config.sops.secrets."init-postgresql".path; - }; - matrixDomain = "accord.tube"; - }; - }; + #currentServer = { + # matrix = { + # secretsFile = config.sops.secrets."matrix/secrets".path; + # turnSecretFile = config.sops.secrets."matrix/turn-secret".path; + # postgresql = { + # port = 5432; + # initialEnvFile = config.sops.secrets."init-postgresql".path; + # }; + # matrixDomain = "accord.tube"; + # }; + #}; services.xray = { enable = true; @@ -92,12 +92,12 @@ in { secrets."config" = {}; secrets."init-postgresql" = {}; - secrets."matrix/secrets" = {}; - secrets."matrix/turn-secret" = { - owner = "turnserver"; - group = "turnserver"; - mode = "0400"; - }; + #secrets."matrix/secrets" = {}; + #secrets."matrix/turn-secret" = { + # owner = "turnserver"; + # group = "turnserver"; + # mode = "0400"; + #}; }; networking.firewall = { diff --git a/package/migrator/migrator.sh b/package/migrator/migrator.sh index 9aba72a..2c4b2dd 100644 --- a/package/migrator/migrator.sh +++ b/package/migrator/migrator.sh @@ -16,7 +16,7 @@ set -eu VERSION='0.0.1' MIGRATION_DIR="${MIGRATION_DIR:-migration}" -DB_URL="${DB_URL:-DB_URL}" +: "${DB_URL:=DB_URL}" REMAINING_ARS= quote() { printf "'%s'" "$(printf %s "$1" | sed "s/'/'\\\\''/g")"; } @@ -80,7 +80,7 @@ db_exec() { sqlite) local db_path db_path=$(get_sqlite_path) - # Use -batch for non-interactive execution + # NOTE: Use -batch for non-interactive execution printf '%s' "$sql" | sqlite3 -batch "$db_path" ;; esac diff --git a/sus/bfs.xray.yaml b/sus/bfs.xray.yaml index 5134e40..519a5bf 100644 --- a/sus/bfs.xray.yaml +++ b/sus/bfs.xray.yaml @@ -8,29 +8,38 @@ sops: - recipient: age1w4hw2ntxrtfqhht63s9lf7nhjxjmdcc927hndn5ygcqqj532qssq4m2m6p enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYWEhFQ3JlTS9wT3U4RjNq - OFRkQ21pR0xobHF5OGFzWGpJdFBLYkp1dEdvCmcvQnVySWxCWm5VSWwvNS91UzBI - N2lJNHdiODd2c1U2cEd4cnhzeSs4YXMKLS0tIFpHUTVjT0hHelYwc2ZrK25MZVJF - TG55eWlWOE04UmFsd09tWWR3cWpVQTQKPEyBrE8ml16SAmDsB2quA2BqB4dUb19l - wrv2raWhqTyQ+C6YbF4Xysa6lT8FA05As+9ssJ6a4arw6wcRYHQ67g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBybHZqZkUyczJXc1VnaWtx + NEk2ZnM3YmxnV2UxVENCK0tXYXpnYjE3ZnpnCnA4bTZGQWovUWRYZXpoZ1NtMkdl + ZWtiZ1ZDaDBYemxPMFhINzVlaEsxdjAKLS0tIGc4Z2FGblZnQTg5YVlDTUxNR3JY + alVmeVlrNjJtZktqczJ0R3owMG53b0UKZ3+H5AtoJ2PQsQIPhx6kHvlUfbTbQRwi + eRXkH3Fpgf9OG3LCJkozTq6oJk10N3RghQCWbv1dbjwE8Nl23U73iw== -----END AGE ENCRYPTED FILE----- - recipient: age1r25zdeqq8nac6dgca9en28r57ffyz9u9d8z5yc25gc8xqz747vaqmdtk0h enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyd0hmNFRVVzZOa3gwZE95 - RHA3dHpPbEd0KzAySlU0YnF4dlVZdGppNTMwCjlHR3d1Y1ltMmphUk5kYnYzd0Y2 - SXhKa21abXBobTdpUUJPUmtaMGEyTE0KLS0tIE5yWm5Odk1GSnRKRWFvSy9vMXBq - WnpMcHpta0FXTHIyY20rTVhBdmFFa3MKYNK6hE369CE7ZCeCJouC3glK9Me/T4Ft - QHlNAFR65t9sx1EBjWKwkeM+PFVqifRitC9MbdTzSm1hRyXfQhtQEg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGQ1hZRjVtaDI2Y3RKM2VK + ODdxOUxqNXNBZ3QzRjBaS3NDSXNwYXpUMUJNCnd3MW8wYkFCc2RoYjBqWDZUM2V1 + eVkzdUozbXFVR1NFdG8xNnFXV3hoRTQKLS0tIFY4a3VtMytseFZiOEFEV2FTanhK + WDlWdmljSVFvbVVuejVyaGlhSUZqT1kKDTlfjHtwtOowAOyWqspfpRMOnvlQ1jhD + WCMt+2AZFc657cg1U83P2nXKMdhTK237rMvwqFqq/hcoeOxfa4yZ9g== -----END AGE ENCRYPTED FILE----- - recipient: age15yzgmsvl3ku2w863h6gw2vpmw37m9aruv6xrj4fue6n2jpm7pyuqk9xjmj enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjZEQ1UG1EckFSRHpkbjRC - QTFrVWZDOTk0KzFmOGVWSFY3WTRhTy9pb0dzCkRoc1lwR3plZ1lvdTZGdmZkUlp0 - NTB6cDEyaGZ4bGVBZVFtanQ2a2QrTzgKLS0tIEYrQUpJejZ4QkRKWWRGL2VXZTh1 - dFh2anpQTTBpVDdCd3hIYmJLMmpVM0kKvuWuryBpHTpsn9eq6MosafVH0m2KTmql - xzxUibPr2BmeR4QAB+pYLqTBH1+N9atGYdLe5qe7GqEmcjq8IfJnBw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1bjkzS3ZZdi9WbkYwQm1y + V093ZVlrVUw4NVphOWduRjN5SjAyOGtIUTBnClNNOUpzazRmTW1ncm82N1p4OSt1 + MU9XaGQrZ291OGdoR0lyUVFwNHRTUGMKLS0tIEFGb280RmlvNER4SHIyVkVsMFBB + NWZmTnhXQUJIcndZMUZhNDhqeHl3WjQKo/vmAhkj98zXBjNXLzcziN3aKHey86lo + ck1sdS84YyZ3VN60LAtCTIvAigmhgyi3fi7o9LjOnwqnHle72f5CHw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1fpytf05sg9n6ywpwkmn09lhpfvgtud9h75h76jhxha475zpnasqq952rpu + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwdURUVUxDdEMxWUFUMkNx + eUtEQkt3am8zdFo1RDMwVysvdFBabTdYZUY4ClRVSHpKcEY1cG1IM1NOcVJaRWZo + eGJuSXVoS0NNa3BCYUtjeVZJTFJraWcKLS0tIGg2M0d4ZURvdVpGNVVlR3ZEZWRr + ZHZ4VUpKTkFOQmh0Z2tGc0FZVGZRNzQK4dn7kpSXnBOlpXb7otsrYdFFBMCituoE + 3T/NHXiwDpcLln8LvLUNBKirR2fwr2d4Ku8vMG8vn7m4b6PzxY59ww== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-12-16T11:55:38Z" mac: ENC[AES256_GCM,data:M10MqlFU2vwPMOHghGr6Ob29GvnKHUplAjaAniLEKiiCV54pZnVzL63rTQJW3hyHAHGWmGbXDFHzUdO3Z2xQhWRw7uWd7JMnmlm+uTsel6scvu9fovVJJA3Dr3IhZF8R3WIanS9z+0VfBzrG1xTngp0Jg219vnxgyLTRWRB0rEw=,iv:X3W4d1gT7eKp76aveiphMKbnHmADAtplDyGi4rbKGgQ=,tag:GXXVpUU7nintty/zfrFZEw==,type:str]