Compare commits
	
		
			17 Commits
		
	
	
		
			minecraft-
			...
			errorpages
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 914458d4b0 | |||
| 3faad36418 | |||
| 0b74907f76 | |||
| bacfdeff23 | |||
| 9e51bdb373 | |||
| df5557698f | |||
| c7930b793a | |||
| dbe9dbe6f4 | |||
| 2e75f31d3e | |||
| 1166161858 | |||
| a0164a4038 | |||
| 470cc451e0 | |||
| a803de2b23 | |||
| 1dc78b6101 | |||
| 54434b7f93 | |||
| 736dc44008 | |||
| 9e68287f1b | 
| @@ -1,4 +1,9 @@ | ||||
| { pkgs, lib, fp, ... }: | ||||
| { | ||||
|   pkgs, | ||||
|   lib, | ||||
|   fp, | ||||
|   ... | ||||
| }: | ||||
|  | ||||
| { | ||||
|   imports = [ | ||||
| @@ -8,6 +13,7 @@ | ||||
|     ./networking.nix | ||||
|     ./nix.nix | ||||
|     ./vm.nix | ||||
|     ./flake-input-exporter.nix | ||||
|  | ||||
|     ./services/acme.nix | ||||
|     ./services/uptimed.nix | ||||
| @@ -57,11 +63,11 @@ | ||||
|   # home-manager usually handles this for you: https://github.com/nix-community/home-manager/blob/22a36aa709de7dd42b562a433b9cefecf104a6ee/modules/programs/bash.nix#L203-L209 | ||||
|   # btw, programs.bash.shellInit just goes into environment.shellInit which in turn goes into /etc/profile, spooky shit | ||||
|   programs.bash.shellInit = '' | ||||
|    if [ -n "''${BASH_VERSION:-}" ]; then | ||||
|      if [[ ! -f ~/.bash_profile && ! -f ~/.bash_login ]]; then | ||||
|       [[ -f ~/.bashrc ]] && . ~/.bashrc | ||||
|      fi | ||||
|    fi | ||||
|     if [ -n "''${BASH_VERSION:-}" ]; then | ||||
|       if [[ ! -f ~/.bash_profile && ! -f ~/.bash_login ]]; then | ||||
|        [[ -f ~/.bashrc ]] && . ~/.bashrc | ||||
|       fi | ||||
|     fi | ||||
|   ''; | ||||
|  | ||||
|   programs.zsh.enable = true; | ||||
|   | ||||
							
								
								
									
										55
									
								
								base/flake-input-exporter.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										55
									
								
								base/flake-input-exporter.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,55 @@ | ||||
| { | ||||
|   config, | ||||
|   inputs, | ||||
|   lib, | ||||
|   pkgs, | ||||
|   values, | ||||
|   ... | ||||
| }: | ||||
| let | ||||
|   data = lib.flip lib.mapAttrs inputs ( | ||||
|     name: input: { | ||||
|       inherit (input) | ||||
|         lastModified | ||||
|         ; | ||||
|     } | ||||
|   ); | ||||
|   folder = pkgs.writeTextDir "share/flake-inputs" ( | ||||
|     lib.concatMapStringsSep "\n" ( | ||||
|       { name, value }: ''nixos_last_modified_input{flake="${name}"} ${toString value.lastModified}'' | ||||
|     ) (lib.attrsToList data) | ||||
|   ); | ||||
|   port = 9102; | ||||
| in | ||||
| { | ||||
|   services.nginx.virtualHosts."${config.networking.fqdn}-nixos-metrics" = { | ||||
|     serverName = config.networking.fqdn; | ||||
|     serverAliases = [ | ||||
|       "${config.networking.hostName}.pvv.org" | ||||
|     ]; | ||||
|     locations."/metrics" = { | ||||
|       root = "${folder}/share"; | ||||
|       tryFiles = "/flake-inputs =404"; | ||||
|       extraConfig = '' | ||||
|         default_type text/plain; | ||||
|       ''; | ||||
|     }; | ||||
|     listen = [ | ||||
|       { | ||||
|         inherit port; | ||||
|         addr = "0.0.0.0"; | ||||
|       } | ||||
|     ]; | ||||
|     extraConfig = '' | ||||
|       allow ${values.hosts.ildkule.ipv4}/32; | ||||
|       allow ${values.hosts.ildkule.ipv6}/128; | ||||
|       allow 127.0.0.1/32; | ||||
|       allow ::1/128; | ||||
|       allow 129.241.210.128/25; | ||||
|       allow 2001:700:300:1900::/64; | ||||
|       deny all; | ||||
|     ''; | ||||
|   }; | ||||
|  | ||||
|   networking.firewall.allowedTCPPorts = [ port ]; | ||||
| } | ||||
							
								
								
									
										58
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										58
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							| @@ -7,11 +7,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1752113600, | ||||
|         "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", | ||||
|         "lastModified": 1758287904, | ||||
|         "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", | ||||
|         "owner": "nix-community", | ||||
|         "repo": "disko", | ||||
|         "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", | ||||
|         "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
| @@ -27,11 +27,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1736621371, | ||||
|         "narHash": "sha256-45UIQSQA7R5iU4YWvilo7mQbhY1Liql9bHBvYa3qRI0=", | ||||
|         "lastModified": 1758384693, | ||||
|         "narHash": "sha256-zakdGo9micgEXGiC5Uq0gE5GkHtX12qaRYLcstKPek4=", | ||||
|         "ref": "refs/heads/main", | ||||
|         "rev": "3729796c1213fe76e568ac28f1df8de4e596950b", | ||||
|         "revCount": 20, | ||||
|         "rev": "5f6a462d87cbe25834e8f31283f39fb46c9c3561", | ||||
|         "revCount": 21, | ||||
|         "type": "git", | ||||
|         "url": "https://git.pvv.ntnu.no/Grzegorz/gergle.git" | ||||
|       }, | ||||
| @@ -48,11 +48,11 @@ | ||||
|         "rust-overlay": "rust-overlay" | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1752258704, | ||||
|         "narHash": "sha256-pRK99+MCgkeVptbJxXhVMXIXl8uwSdkZDpQzFi3OgkA=", | ||||
|         "lastModified": 1758919016, | ||||
|         "narHash": "sha256-TSJMOWq9dO7P1iQB4httzWwAtpM1veacLcaS7FAyTpo=", | ||||
|         "ref": "refs/heads/main", | ||||
|         "rev": "9ff525339b62855d53a44b4dc0154a33ac19e44d", | ||||
|         "revCount": 48, | ||||
|         "rev": "c87263b784954d20485d108e70934c9316935d75", | ||||
|         "revCount": 51, | ||||
|         "type": "git", | ||||
|         "url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git" | ||||
|       }, | ||||
| @@ -159,11 +159,11 @@ | ||||
|     }, | ||||
|     "nixpkgs": { | ||||
|       "locked": { | ||||
|         "lastModified": 1752439653, | ||||
|         "narHash": "sha256-mG27U2CFuggpAuozOu/4XAMKaOtJxzJVzdEemjQEBgg=", | ||||
|         "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", | ||||
|         "lastModified": 1760254360, | ||||
|         "narHash": "sha256-Npp92Joy2bRyickrrVP9+85z31aGS8kVNiLlKvd5pC4=", | ||||
|         "rev": "bafe987a29b8bea2edbb3aba76b51464b3d222f0", | ||||
|         "type": "tarball", | ||||
|         "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.806304.dfcd5b901dba/nixexprs.tar.xz" | ||||
|         "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.811161.bafe987a29b8/nixexprs.tar.xz" | ||||
|       }, | ||||
|       "original": { | ||||
|         "type": "tarball", | ||||
| @@ -172,11 +172,11 @@ | ||||
|     }, | ||||
|     "nixpkgs-unstable": { | ||||
|       "locked": { | ||||
|         "lastModified": 1752439402, | ||||
|         "narHash": "sha256-xDfOnjnKStgsgcn9SFPgOV6qzwac4JvGKYyfR++49Pw=", | ||||
|         "rev": "b47d4f01d4213715a1f09b999bab96bb6a5b675e", | ||||
|         "lastModified": 1760252326, | ||||
|         "narHash": "sha256-5v32B25kSE++E+KtP4DO687r/AlWL9qOlOjtYyfcDSw=", | ||||
|         "rev": "66e5020bfe0af40ffa127426f8405edbdadbb40b", | ||||
|         "type": "tarball", | ||||
|         "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre829909.b47d4f01d421/nixexprs.tar.xz" | ||||
|         "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre876242.66e5020bfe0a/nixexprs.tar.xz" | ||||
|       }, | ||||
|       "original": { | ||||
|         "type": "tarball", | ||||
| @@ -210,11 +210,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1755475409, | ||||
|         "narHash": "sha256-9nzP3rpYNWNXtGQnGUS+WjeDkhFiTOBwxoJL9bMi1w0=", | ||||
|         "lastModified": 1757332682, | ||||
|         "narHash": "sha256-4p4aVQWs7jHu3xb6TJlGik20lqbUU/Fc0/EHpzoRlO0=", | ||||
|         "ref": "refs/heads/main", | ||||
|         "rev": "617a799ad8e365192084e51de25cb6f8260668ae", | ||||
|         "revCount": 511, | ||||
|         "rev": "da1113341ad9881d8d333d1e29790317bd7701e7", | ||||
|         "revCount": 518, | ||||
|         "type": "git", | ||||
|         "url": "https://git.pvv.ntnu.no/Projects/nettsiden.git" | ||||
|       }, | ||||
| @@ -248,11 +248,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1752201818, | ||||
|         "narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=", | ||||
|         "lastModified": 1758335443, | ||||
|         "narHash": "sha256-2jaGMj32IckpZgBjn7kG4zyJl66T+2A1Fn2ppkHh91o=", | ||||
|         "owner": "oxalica", | ||||
|         "repo": "rust-overlay", | ||||
|         "rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d", | ||||
|         "rev": "f1ccb14649cf87e48051a6ac3a571b4a57d84ff3", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
| @@ -268,11 +268,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1751606940, | ||||
|         "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", | ||||
|         "lastModified": 1760240450, | ||||
|         "narHash": "sha256-sa9bS9jSyc4vH0jSWrUsPGdqtMvDwmkLg971ntWOo2U=", | ||||
|         "owner": "Mic92", | ||||
|         "repo": "sops-nix", | ||||
|         "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", | ||||
|         "rev": "41fd1f7570c89f645ee0ada0be4e2d3c4b169549", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|   | ||||
							
								
								
									
										99
									
								
								hosts/bekkalokk/services/500.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										99
									
								
								hosts/bekkalokk/services/500.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,99 @@ | ||||
| <!DOCTYPE html> | ||||
| <html lang="no"> | ||||
| <head> | ||||
|   <meta charset="utf-8"> | ||||
|   <title>500 – Intern serverfeil | PVV</title> | ||||
|   <meta name="viewport" content="width=device-width, initial-scale=1"> | ||||
|   <style> | ||||
|     body { | ||||
|       margin: 0; | ||||
|       padding: 0; | ||||
|       font-family: 'Open Sans', sans-serif; | ||||
|       background-color: #002244; | ||||
|       color: #f0f0f0; | ||||
|       display: flex; | ||||
|       align-items: center; | ||||
|       justify-content: center; | ||||
|       height: 100vh; | ||||
|       text-align: center; | ||||
|     } | ||||
|     .box { | ||||
|       max-width: 480px; | ||||
|       padding: 2rem; | ||||
|     } | ||||
|     .logo { | ||||
|       width: 30%; | ||||
|       height: auto; | ||||
|       margin: 0 auto 2rem; | ||||
|     } | ||||
|     h1 { | ||||
|       margin: 0 0 1rem; | ||||
|       font-size: 2.25rem; | ||||
|       font-weight: 700; | ||||
|     } | ||||
|     p { | ||||
|       margin: 0 0 1.25rem; | ||||
|       font-size: 1.05rem; | ||||
|       line-height: 1.4; | ||||
|     } | ||||
|     .error-code { | ||||
|       margin: 1.5rem 0; | ||||
|       opacity: 0.7; | ||||
|     } | ||||
|     .contact { | ||||
|       margin-top: 1.75rem; | ||||
|       font-size: 0.93rem; | ||||
|       line-height: 1.4; | ||||
|     } | ||||
|     .contact a { | ||||
|       color: #bcd025; | ||||
|       text-decoration: none; | ||||
|     } | ||||
|     ul { | ||||
|       padding: 0; | ||||
|       list-style: none; | ||||
|       margin: 0.5rem 0 0; | ||||
|     } | ||||
|     li { | ||||
|       margin: 0.35rem 0; | ||||
|     } | ||||
|   </style> | ||||
| </head> | ||||
| <body> | ||||
|   <div class="box"> | ||||
|     <div class="logo"> | ||||
|       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"> | ||||
|         <path fill="#283681" d="M0 0h200v200H0z"/> | ||||
|         <g fill="none" fill-opacity="0" stroke="#fff" stroke-width="1.1"> | ||||
|           <path d="M119.6 180H78.3"/> | ||||
|           <path d="M179.3 55.8v124.3h-55"/> | ||||
|           <path stroke-linecap="square" d="M124.6 180a2.5 2.5 0 0 0-2.5-2.5 2.5 2.5 0 0 0-2.6 2.6H78.6a2.5 2.5 0 0 0-2.5-2.6 2.5 2.5 0 0 0-2.6 2.6H19.2V19.9h160v30H175v6.2h4.3"/> | ||||
|         </g> | ||||
|         <circle cx="396.8" cy="400" r="320.3" fill="none" stroke="#fff" stroke-miterlimit="10" stroke-width="4.2" transform="scale(.25)"/> | ||||
|         <g fill="none" fill-opacity="0" stroke="#fff" stroke-width="1.1"> | ||||
|           <path stroke-linejoin="bevel" d="M128.6 43.4h-86v113.3h113.2V53.8l-9.7-10.5h-6.8L137 45h-5.4"/> | ||||
|           <path d="M131.6 83c0 1.9-1.3 3.4-3 3.4H57c-1.6 0-3-1.6-3-3.5v-36c0-1.9 1.4-3.4 3-3.4h71.7c1.7 0 3 1.5 3 3.4z"/> | ||||
|           <path d="M131.7 83.4a3 3 0 0 1-3 3H74.2a3 3 0 0 1-3-3v-37a3 3 0 0 1 3-3h54.5a3 3 0 0 1 3 3zm12.8 70a3 3 0 0 1-3 3H56.9a3 3 0 0 1-3-3V95.3a3 3 0 0 1 3-3h84.6a3 3 0 0 1 3 3zM45 147.6h6.4v5.7H45zm101.9 0h6.4v5.7H147z"/> | ||||
|           <path d="M108.4 48.4h16.2v34.4h-16.2z"/> | ||||
|         </g> | ||||
|         <path fill="#fff" stroke="#fff" stroke-miterlimit="10" stroke-width="4.2" d="M275 541.6c0 3.5 2.7 6.4 6.2 6.4 3.6 0 6.5-2.9 6.5-6.4v-31h30.8c10.5 0 19.2-8.7 19.2-19.2v-22.7c0-10.3-8.7-19-19.2-19H275zm12.7-43.8v-35.4h30.8c3.3 0 6.5 3 6.5 6.3v22.7c0 3.6-3 6.5-6.5 6.5zm78.3-19 25.3 65.2a6.4 6.4 0 0 0 12 0l25.4-65.3V456c0-3.4-2.9-6.3-6.4-6.3a6.3 6.3 0 0 0-6.3 6.3v20.3l-18.6 47.6-18.7-47.6V456c0-3.4-2.9-6.3-6.4-6.3a6.3 6.3 0 0 0-6.3 6.3zm91 0 25.4 65.2a6.4 6.4 0 0 0 12 0l25.4-65.3V456c0-3.4-2.9-6.3-6.4-6.3a6.3 6.3 0 0 0-6.3 6.3v20.3l-18.7 47.6-18.6-47.6V456c0-3.4-3-6.3-6.5-6.3a6.3 6.3 0 0 0-6.3 6.3z" transform="scale(.25)"/> | ||||
|       </svg> | ||||
|     </div> | ||||
|  | ||||
|     <h1>50X: Intern serverfeil</h1> | ||||
|     <p>Beklager, noe gikk galt.</p> | ||||
|     <p>Vennligst prøv igjen senere eller gå til forsiden.</p> | ||||
|     <div class="error-code">Feilkode: 50X</div> | ||||
|  | ||||
|     <div class="contact"> | ||||
|       <p>Kontakt drift hvis problemet vedvarer:</p> | ||||
|       <ul> | ||||
|         <li><strong>Discord:</strong> <a href="https://discord.gg/pyDDFpbG2x" target="_blank">discord.gg/pyDDFpbG2x</a></li> | ||||
|         <li><strong>Matrix:</strong> <a href="https://matrix.to/#/#pvv:pvv.ntnu.no" target="_blank">#pvv:pvv.ntnu.no</a></li> | ||||
|         <li><strong>E‑post:</strong> <a href="mailto:drift@pvv.ntnu.no">drift@pvv.ntnu.no</a></li> | ||||
|       </ul> | ||||
|     </div> | ||||
|   </div> | ||||
| </body> | ||||
| </html> | ||||
|  | ||||
| @@ -1,4 +1,10 @@ | ||||
| { pkgs, config, ... }: | ||||
| { | ||||
|   services.nginx.enable = true; | ||||
|   services.nginx = { | ||||
|     enable = true; | ||||
|     appendHttpConfig = '' | ||||
|       error_page 500 502 503 504 /500.html; | ||||
|     ''; | ||||
|   }; | ||||
|   environment.etc."nginx/html/500.html".source = ./500.html; | ||||
| } | ||||
|   | ||||
| @@ -122,5 +122,17 @@ in { | ||||
|       "/diverse/abuse.php".return = "301 https://wiki.pvv.ntnu.no/wiki/CERT/Abuse"; | ||||
|       "/nerds/".return = "301 https://wiki.pvv.ntnu.no/wiki/Nerdepizza"; | ||||
|     }; | ||||
|  | ||||
|  | ||||
|     extraConfig = '' | ||||
|       error_page 500 502 503 504 /500.html; | ||||
|     ''; | ||||
|     locations."/500.html" = { | ||||
|       root = "/etc/static/nginx/html"; | ||||
|       extraConfig = '' | ||||
|         internal; | ||||
|       ''; | ||||
|     }; | ||||
|  | ||||
|   }; | ||||
| } | ||||
|   | ||||
| @@ -77,14 +77,14 @@ in | ||||
|         outbound = true; | ||||
|         urlPrefix = "https://hookshot.pvv.ntnu.no/webhook/"; | ||||
|         userIdPrefix = "_webhooks_"; | ||||
|         allowJsTransformationFunctions = false; | ||||
|         allowJsTransformationFunctions = true; | ||||
|         waitForComplete = false; | ||||
|       }; | ||||
|       feeds = { | ||||
|         enabled = true; | ||||
|         pollIntervalSeconds = 600; | ||||
|       }; | ||||
|        | ||||
|  | ||||
|       serviceBots = [ | ||||
|         { localpart = "bot_feeds"; | ||||
|           displayname = "Aya"; | ||||
| @@ -94,6 +94,11 @@ in | ||||
|         } | ||||
|       ]; | ||||
|  | ||||
|       widgets = { | ||||
|         roomSetupWidget.addOnInvite = false; | ||||
|         publicUrl = "https://hookshot.pvv.ntnu.no/widgetapi/v1/static"; | ||||
|       }; | ||||
|  | ||||
|       permissions = [ | ||||
|         # Users of the PVV Server | ||||
|         { actor = "pvv.ntnu.no"; | ||||
| @@ -128,6 +133,7 @@ in | ||||
|  | ||||
|   services.nginx.virtualHosts."hookshot.pvv.ntnu.no" = { | ||||
|     enableACME = true; | ||||
|     addSSL = true; | ||||
|     locations."/" = { | ||||
|       proxyPass = "http://${webhookListenAddress}:${toString webhookListenPort}"; | ||||
|     }; | ||||
|   | ||||
| @@ -7,6 +7,10 @@ in | ||||
|     mode = "600"; | ||||
|   }; | ||||
|  | ||||
|   sops.secrets."minecraft-heatmap/postgres-passwd" = { | ||||
|     mode = "600"; | ||||
|   }; | ||||
|  | ||||
|   services.minecraft-heatmap = { | ||||
|     enable = true; | ||||
|     database = { | ||||
| @@ -14,7 +18,7 @@ in | ||||
|       port = 5432; | ||||
|       name = "minecraft_heatmap"; | ||||
|       user = "minecraft_heatmap"; | ||||
|       passwordFile = pkgs.writeText "minecraft-heatmap-password.txt" "1234"; | ||||
|       passwordFile = config.sops.secrets."minecraft-heatmap/postgres-passwd".path; | ||||
|     }; | ||||
|   }; | ||||
|  | ||||
|   | ||||
| @@ -8,25 +8,26 @@ | ||||
|  | ||||
|   defaultNodeExporterPort = 9100; | ||||
|   defaultSystemdExporterPort = 9101; | ||||
|   defaultNixosExporterPort = 9102; | ||||
| in { | ||||
|   services.prometheus.scrapeConfigs = [{ | ||||
|     job_name = "base_info"; | ||||
|     static_configs = [ | ||||
|       (mkHostScrapeConfig "ildkule" [ cfg.exporters.node.port cfg.exporters.systemd.port ]) | ||||
|       (mkHostScrapeConfig "ildkule" [ cfg.exporters.node.port cfg.exporters.systemd.port defaultNixosExporterPort ]) | ||||
|  | ||||
|       (mkHostScrapeConfig "bekkalokk" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "bicep" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "brzeczyszczykiewicz" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "georg" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "kommode" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "ustetind" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "wenche" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "bekkalokk" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "bicep" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "brzeczyszczykiewicz" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "georg" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "kommode" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "ustetind" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "wenche" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|  | ||||
|       (mkHostScrapeConfig "lupine-1" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-1" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       # (mkHostScrapeConfig "lupine-2" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-3" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-4" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-5" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-3" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-4" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-5" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|  | ||||
|       (mkHostScrapeConfig "hildring" [ defaultNodeExporterPort ]) | ||||
|       (mkHostScrapeConfig "isvegg" [ defaultNodeExporterPort ]) | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| { config, values, lib, unstablePkgs, ... }: | ||||
| { config, values, lib, pkgs, unstablePkgs, ... }: | ||||
| let | ||||
|   cfg = config.services.gitea; | ||||
|   domain = "git.pvv.ntnu.no"; | ||||
| @@ -159,8 +159,17 @@ in { | ||||
|  | ||||
|   environment.systemPackages = [ cfg.package ]; | ||||
|  | ||||
|   systemd.services.gitea.serviceConfig.Type = lib.mkForce "notify"; | ||||
|  | ||||
|   systemd.services.gitea.serviceConfig.WatchdogSec = "60"; | ||||
|  | ||||
|   systemd.services.gitea.serviceConfig.CPUSchedulingPolicy = "batch"; | ||||
|  | ||||
|   systemd.services.gitea.serviceConfig.CacheDirectory = "gitea/repo-archive"; | ||||
|   systemd.services.gitea.serviceConfig.BindPaths = [ | ||||
|     "%C/gitea/repo-archive:${cfg.stateDir}/data/repo-archive" | ||||
|   ]; | ||||
|  | ||||
|   services.nginx.virtualHosts."${domain}" = { | ||||
|     forceSSL = true; | ||||
|     enableACME = true; | ||||
| @@ -184,4 +193,31 @@ in { | ||||
|   }; | ||||
|  | ||||
|   networking.firewall.allowedTCPPorts = [ sshPort ]; | ||||
|  | ||||
|   systemd.services.gitea-dump = { | ||||
|     serviceConfig.ExecStart = let | ||||
|       args = lib.cli.toGNUCommandLineShell { } { | ||||
|         type = cfg.dump.type; | ||||
|  | ||||
|         # This should be declarative on nixos, no need to backup. | ||||
|         skip-custom-dir = true; | ||||
|  | ||||
|         # This can be regenerated, no need to backup | ||||
|         skip-index = true; | ||||
|  | ||||
|         # Logs are stored in the systemd journal | ||||
|         skip-log = true; | ||||
|       }; | ||||
|     in lib.mkForce "${lib.getExe cfg.package} ${args}"; | ||||
|  | ||||
|     # Only keep n backup files at a time | ||||
|     postStop = let | ||||
|       cu = prog: "'${lib.getExe' pkgs.coreutils prog}'"; | ||||
|       backupCount = 3; | ||||
|     in '' | ||||
|       for file in $(${cu "ls"} -t1 '${cfg.dump.backupDir}' | ${cu "sort"} --reverse | ${cu "tail"} -n+${toString (backupCount + 1)}); do | ||||
|         ${cu "rm"} "$file" | ||||
|       done | ||||
|       ''; | ||||
|   }; | ||||
| } | ||||
|   | ||||
| @@ -6,6 +6,7 @@ mysql: | ||||
| gickup: | ||||
|     github-token: ENC[AES256_GCM,data:H/yBDLIvEXunmaUha3c2vUWKLRIbl9QrC0t13AQDRCTnrvhabeiUFLNxZ/F+4B6sZ2aPSgZoB69WwnHvh1wLdiFp1qLWKW/jQPvzZOxE4n+jXrnSOutUWktbPzVj,iv:KFW4jRru93JIl9doVFtcNkJDWp89NlzWjPDflHxcL/U=,tag:YtgyRxkoZO9MkuP3DJh7zA==,type:str] | ||||
| minecraft-heatmap: | ||||
|     postgres-passwd: ENC[AES256_GCM,data:T8s9xct07AJ4/Z6MQjNrqZQq7FerHz8Op+ea8zO2MDLPWWgU7/hBfrr+T4sc1TgT3e5vtE0dVcqCSbZCZj+6zQ==,iv:prx6d8c92OvbL8IjBLAvi1Vqk69D6ZIkAp7E8CSljok=,tag:UA5YS4YwViYZJ2PWzIIM3g==,type:str] | ||||
|     ssh-key: | ||||
|         private: ENC[AES256_GCM,data:h9OtD6hxrxyokFDe9bveAkMICrs3YrsAEqg0RVHV+xCkgkNAdoh85wb1QI8FJ0tga4Bfq8ZxZTdMnexQvbYWL8m/N/P6gWoPPJd7dwGuxaUZu5lqngVuHIhH0yWFWtPXjQ0Zyl5Q1aBKyjzJMvJc/H2iprgVH4YFs/fWf/KDEp17Plvvz0AoPGPrOZErDmne4MtLbW3pUm1r5ACo/41OyXYwjHk1Ywgsoz1CMxe/DrmkADnf7jSDWL6Q0mz8hIIYi8GbToJS4BIJ2plttraxV9sqpIPzS/1jMERNchItlkCppSYIy/eohVmskP8dAySm5Z7HNGGtzWSSGLxq15xKc7OVFYPMI+B35nPnp1LVOUWqBHAqVo7dwxc3VXOlVat7AMknUZnr67d4TIIl5BOdy/rvAxzXS/fDV0zntIs5o3phKStVvq07eZFaOVva45B7Pyyn0PdBhHBt2JcBtm+Xtg9i3xvZdwQgbeeJRhnYgDqK6BVhmtTuirwp1GOyslqaFCjg0MJj+W+d8R9gbbfyFR6YrZQAkcd/o/yZGg86z7Phe18=,iv:nt/+qPBwPZKQt43VJ9FbKjLYioFwCxD7VK9WNCJCmpQ=,tag:MuDfnTiro3VVJq9x5rkEQg==,type:str] | ||||
|         public: ENC[AES256_GCM,data:+fiCO8VRSmV7tmyweYSpZJMOuMORLHkWetYbr20aTQ1vRYr927nYGes4E464t+Dv9OyJPCLmHBdgt7UvxJWuC3pZE8iStnBYnej3D4ebMzi2SMfOkJjGuQSplXtl8QeAYe1YvROmtQ==,iv:thgGQUyWdXfwUt1E/vudoNjl8JjnksFd1rb/asTry+g=,tag:t1iQPocvfI+JafuJycaLuw==,type:str] | ||||
| @@ -65,8 +66,8 @@ sops: | ||||
|             cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX | ||||
|             0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|     lastmodified: "2025-08-22T17:54:32Z" | ||||
|     mac: ENC[AES256_GCM,data:lUcE2bwdgDAAEZWSe9At8Rx5ieixboxJNw7xkXfBRo4OgnU/zp6660lwc7Q9uVQBKZxmdx9BJsGeoWh6eehbTxfJYNhUbAJB/7hnkD2HTiBR/0nJAL9iixlXxehn85QhWZ3KXWQDU9l26X4saYIF3rWvGXlM8oSkoPsPluxGfG4=,iv:0m7LpwOort5mKB0jzd4qnwOACuj/aE+8AoXSuv6Nx/s=,tag:LqxCKFYq+flQ/b361ZZSqw==,type:str] | ||||
|     lastmodified: "2025-08-25T12:27:53Z" | ||||
|     mac: ENC[AES256_GCM,data:GoJ2en7e+D4wjyPJqq7i1s8JPdgFO3wcxrtXOgSKTxi6HTibuIcP4KQcKrCMRAZmXOEL1vpnWFA2uk7S00Av7/QOnzP0Zrk3aPBM6lbB+p9XSabN0sOe1UpZDtAM3bzvS9JZzyztT5nHKvO/eV2rP71y/tYbsT6yvj7Y9zxpvKg=,iv:tQiCr7zpo7g5jZpt2VD9jtFKo32XUWs94Jay+T4XWys=,tag:npBqmlbUUfN+ztttajva3w==,type:str] | ||||
|     pgp: | ||||
|         - created_at: "2024-08-04T00:03:40Z" | ||||
|           enc: |- | ||||
|   | ||||
		Reference in New Issue
	
	Block a user