hosts/Emitter.nix

@@ -5,6 +5,7 @@
     ];
 
     boot.loader.grub.enable = true;
+    boot.loader.grub.version = 2;
     boot.loader.grub.device = "/dev/vda";
 
     networking.hostName = "Emitter";
@@ -97,7 +98,6 @@
                     cat > $out/sbin/burp <<-EOF
                     #!/${pkgs.bash}/bin/bash
                     set -e
-                    ${pkgs.dig}/bin/nslookup rupert.gvfr.de
                     ${pkgs.unixtools.ping}/bin/ping -c1 rupert.gvfr.de >/dev/null
                     ${pkgs.openssh}/bin/ssh -i /secrets/id_burp_remote -o IdentitiesOnly=yes -o ExitOnForwardFailure=yes -L 4971:localhost:4971 burp-remote@rupert.gvfr.de -f true
                     $out/sbin/burp-untunneled \$@
@@ -121,7 +121,7 @@
     services.statusEmail.enable = true;
     systemd.services.burp-client = let
         retryDelay = 10 * 60;
-        maxRetries = 5;
+        maxRetries = 3;
     in {
         unitConfig = {
             OnFailure = "status-email@%n.service";

hosts/gitea.nix

@@ -16,6 +16,9 @@ in
             passwordFile = "/secrets/gitea_db_password";
             createDatabase = false;
         };
+        domain = "${domain}";
+        rootUrl = "https://${domain}/";
+        httpPort = 3001;
         repositoryRoot = "/data/git/repositories";
         lfs = {
             enable = true;
@@ -27,9 +30,9 @@ in
                 docutils  # Provides rendering of ReStructured Text files
                 pygments  # Provides syntax highlighting
             ]);
-            nbconvert = pkgs.python310.withPackages (ps: with ps; [
+            nbconvert =
+                pkgs.python310.withPackages (ps: with ps; [
                 jupyter
-                ipykernel
                 nbconvert
             ]);
             max_cached_jupyter_notebooks = 200;
@@ -64,12 +67,7 @@ in
             '';
         in
         {
-            server = {
-                SSH_PORT = lib.head config.services.openssh.ports;
-                ROOT_URL = "https://${domain}/";
-                HTTP_PORT = 3001;
-                DOMAIN = "${domain}";
-            };
+            server.SSH_PORT = lib.head config.services.openssh.ports;
             service.DISABLE_REGISTRATION = true;
             session.COOKIE_SECURE = true;
             "markup.restructuredtext" = {
@@ -81,7 +79,7 @@ in
             "markup.jupyter" = {
                 ENABLED = true;
                 FILE_EXTENSIONS = ".ipynb";
-                # RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
+                #RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
                 RENDER_COMMAND = "\"${cached_jupyter_preview} \"";
                 IS_INPUT_FILE = true;
                 # RENDER_CONTENT_MODE = "iframe";