noe/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ps2live: add plapkit

Browse source
This commit is contained in:
41666 2024-06-26 17:50:00 -04:00
parent 0f0ec44ac8
commit 8ac30007f3
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/hosts/ingress-proxy/default.nix
View file

@ -32,6 +32,7 @@ in rec {
ps2l_saerro.servers."${tsHost "ps2live" 8101}" = {}; ps2l_saerro.servers."${tsHost "ps2live" 8101}" = {};
ps2l_aggpop.servers."${tsHost "ps2live" 8201}" = {}; ps2l_aggpop.servers."${tsHost "ps2live" 8201}" = {};
ps2l_metagame.servers."${tsHost "ps2live" 8301}" = {}; ps2l_metagame.servers."${tsHost "ps2live" 8301}" = {};
ps2l_plapkit.servers."${tsHost "ps2live" 8555}" = {};
pdr.servers."${tsHost "porcelain-doll-repair" 3000}" = {}; pdr.servers."${tsHost "porcelain-doll-repair" 3000}" = {};
dsi.servers."${tsHost "dis-sociat-ing" 3000}" = {}; dsi.servers."${tsHost "dis-sociat-ing" 3000}" = {};
se.servers."${tsHost "sapphic-engineer" 4000}" = {}; se.servers."${tsHost "sapphic-engineer" 4000}" = {};
@ -39,7 +40,6 @@ in rec {
staticsites.servers."${tsHost "static-sites" 80}" = {}; staticsites.servers."${tsHost "static-sites" 80}" = {};
ldr.servers."${tsHost "live-doll-repair" 80}" = {}; ldr.servers."${tsHost "live-doll-repair" 80}" = {};
jitsi.servers."${tsHost "jitsi" 443}" = {}; jitsi.servers."${tsHost "jitsi" 443}" = {};
plapkit-dev.servers."${tsHost "cider" 8555}" = {};
}; };
proxyCachePath."pdr" = { proxyCachePath."pdr" = {
@ -100,6 +100,7 @@ in rec {
"agg.ps2.live" = ps2live "aggpop"; "agg.ps2.live" = ps2live "aggpop";
"saerro.ps2.live" = ps2live "saerro"; "saerro.ps2.live" = ps2live "saerro";
"metagame.ps2.live" = ps2live "metagame"; "metagame.ps2.live" = ps2live "metagame";
"i-pk.noe.sh" = ps2live "plapkit";
"flesh.doll.repair" = { "flesh.doll.repair" = {
serverAliases = [ "conference.flesh.doll.repair" "auth.flesh.doll.repair" ]; serverAliases = [ "conference.flesh.doll.repair" "auth.flesh.doll.repair" ];
@ -176,13 +177,6 @@ in rec {
}; };
locations."/media" = locations."/proxy"; locations."/media" = locations."/proxy";
} // defaultConfig // { forceSSL = false; }; } // defaultConfig // { forceSSL = false; };
"i-pk.noe.sh" = {
locations."/" = {
recommendedProxySettings = true;
proxyPass = "http://plapkit-dev";
};
} // defaultConfig;
}; };
}; };

1
nixos/stacks/ps2.live/extras.nix
View file

@ -22,6 +22,7 @@
plapkit = { plapkit = {
image = "plapkit"; image = "plapkit";
imageFile = inputs.plapkit.packages.${pkgs.system}.container; imageFile = inputs.plapkit.packages.${pkgs.system}.container;
ports = [ "8555:8555" ];
environment = { environment = {
DSI_FIELD_NAME = "system[front]"; DSI_FIELD_NAME = "system[front]";
}; };

6
secrets/ps2live/saerro.yaml
View file

@ -1,7 +1,7 @@
saerro: ENC[AES256_GCM,data:Cl/d1d7O+sChFqQiBWroaZtGk5PzCp2esfdyT0DmQZBVfpZmnIXsaUBgM2Yjq3Bm6x0+njQr72v0JlWT73FnYSh/6fo8a92KLseysGca505vpdW7ynCFLR7e2Wrumil7iE2rL/SHr/2vbjgttDnjv6EkPqOPqYzD1BAc30frsH0WmZrB3llPhTBdgwdLLZYfJZPYg50oH7q0neeP9JxZaFYpEEkhtIDkObKZiix5gCxgQK0WzOpYyrRR7uCL/zpVNnM05aBpxz6o4GJwepJTy+KAlnmDBQnELrWAepx9EYiQRH7yk0OoKFYLnnP0jVA/PDw8HSA+29w=,iv:0dowkRKlS0IYxgMSCgMFw4EID/zb8GuZ/zsVKohFaRA=,tag:Nu3bDmxVUmGgwB20i7MdCQ==,type:str] saerro: ENC[AES256_GCM,data:Cl/d1d7O+sChFqQiBWroaZtGk5PzCp2esfdyT0DmQZBVfpZmnIXsaUBgM2Yjq3Bm6x0+njQr72v0JlWT73FnYSh/6fo8a92KLseysGca505vpdW7ynCFLR7e2Wrumil7iE2rL/SHr/2vbjgttDnjv6EkPqOPqYzD1BAc30frsH0WmZrB3llPhTBdgwdLLZYfJZPYg50oH7q0neeP9JxZaFYpEEkhtIDkObKZiix5gCxgQK0WzOpYyrRR7uCL/zpVNnM05aBpxz6o4GJwepJTy+KAlnmDBQnELrWAepx9EYiQRH7yk0OoKFYLnnP0jVA/PDw8HSA+29w=,iv:0dowkRKlS0IYxgMSCgMFw4EID/zb8GuZ/zsVKohFaRA=,tag:Nu3bDmxVUmGgwB20i7MdCQ==,type:str]
metagame: ENC[AES256_GCM,data:4B2br0xdvlVDUmnvrD6g0g==,iv:mv05woLklpk9B4bj7/AEFBGYgRyTS9flv667Ud9FpEc=,tag:mRvB2sGWKzE2RwgyF1kIpQ==,type:str] metagame: ENC[AES256_GCM,data:4B2br0xdvlVDUmnvrD6g0g==,iv:mv05woLklpk9B4bj7/AEFBGYgRyTS9flv667Ud9FpEc=,tag:mRvB2sGWKzE2RwgyF1kIpQ==,type:str]
roombot: ENC[AES256_GCM,data:D4ee3xyiuRYZZUXNR8LFiVjto3r8nZHcgHU/6H/LNH3Yuld0E0fVmV3vABdyqd1HernM4PUXMaEzMhGcajdNvKmof6ItpJPqACL9z7kono4etAotuhk=,iv:W9Ek5Eid+TFJO/7xTl3TYd2PzXiQ7tldIWN0zDEuOSY=,tag:Cg/iGWyy/rQDuYaH4w6Cmg==,type:str] roombot: ENC[AES256_GCM,data:D4ee3xyiuRYZZUXNR8LFiVjto3r8nZHcgHU/6H/LNH3Yuld0E0fVmV3vABdyqd1HernM4PUXMaEzMhGcajdNvKmof6ItpJPqACL9z7kono4etAotuhk=,iv:W9Ek5Eid+TFJO/7xTl3TYd2PzXiQ7tldIWN0zDEuOSY=,tag:Cg/iGWyy/rQDuYaH4w6Cmg==,type:str]
plapkit: ENC[AES256_GCM,data:IAEAaPouYF5SxUrG9u7AvB444D+oMb1wNPP/8NrEUHIRDdjgXaGWekBgYt7oTNZNNaG5eJBMBH2AjNRVyg==,iv:U3ZBOlCFPtI/djZZhQji28pYkiLtBJ29SaRtW2MsP5U=,tag:A0q/MSZflwvo3+mPFakUyQ==,type:str] plapkit: ENC[AES256_GCM,data:LBc8H40xMLIaYt+cEuMqTRDaGO2vLsoz90hrsRFUohqLnHEkXcfbr4qj+kZmnQ7zQJ1GHPTz5jvY6BLjsXjrRpK1JqaIdxkVGSmk/Hbp84bF0vHTvtEDSa91ga2nddcUxinOS4lFNdWfWJW9qJ++Cbc7RBi7IAh12Q==,iv:ycLyMrWsz0aNT7cOqGD1AYFrdGOiBRtvDhhFp6DSS78=,tag:5sV1+mgib/+/DtDGnWBM0A==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -44,8 +44,8 @@ sops:
RHpySU8wMUI0VlRBek1TZ1R4eTZuYmsKYK1nW3njBGyAsihttauYMNzq16StUjW/ RHpySU8wMUI0VlRBek1TZ1R4eTZuYmsKYK1nW3njBGyAsihttauYMNzq16StUjW/
ui/Cn136JiYAUTkSG8yEHaSGoI32vabNuLNJDnG6fdvgqhDeJTGBBw== ui/Cn136JiYAUTkSG8yEHaSGoI32vabNuLNJDnG6fdvgqhDeJTGBBw==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-06-26T21:35:22Z" lastmodified: "2024-06-26T21:48:46Z"
mac: ENC[AES256_GCM,data:EW2sWKnvppJvvAOFbbk/IL5Cd/p9dcV0EsKFzKNW9uy7uqDj/XpncgTh6lMqxGeGB4DASNJODO2peu5AJ92FnOowUqPNiEq8cerJs6XapvmH66LFisQAUVjjzmtAM2fiPJqRWGzSM3JaZiha7GCw/TsyCwbq3Mc6Q9NCHJsYoro=,iv:K9s1ejieal22XN08M3Ko6PbFRBRVMpVIwRQiI2jqxOY=,tag:aGJ13uUsR1dpc1ik64GVEw==,type:str] mac: ENC[AES256_GCM,data:mHoG3UwuMi/8EQy2KvmHFHPXA2T6N6393Kr4bGlisbcBGMmF+3At0ofuWGVhq8tIeIYDIdd8EYdOSJbwaUFW0TqVUdtVma1Rb1x6dqn2pU6Tj+j0B/3SmmGeZPSQ5vY7msOSdpHiTbLfY2PohFRtk4NGLj91GEGksilmoSn/AzA=,iv:y1ExjtlFDVoby1G6/5wdgiBujlt/kIHQOW/18nZYoNI=,tag:6PgdtVTEdDqyJAXW0hCMZg==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1