+4 -1

nixosConfigurations/black-mesa.nix

reviewed

··· 129 129 }; 130 130 tangled = { 131 131 hostname = "knot.bwc9876.dev"; 132 132 - knot.enable = true; 132 132 + knot = { 133 133 + enable = true; 134 134 + gitUser = "gurt"; 135 135 + }; 133 136 }; 134 137 imperm.keep = ["/var/lib/acme"]; 135 138 };

+1 -1

nixosModules/cocoon.nix

reviewed

··· 157 157 ADDR = ":${builtins.toString conf.port}"; 158 158 CONTACT_EMAIL = conf.email; 159 159 160 160 - RELAYS = lib.join "," conf.relays; 160 160 + RELAYS = lib.join "," conf.relays; 161 161 FALLBACK_PROXY = conf.fallbackProxy; 162 162 163 163 JWK_PATH = "%d/jwk";

+5 -3

nixosModules/ssh-server.nix

reviewed

··· 14 14 openFirewall = true; 15 15 banner = let 16 16 name = lib.toUpper config.networking.hostName; 17 17 - bleh = builtins.readFile ../res/bleh.txt; 18 18 - in 19 19 - lib.replaceString "$NAME$" name bleh; 17 17 + in '' 18 18 + -= ${name} -= 19 19 + 20 20 + 21 21 + ''; 20 22 listenAddresses = [ 21 23 { 22 24 addr = "0.0.0.0";

+5 -5

nixosModules/tangled.nix

reviewed

··· 32 32 stateDir = lib.mkOption { 33 33 type = lib.types.str; 34 34 description = "runtime path to store all state for the knot"; 35 35 - default = "/var/lib/tangled/knot"; 35 35 + default = "/var/lib/tangled-knot"; 36 36 }; 37 37 }; 38 38 }; ··· 49 49 inherit (conf.knot) gitUser stateDir; 50 50 repo.scanPath = "${conf.knot.stateDir}/repos"; 51 51 server = { 52 52 - listenAddr = "127.0.0.1:${conf.knot.port}"; 53 53 - internalListenAddr = "127.0.0.1:${conf.knot.internalPort}"; 52 52 + listenAddr = "0.0.0.0:${builtins.toString conf.knot.port}"; 53 53 + internalListenAddr = "127.0.0.1:${builtins.toString conf.knot.internalPort}"; 54 54 hostname = lib.mkDefault conf.hostname; 55 55 owner = lib.mkIf config.cow.bean.enable (lib.mkDefault config.cow.bean.atproto.did); 56 56 }; ··· 60 60 services.nginx.virtualHosts.${conf.hostname} = lib.mkIf conf.knot.enable { 61 61 locations = { 62 62 "/" = { 63 63 - proxyPass = "http://localhost:${conf.knot.port}"; 63 63 + proxyPass = "http://localhost:${builtins.toString conf.knot.port}"; 64 64 recommendedProxySettings = true; 65 65 }; 66 66 "/events" = { 67 67 - proxyPass = "http://localhost:${conf.knot.port}"; 67 67 + proxyPass = "http://localhost:${builtins.toString conf.knot.port}"; 68 68 proxyWebsockets = true; 69 69 recommendedProxySettings = true; 70 70 };

-33

res/bleh.txt

reviewed

··· 1 1 - -=≡ WELCOME TO $NAME$! ≡=- 2 2 - 3 3 - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⢠⡀⢠⡄⠀⡤⠀⣤⡀⠄⠀⠀⢠⡀⠀⠀⠀⠀⠀⠀⠀⢀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣤⠤⠤⠤⢤⣤⠠⠠⡄⠠⠄⣤⡤⢤⣤⡤⠤⠤⣤⠀ 4 4 - ⠀⠲⠠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⢿⣤⣿⡆⢹⡄⢹⣓⡒⠀⠀⠘⢏⡳⢞⢲⡖⡶⠆⣾⣸⠀⠀⠀⠀⠀⠀⠀⠀⠰⣿⣿⣿⡂⢸⣿⣿⣶⡌⢋⡑⠀⣠⣼⣿⣄⡤⡤⠀⠀ 5 5 - ⠀⠀⠀⠀⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⠋⣉⣛⠀⠁⠐⣘⢢⠀⠀⠀⠛⡍⠉⠡⠐⠀⠛⠛⠘⠀⠀⠀⢠⣬⠀⠆⠀⣿⣿⣿⣿⣿⣿⡟⢿⣿⣿⠆⢈⣛⣀⡘⠀⣰⡶⠀⠀⠀ 6 6 - ⠀⠱⣆⡀⠀⢁⡄⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠻⣿⣤⠘⣁⠨⣗⠐⠶⠤⠀⡤⠤⠀⠀⠀⣘⣂⡀⠀⠀⠀⣌⠁⠆⠀⢠⣿⡿⣿⣯⣾⣿⠿⢛⣩⢴⣾⣯⡥⠴⣾⡿⡄⠀⠀⠀⠀ 7 7 - ⠀⠀⠉⠉⠀⠈⠛⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⠗⠀⠉⠀⠊⠶⠀⠀⠀⠁⢀⠀⠀⠀⢹⡿⠃⠀⠀⠀⠙⠆⠀⠀⠐⣿⣿⢿⡟⠉⢀⡶⠟⢁⣈⣶⢆⡉⢰⣿⠐⠀⠀⠀⢀⠀ 8 8 - ⠀⠀⠀⠀⢀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣄⡀⠀⢀⠀⠀⠁⠀⢁⠀⠐⣶⣠⣄⢀⣩⣦⣦⣤⣈⣁⣀⣤⣦⣼⣆⣼⣄⣤⣶⣿⠉⣈⢡⡶⣯⣵⣾⣿⣿⣿⣮⣟⣻⡏⠁⠀⠀⠀⠋⠐ 9 9 - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢾⣿⣿⣶⣶⣶⣽⣤⣮⣼⣦⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⡾⣫⣿⣾⣿⣿⣿⣿⣿⣻⣿⣶⠟⠁⠀⠀⡐⠁⠀⠀ 10 10 - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢻⣿⣿⣿⣿⣿⣿⣿⡿⣡⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠌⠀⠀⠀⠊⢄⢛⣓⠓ 11 11 - ⠀⠀⠠⠁⡀⠂⠀⠀⠀⠀⠀⠀⠀⢴⣶⣿⣿⣿⣿⣿⣿⣿⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠿⠃⠀⠀⢀⠐⠌⡂⠦⣌⢏ 12 12 - ⠀⠠⠁⠂⠄⡐⠀⠄⠀⠀⠀⡒⠶⢿⣿⣿⠟⠛⠛⠛⠛⠿⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣾⡄⠀⢀⠠⢀⠊⠤⡙⢦⡙⣮ 13 13 - ⠀⣂⠑⠈⠐⠀⠀⠀⠀⢰⠤⣣⣾⣿⣿⣿⣶⣦⣤⣤⣀⣀⣀⠀⠙⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠛⠛⠉⠉⠉⠉⠉⡛⠻⠿⠿⠀⠀⠀⢁⠂⡘⠤⣓⡬⣷⣿ 14 14 - ⠀⢀⠀⠀⠉⠀⠀⠙⠁⢀⣀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡄⠠⣈⠥⣳⡜⣷⣿⣿ 15 15 - ⠀⡈⠔⠂⠀⠀⠀⡔⠚⠟⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣇⢰⢣⢞⣱⣾⣿⣿⣿ 16 16 - ⠀⠈⠀⠀⠀⠀⠀⢀⣀⣠⡽⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠻⢿⡿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡝⣎⢯⣻⣿⣿⣿⣿ 17 17 - ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠛⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠛⠛⠻⠛⡟⣿⢻⠤⡤⠄⠈⠈⠉⠉⠁⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣏⢣⡈⢼⡡⣿⣿⣿⣿ 18 18 - ⠀⠀⠡⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣆⠀⠀⠈⣁⢛⡞⠲⠃⠀⠀⠀⠀⠀⣰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣭⣝⣋⣛⣺⢷⠿⣿⣿⣿ 19 19 - ⠀⡂⠀⠠⠈⠀⣀⣠⣤⣤⡤⠴⠶⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⡀⠘⠄⠀⠀⠀⠀⠀⠀⠀⣠⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣟⡿⠿⠟⠟⠂⠤⠉⠯⢍⣙⣻⢿⠿⣻⣿ 20 20 - ⠀⣤⡴⠖⠋⠉⠉⢉⣁⣠⣤⡴⠶⠾⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣆⠀⠀⠀⠀⠀⣀⣴⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⢋⡛⠛⠳⠶⢶⣬⣄⣊⣘⠉⠟⡿⢿ 21 21 - ⠀⣛⣠⣶⡶⠞⠛⠛⠉⠉⣀⡤⠴⢒⡒⣹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⣿⣿⣶⡿⠦⠁⠀⢐⢚⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣣⣴⣶⣤⣌⣛⠓⠶⢤⣄⣀⡈⠉⠛⠛⠿⢶⣾ 22 22 - ⠀⠛⠉⠀⠀⢀⣤⣴⣞⠫⠝⠒⠉⣡⢤⢸⣿⣿⣿⣿⣿⣿⣿⣻⣿⡿⠿⠟⠉⠀⠀⠀⠀⠠⣚⣿⠻⣿⣿⣿⣿⣿⣿⠛⢻⡽⢯⣿⠛⠁⢿⡙⠛⠾⢷⣶⡌⡙⠛⠴⡆⠤⠀⠀⠀ 23 23 - ⠀⠀⠀⣠⠶⠋⠉⠀⢀⢠⠠⠖⠋⠁⠠⣾⣿⣿⣿⣿⣿⣿⡇⢉⣀⣠⣤⣠⣾⣷⣶⣦⣷⣾⣿⣿⡧⠈⣉⡉⠛⠋⠁⢶⠮⣹⠏⠀⠀⠀⠀⠈⠉⠒⢤⣈⠉⠛⠳⣤⣤⣁⠲⢅⡀ 24 24 - ⠀⡴⠛⠉⢀⠠⡐⠰⠉⠀⡀⠄⡀⠤⢰⣿⣿⣿⣿⣿⣿⡿⢡⣾⡿⢟⣿⣿⣿⣿⣿⣿⣿⣿⣿⠘⣡⣾⣿⣿⣦⠈⠏⡏⣸⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠁⠂⠄⠀⠈⠛⢇⡀⠩ 25 25 - ⠀⠀⣠⠰⠌⠂⠁⡀⠄⠡⠐⢠⠀⠁⢸⣿⣿⣿⣿⡿⠏⣠⠞⣧⣻⣿⣽⣻⣿⣿⣿⣿⣿⡿⣟⣼⣟⣛⣿⣯⣿⣿⠂⣼⡃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠂ 26 26 - ⠀⠡⠄⡁⠂⠔⡀⠐⣈⠡⠘⢄⠂⠀⢘⣿⣿⣿⣿⠋⣀⢧⡛⣬⢳⡽⣏⡿⣶⣿⣻⣿⢿⣟⣭⣿⢿⣯⢻⢵⢯⢿⡆⠿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠀⠀⠀⠀⠀⠂⠄⠀ 27 27 - ⠀⠁⠒⠀⠉⠐⠀⠁⠐⡈⠱⠈⠆⠀⢈⣿⣿⣿⡇⢰⠉⠖⠹⢈⢳⡘⣁⠻⣉⠻⢿⡿⢿⡟⡿⣹⡏⡾⣉⡏⠾⣏⡙⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 28 28 - ⠀⠡⠒⡀⠎⣁⠂⠆⢢⠁⢆⠒⡈⠅⠘⣻⣿⣿⠁⣏⠷⣘⢧⢺⣌⢳⡙⣦⢋⡷⢺⡗⣾⣟⡷⣯⣽⣳⣭⡛⣶⠯⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⡀⠄⠀⠄⠐⠀⠀⠀ 29 29 - ⠀⢡⠘⠤⡑⠠⠌⡘⠤⡉⠦⡑⣌⠸⡀⠘⣿⣿⡆⣭⢻⡜⢎⡵⣌⢳⡙⣆⠫⡜⣽⣻⣵⢯⡿⣽⡷⢯⣞⠽⠂⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠄⡐⠈⠀⢀⠀⠀⠀ 30 30 - ⠀⢢⠘⡰⢈⠱⡈⡔⠡⢎⡱⢡⠆⡣⢽⡄⢙⣿⡇⠌⡳⣜⢣⡜⡜⢦⡹⣌⢳⡙⡶⣿⣞⣯⢿⡱⣭⢛⠈⠄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠠⠐⠈⢀⠀⠀⠀⠀ 31 31 - ⠀⢠⠃⡔⡈⢆⠱⣈⢑⡊⡔⢣⢜⡰⢣⣞⡄⢹⡧⠀⣳⢬⡓⡼⡙⢎⡱⢎⡣⣝⡳⣿⡽⢞⡫⡕⠎⢈⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠂⠌⡀⢀⠈⠀⠀ 32 32 - ⠀⠀⠈⠰⠡⠊⠔⠂⠧⠜⠜⠲⠎⠭⠣⠎⠡⠴⠿⠥⠡⠬⠳⠱⠙⠎⠱⠃⠹⠘⠱⠁⠌⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠁⠂⠐⠀⠠⠀⠀ 33 33 -