From a3e50d8b5e75d064380f1d355cb016f2340fd338 Mon Sep 17 00:00:00 2001
From: hensoko <hensoko@gssws.de>
Date: Sun, 26 Feb 2023 21:56:26 +0100
Subject: [PATCH 1/2] Update 'www/caddy/Caddyfile'

redirect pub.solar/satzung to pub.solar nextcloud
---
 www/caddy/Caddyfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/www/caddy/Caddyfile b/www/caddy/Caddyfile
index 3b913ea..258988f 100644
--- a/www/caddy/Caddyfile
+++ b/www/caddy/Caddyfile
@@ -16,6 +16,11 @@ pub.solar {
                 file_server /os/download/* browse
         }
 
+        # Statutes
+        handle /satzung {
+                redir https://cloud.pub.solar/s/2KErtaYeLn5d6MZ
+        }
+
         # serve base domain pub.solar for mastodon.pub.solar
         # https://masto.host/mastodon-usernames-different-from-the-domain-used-for-installation/
         handle /.well-known/host-meta {

From a1e2db0d3bb924dc9975ba54363ae967b6684451 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 27 Feb 2023 20:30:53 +0100
Subject: [PATCH 2/2] pub.solar now lives on flora-6

https://git.pub.solar/pub-solar/os/src/commit/359a82a28e0bf73a5d2e4d2bb32c16d08968bc5f/hosts/flora-6/caddy.nix#L19
---
 www/caddy/Caddyfile | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 www/caddy/Caddyfile

diff --git a/www/caddy/Caddyfile b/www/caddy/Caddyfile
deleted file mode 100644
index 258988f..0000000
--- a/www/caddy/Caddyfile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Caddy's configuration file
-# see: https://caddyserver.com/docs/caddyfile
-{
-        email admins@pub.solar
-}
-
-pub.solar {
-        # Uncomment for debugging
-        #log {
-        #       output stderr
-        #}
-
-        # PubSolarOS images
-        handle /os/download/* {
-                root * /srv
-                file_server /os/download/* browse
-        }
-
-        # Statutes
-        handle /satzung {
-                redir https://cloud.pub.solar/s/2KErtaYeLn5d6MZ
-        }
-
-        # serve base domain pub.solar for mastodon.pub.solar
-        # https://masto.host/mastodon-usernames-different-from-the-domain-used-for-installation/
-        handle /.well-known/host-meta {
-                redir https://mastodon.pub.solar{uri}
-        }
-
-        # pub.solar website
-        handle {
-                root * /srv/pub.solar
-                try_files {path}.html {path}
-                file_server
-        }
-
-        handle_errors {
-                respond "{http.error.status_code} {http.error.status_text}"
-        }
-}
-
-www.pub.solar {
-        redir https://pub.solar{uri}
-}