This repository has no description
0

Configure Feed

Select the types of activity you want to include in your feed.

machines.{prism,neoprism}: migrate realwallpaper, lassul.us website, bgt-bot

Move realwallpaper service and lassul.us website from prism to neoprism.
DNS for lassul.us already points at neoprism.

bgt-bot is commented out on neoprism for now; can be enabled later if it
goes down on prism (which currently isn't deploying anyway).

Drop the now-redundant lassul.us -> orange.r proxy in orange-host.nix and
the lassul.us acme fallback on prism.

+20 -29
-9
2configs/orange-host.nix
··· 12 12 hostPath = "/var/lib/sync-containers3/orange/state"; 13 13 isReadOnly = false; 14 14 }; 15 - services.nginx.virtualHosts."lassul.us" = { 16 - # enableACME = config.security; 17 - # forceSSL = true; 18 - locations."/" = { 19 - recommendedProxySettings = true; 20 - proxyWebsockets = true; 21 - proxyPass = "http://orange.r"; 22 - }; 23 - }; 24 15 clan.core.vars.generators.orange-container = { 25 16 files."orange.sync.key" = { }; 26 17 migrateFact = "orange-container";
+20 -1
machines/neoprism/config.nix
··· 62 62 # lassul.us website 63 63 ../../2configs/websites/lassulus.nix 64 64 65 + # realwallpaper generator 66 + ../../2configs/realwallpaper.nix 67 + 68 + # binaergewitter announce bot 69 + # ../../2configs/bgt-bot 70 + 65 71 # paste + cyberlocker 66 72 ../../2configs/paste.nix 67 73 ··· 82 88 ]; 83 89 84 90 # lassul.us shouldn't be the default vhost here (nginx.nix already sets one) 85 - services.nginx.virtualHosts."lassul.us".default = lib.mkForce false; 91 + services.nginx.virtualHosts."lassul.us" = { 92 + default = lib.mkForce false; 93 + locations = { 94 + "= /wallpaper-marker.png".extraConfig = '' 95 + alias /var/realwallpaper/realwallpaper-marker.png; 96 + ''; 97 + "= /wallpaper.png".extraConfig = '' 98 + alias /var/realwallpaper/realwallpaper.png; 99 + ''; 100 + "= /wallpaper-stars-berlin.png".extraConfig = '' 101 + alias /var/realwallpaper/realwallpaper-krebs-stars-berlin.png; 102 + ''; 103 + }; 104 + }; 86 105 87 106 services.ollama.enable = true; 88 107
-19
machines/prism/config.nix
··· 26 26 ../../2configs/ssh-redirect.nix 27 27 ../../2configs/retiolum.nix 28 28 ../../2configs/libvirt.nix 29 - ../../2configs/websites/lassulus.nix 30 29 ../../2configs/services/git/proxy.nix 31 30 ../../2configs/monitoring/telegraf.nix 32 31 ../../2configs/consul.nix ··· 129 128 # paste.nix removed - paste/cyberlocker now runs on neoprism, proxied below 130 129 ../../2configs/syncthing.nix 131 130 ../../2configs/container-networking.nix 132 - ../../2configs/bgt-bot 133 131 (self.inputs.stockholm + "/krebs/2configs/mastodon-proxy.nix") 134 132 { 135 133 services.tor = { 136 134 enable = true; 137 - }; 138 - } 139 - { 140 - imports = [ 141 - ../../2configs/realwallpaper.nix 142 - ]; 143 - services.nginx.virtualHosts."lassul.us".locations = { 144 - "= /wallpaper-marker.png".extraConfig = '' 145 - alias /var/realwallpaper/realwallpaper-marker.png; 146 - ''; 147 - "= /wallpaper.png".extraConfig = '' 148 - alias /var/realwallpaper/realwallpaper.png; 149 - ''; 150 - "= /wallpaper-stars-berlin.png".extraConfig = '' 151 - alias /var/realwallpaper/realwallpaper-krebs-stars-berlin.png; 152 - ''; 153 135 }; 154 136 } 155 137 ../../2configs/minecraft.nix ··· 215 197 ../../2configs/services/coms/murmur.nix 216 198 { 217 199 # acme fallback for neoprism migration 218 - services.nginx.virtualHosts."lassul.us".acmeFallbackHost = "orange.r"; 219 200 services.nginx.virtualHosts."radio.lassul.us".acmeFallbackHost = "neoprism.r"; 220 201 services.nginx.virtualHosts."flix.lassul.us".acmeFallbackHost = "neoprism.r"; 221 202 services.nginx.virtualHosts."jitsi.lassul.us".acmeFallbackHost = "neoprism.r";