diff --git a/www/caddy/Caddyfile b/www/caddy/Caddyfile
new file mode 100644
index 0000000..342c872
--- /dev/null
+++ b/www/caddy/Caddyfile
@@ -0,0 +1,38 @@
+# Caddy's configuration file
+# see: https://caddyserver.com/docs/caddyfile
+{
+        email admins@pub.solar
+}
+
+pub.solar {
+        log {
+                output stderr
+        }
+
+        # PubSolarOS images
+        handle /os/* {
+                root * /srv
+                file_server /os/* browse
+        }
+
+        # 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}
+}