Merge pull request #508 from jfly/custom-bounce-template

Customize bounce template for mailserver

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,12 +4,11 @@ about: Suggest an improvement for this project
 title: ''
 labels: enhancement
 assignees: ''
-
 ---
 
 **Is your feature request related to a problem? Please describe.**
 
-<!-- 
+<!--
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 -->
 

.github/ISSUE_TEMPLATE/service_disruption.md

@@ -4,7 +4,6 @@ about: Use this to report service instabilities
 title: '<service-name>: '
 labels: bug
 assignees: ''
-
 ---
 
 **Affected service**
@@ -18,4 +17,3 @@ assignees: ''
 **System information**
 
 <!-- Relevant system versions. If it's a connectivity issue, `mtr` reports. -->
-

.github/workflows/ci.yml

@@ -16,10 +16,10 @@ jobs:
   nix-build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v30
-    - uses: DeterminateSystems/magic-nix-cache-action@v8
-    - run: nix run github:Mic92/nix-fast-build -- --no-nom
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v30
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
+      - run: nix run github:Mic92/nix-fast-build -- --no-nom
   # all builds combined consume too much disk space... we should soon switch to something else
   nixos:
     runs-on: ubuntu-latest
@@ -30,18 +30,18 @@ jobs:
         #machine: [caliban, umbriel]
         machine: [caliban]
     steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v30
-    - uses: DeterminateSystems/magic-nix-cache-action@v8
-    - run: nix build '.#nixosConfigurations."${{ matrix.machine }}.nixos.org".config.system.build.toplevel'
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v30
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
+      - run: nix build '.#nixosConfigurations."${{ matrix.machine }}.nixos.org".config.system.build.toplevel'
   nix-darwin:
     runs-on: macos-latest
     strategy:
       matrix:
         # Doesn't seem that x86_64 is still in use?
         machine: [arm64]
     steps:
-    - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v30
-    - uses: DeterminateSystems/magic-nix-cache-action@v8
-    - run: nix build '.#darwinConfigurations."${{ matrix.machine }}".config.system.build.toplevel'
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v30
+      - uses: DeterminateSystems/magic-nix-cache-action@v8
+      - run: nix build '.#darwinConfigurations."${{ matrix.machine }}".config.system.build.toplevel'

README.md

@@ -3,13 +3,12 @@
 This repository contains all the hardware configuration for the nixos project
 infrastructure.
 
-All the hosts are currently managed using NixOps. Some of the infrastructure
-is managed using Terraform. There are still a lot of things configured
-manually.
+All the hosts are currently managed using NixOps. Some of the infrastructure is
+managed using Terraform. There are still a lot of things configured manually.
 
 ## Docs
 
-* [Resources inventory](docs/inventory.md)
+- [Resources inventory](docs/inventory.md)
 
 ## Team
 
@@ -29,17 +28,19 @@ All the members should be watching this repository for changes.
 
 ## Regular catch up
 
-We meet regularly over Jitsi to hash some issues out. Sometimes it helps to have dedicated focus and higher communication bandwidth.
+We meet regularly over Jitsi to hash some issues out. Sometimes it helps to have
+dedicated focus and higher communication bandwidth.
 
-It started Thursday, January 11, 2024, at 6 pm CET (UTC+1), and then repeats every two weeks, on Thursdays at 6 pm CET.
+It started Thursday, January 11, 2024, at 6 pm CET (UTC+1), and then repeats
+every two weeks, on Thursdays at 6 pm CET.
 
 <a target="_blank" href="https://calendar.google.com/calendar/event?action=TEMPLATE&amp;tmeid=MDVjdjNpOG5qazhscjlna3Mxcmw0aHVzODIgam9uYXNAbnVtdGlkZS5jb20&amp;tmsrc=jonas%40numtide.com"><img border="0" src="https://www.google.com/calendar/images/ext/gc_button1_en.gif"></a>
 
 Location: <https://jitsi.lassul.us/nixos-infra>
 
 ## Reporting issues
 
-If you experience any issues with the infrastructure, please [post a new issue
-to this repository][1].
+If you experience any issues with the infrastructure, please
+[post a new issue to this repository][1].
 
 [1]: https://github.com/NixOS/nixos-org-configurations/issues/new

build/haumea/zrepl.yml

@@ -5,10 +5,10 @@
 global:
   logging:
     - type: "stdout"
-      level:  "error"
+      level: "error"
       format: "human"
     - type: "syslog"
-      level:  "info"
+      level: "info"
       format: "logfmt"
 
 # mostly from https://blog.lenny.ninja/zrepl-on-rsync-net.html
@@ -17,7 +17,7 @@ jobs:
     type: sink
     serve:
       type: stdinserver
-      client_identities: [ haumea ]
+      client_identities: [haumea]
     recv:
       placeholder:
         encryption: off

build/nginx-error-pages/503.html

@@ -1,29 +1,29 @@
 <!DOCTYPE html>
 
 <html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Hydra is down</title>
+    <style type="text/css" media="screen">
+      body {
+        font-family: Helvetica, Arial, sans-serif;
+        color: rgba(0, 0, 0, 0.7);
+      }
+    </style>
+  </head>
 
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Hydra is down</title>
-  <style type="text/css" media="screen">
-    body {
-      font-family: Helvetica, Arial, sans-serif;
-      color: rgba(0, 0, 0, 0.7);
-    }
-  </style>
-</head>
-
-<body>
-  <center>
-    <img src="/apache-errors/warning.png" alt="Warning" />
-    <p>Looks like Hydra is having some problems. Sorry about that!</p>
-    <p style="font-size: 90%;">
-      <a href="https://nixos.org/">NixOS Homepage</a> |
-      <a href="https://monitoring.nixos.org/prometheus/alerts">System Alerts</a> |
-      <a href="https://monitoring.nixos.org/grafana/">Dashboards</a> |
-      <a href="https://github.com/NixOS/nixpkgs/labels/infrastructure">Related Issues</a>
-    </p>
-  </center>
-</body>
-
+  <body>
+    <center>
+      <img src="/apache-errors/warning.png" alt="Warning" />
+      <p>Looks like Hydra is having some problems. Sorry about that!</p>
+      <p style="font-size: 90%">
+        <a href="https://nixos.org/">NixOS Homepage</a> |
+        <a href="https://monitoring.nixos.org/prometheus/alerts"
+        >System Alerts</a> |
+        <a href="https://monitoring.nixos.org/grafana/">Dashboards</a> |
+        <a href="https://github.com/NixOS/nixpkgs/labels/infrastructure"
+        >Related Issues</a>
+      </p>
+    </center>
+  </body>
 </html>

build/rhea/install.md

@@ -1,13 +1,14 @@
 # Setup
 
 ## Switch to UEFI
-First submit a support ticket asking them to enable UEFI.
-See: https://docs.hetzner.com/robot/dedicated-server/operating-systems/uefi/
+
+First submit a support ticket asking them to enable UEFI. See:
+https://docs.hetzner.com/robot/dedicated-server/operating-systems/uefi/
 
 # Correct the NVMe namespace's block size
 
-Verify the NVMe disks are formatted at the namespace level with 4096 blocks.
-See https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Hardware.html#nvme-low-level-formatting
+Verify the NVMe disks are formatted at the namespace level with 4096 blocks. See
+https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Hardware.html#nvme-low-level-formatting
 
 This disk's LBA is 512:
 
@@ -236,7 +237,8 @@ nixos-generate-config --root /mnt
 In the `configuration.nix`:
 
 1. Add `hetzner.nix` to the list of `imports` at the top.
-2. Add an authorized key and enable SSH. This will be removed later when it is imported into NixOps, so it is just for bootstrapping:
+2. Add an authorized key and enable SSH. This will be removed later when it is
+   imported into NixOps, so it is just for bootstrapping:
 
 ```
 services.openssh.enable = true;
@@ -245,24 +247,28 @@ users.users.root.openssh.authorizedKeys.keys = [ "ssh-..." ];
 
 ### Hardware Configuration Changes
 
-Edit `hardware-configuration.nix` and change the fileSystems value for `/nix/var/nix` to make it required for boot:
+Edit `hardware-configuration.nix` and change the fileSystems value for
+`/nix/var/nix` to make it required for boot:
 
 ```nix
-  fileSystems."/nix/var/nix/db" =
-    { device = "rpool/local/nix/db";
-      fsType = "zfs";
-      neededForBoot = true;
-    };
+fileSystems."/nix/var/nix/db" =
+  { device = "rpool/local/nix/db";
+    fsType = "zfs";
+    neededForBoot = true;
+  };
 ```
 
 ### Hetzner.nix
 
 Then create a file, `hetzner.nix`.
 
-* The all-zeros hostId is fine, though I generated one with `head -c4 /dev/urandom | od -A none -t x4`
-* The `enp7s0` and `MACAddress` value I got from `ip addr`
-* The IP addresses and gateways I got from the Robot webpage under the IPs tab, hovering over the IPv4 and IPv6 addresses.
-* Thee DNS resolvers I got from https://docs.hetzner.com/dns-console/dns/general/recursive-name-servers/
+- The all-zeros hostId is fine, though I generated one with
+  `head -c4 /dev/urandom | od -A none -t x4`
+- The `enp7s0` and `MACAddress` value I got from `ip addr`
+- The IP addresses and gateways I got from the Robot webpage under the IPs tab,
+  hovering over the IPv4 and IPv6 addresses.
+- Thee DNS resolvers I got from
+  https://docs.hetzner.com/dns-console/dns/general/recursive-name-servers/
 
 ```nix
 {
@@ -302,4 +308,4 @@ Then run:
 
 ```
 nixos-install -I nixpkgs=channel:nixos-21.11
-```
+```