From 6c5ba885a0b655ff783fe0bb44fc3eec1be5f538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Mon, 28 Nov 2022 11:09:25 +0100
Subject: [PATCH] Use bunny-net cdn

---
 config/services/peertube/default.nix |  9 +++++++--
 zones/chir.rs.nix                    | 10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/config/services/peertube/default.nix b/config/services/peertube/default.nix
index 9de6b6ae..a525e3c6 100644
--- a/config/services/peertube/default.nix
+++ b/config/services/peertube/default.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }: {
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   services.peertube = {
     enable = true;
     localDomain = "peertube.chir.rs";
@@ -25,7 +30,7 @@
     database.createLocally = true;
     redis.createLocally = true;
   };
-  systemd.services.peertube.path = with pkgs; lib.mkForce [ bashInteractive ffmpeg_5 nodejs-16_x openssl yarn python3 coreutils systemd ];
+  systemd.services.peertube.path = with pkgs; lib.mkForce [bashInteractive ffmpeg_5 nodejs-16_x openssl yarn python3 coreutils systemd];
   services.caddy.virtualHosts."peertube.chir.rs" = {
     useACMEHost = "chir.rs";
     extraConfig = ''
diff --git a/zones/chir.rs.nix b/zones/chir.rs.nix
index ab97279d..20b89e1c 100644
--- a/zones/chir.rs.nix
+++ b/zones/chir.rs.nix
@@ -102,7 +102,7 @@ with dns.lib.combinators; let
     SOA = {
       nameServer = "ns1.chir.rs.";
       adminEmail = "lotte@chir.rs";
-      serial = 17;
+      serial = 18;
     };
     NS = [
       "ns1.chir.rs."
@@ -181,13 +181,17 @@ with dns.lib.combinators; let
       ns2 = createZone {};
       hydra = createZone {};
       mastodon = createZone {};
-      mastodon-assets = createZone {};
+      mastodon-assets.CNAME = [
+        "assets-chir-rs.b-cdn.net"
+      ];
       matrix = createZone {};
       drone = createZone {};
       invtracker = createZone {};
       akko = createZone {};
       moa = createZone {};
-      cache = createZone {};
+      cache.CNAME = [
+        "cache-chir-rs.b-cdn.net"
+      ];
       peertube = createZone {};
 
       int =