move caddy configurations to /etc/caddy
This commit is contained in:
parent
d1c10a732f
commit
afdc95bbb1
GPG key ID:
8ECFA045E63BC583
7 changed files with 3 additions and 2 deletions
|
|
@ -7,7 +7,7 @@ services:
|
|||
cap_add:
|
||||
- NET_ADMIN
|
||||
volumes:
|
||||
- ./conf:/etc/caddy # configurations
|
||||
- /etc/caddy:/etc/caddy # configurations
|
||||
- ./caddy_data:/data # internal caddy data
|
||||
- ./caddy_config:/config # ^
|
||||
- /srv/docker/mastodon/public:/srv/docker/mastodon/public # mastodon web frontend
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
# ╭──────────────────────────────────────────────────────────╮
|
||||
# │ _ _ │
|
||||
# │ _ __ | |__ ___ ___ _ __ | |__ ___ _ __ _ _ ___ │
|
||||
# │ | '_ \| '_ \ / _ \/ __| '_ \| '_ \ / _ \| '__| | | / __| │
|
||||
# │ | |_) | | | | (_) \__ \ |_) | | | | (_) | | | |_| \__ \ │
|
||||
# │ | .__/|_| |_|\___/|___/ .__/|_| |_|\___/|_| \__,_|___/ │
|
||||
# │ |_| |_| │
|
||||
# ╰──────────────────────────────────────────────────────────╯
|
||||
# caddy configurations for phosphorus
|
||||
|
||||
# =============================================================================
|
||||
|
||||
# ╭────────────────────────────────╮
|
||||
# │ commonly reused rules/snippets │
|
||||
# ╰────────────────────────────────╯
|
||||
|
||||
# common settings - globally enables settings that are commonly used in every snippet
|
||||
(common-settings) {
|
||||
encode zstd gzip
|
||||
}
|
||||
|
||||
# log - reused log settings
|
||||
(log) {
|
||||
log {
|
||||
output file /var/log/caddy/{args[0]} {
|
||||
roll_size 10MB
|
||||
roll_keep 3
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# robots-txt - link /robots.txt to the same file
|
||||
(robots-txt) {
|
||||
handle_path /robots.txt {
|
||||
root * /var/www/robots.txt
|
||||
file_server
|
||||
}
|
||||
}
|
||||
|
||||
# =============================================================================
|
||||
|
||||
# ╭──────────────────────────╮
|
||||
# │ main/general information │
|
||||
# ╰──────────────────────────╯
|
||||
|
||||
{
|
||||
email merp@merpmerp.merp
|
||||
import log caddy
|
||||
}
|
||||
|
||||
# ╭───────────────────────────────────────────────────────────────────────────╮
|
||||
# │ do an nginx and seperate snippets for sites into /etc/caddy/sites-enabled │
|
||||
# ╰───────────────────────────────────────────────────────────────────────────╯
|
||||
# to "disable" anything, just move the file to /etc/caddy/sites-disabled and reload caddy
|
||||
|
||||
import /etc/caddy/sites-enabled/*
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
# mastodon (chuckya) frontend
|
||||
masto.beeping.synth.download, masto.booping.synth.download {
|
||||
root * /var/www/fedi-frontends/chuckya-fe
|
||||
file_server
|
||||
try_files {path} /
|
||||
|
||||
handle_path /favicon.png {
|
||||
root * /var/www/site/assets/synth.download/synth.png
|
||||
file_server
|
||||
import common-settings
|
||||
}
|
||||
|
||||
handle_path /packs {
|
||||
root * /var/www/fedi-frontends/chuckya-fe/packs
|
||||
file_server
|
||||
import common-settings
|
||||
}
|
||||
|
||||
import common-settings
|
||||
import log mastofe
|
||||
import robots-txt
|
||||
}
|
||||
|
||||
# akkoma fe for iceshrimp
|
||||
akko.beeping.synth.download {
|
||||
# redirect api endpoints to iceshrimp
|
||||
@redir {
|
||||
path /oauth/*
|
||||
path /api/*
|
||||
path /nodeinfo/*
|
||||
}
|
||||
handle @redir {
|
||||
reverse_proxy 127.0.0.1:24042
|
||||
import common-settings
|
||||
}
|
||||
|
||||
# favicon
|
||||
handle_path /favicon.png {
|
||||
root * /var/www/site/assets/synth.download/synth.png
|
||||
file_server
|
||||
import common-settings
|
||||
}
|
||||
|
||||
# akkoma frontend
|
||||
handle {
|
||||
header Cache-Control "max-age=3600"
|
||||
try_files {path} /
|
||||
root * /var/www/fedi-frontends/akkoma-fe
|
||||
file_server
|
||||
import common-settings
|
||||
}
|
||||
handle_path /static/* {
|
||||
header Cache-Control "max-age=3600"
|
||||
root * /var/www/fedi-frontends/akkoma-fe/static
|
||||
file_server
|
||||
import common-settings
|
||||
}
|
||||
|
||||
import common-settings
|
||||
import log akkofe
|
||||
import robots-txt
|
||||
}
|
||||
|
||||
# phanpy
|
||||
phanpy.beeping.synth.download, phanpy.booping.synth.download {
|
||||
root * /var/www/fedi-frontends/phanpy
|
||||
file_server
|
||||
try_files {path} /
|
||||
|
||||
import common-settings
|
||||
import log phanpy
|
||||
import robots-txt
|
||||
}
|
||||
|
||||
# pl-fe
|
||||
pl-fe.beeping.synth.download, pl-fe.booping.synth.download {
|
||||
root * /var/www/fedi-frontends/pl-fe
|
||||
file_server
|
||||
try_files {path} /
|
||||
|
||||
import common-settings
|
||||
import log pl-fe
|
||||
import robots-txt
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
beeping.synth.download {
|
||||
reverse_proxy 127.0.0.1:24042
|
||||
|
||||
# favicon stuff
|
||||
handle_path /assets/synth.download/synth.png {
|
||||
root * /var/www/site/assets/synth.download/synth.png
|
||||
file_server
|
||||
import common-settings
|
||||
}
|
||||
|
||||
import common-settings
|
||||
import log iceshrimp
|
||||
import robots-txt
|
||||
}
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
merping.synth.download {
|
||||
@local {
|
||||
file
|
||||
not path /
|
||||
}
|
||||
@local_media {
|
||||
path_regexp /system/(.*)
|
||||
}
|
||||
@streaming {
|
||||
path /api/v1/streaming
|
||||
path /api/v1/streaming/*
|
||||
}
|
||||
@cache_control {
|
||||
path_regexp ^/(emoji|packs|/system/accounts/avatars|/system/media_attachments/files)
|
||||
}
|
||||
|
||||
root * /srv/docker/mastodon/public
|
||||
|
||||
handle_errors {
|
||||
rewrite 500.html
|
||||
file_server
|
||||
}
|
||||
|
||||
header {
|
||||
Strict-Transport-Security "max-age=31536000"
|
||||
}
|
||||
header /sw.js Cache-Control "public, max-age=0"
|
||||
header @cache_control Cache-Control "public, max-age=31536000, immutable"
|
||||
|
||||
handle @local {
|
||||
file_server
|
||||
}
|
||||
|
||||
handle @streaming {
|
||||
reverse_proxy 127.0.0.1:58834 {
|
||||
header_up Accept-Encoding identity
|
||||
}
|
||||
}
|
||||
|
||||
reverse_proxy 127.0.0.1:46098 {
|
||||
header_up Accept-Encoding identity
|
||||
header_up X-Forwarded-Port 443
|
||||
|
||||
transport http {
|
||||
keepalive 5s
|
||||
keepalive_idle_conns 10
|
||||
}
|
||||
}
|
||||
|
||||
import common-settings
|
||||
import log mastodon
|
||||
import robots-txt
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
*.pds.synth.download, pds.synth.download {
|
||||
#root * /var/www/pds-dash
|
||||
file_server
|
||||
|
||||
# since we utilize pds-dash to provide a proper "frontend" page for the pds, we need to manually redirect all known endpoints back to the pds
|
||||
# probably a better way to do this; haven't discovered it yet
|
||||
reverse_proxy /xrpc/* 127.0.0.1:24318
|
||||
reverse_proxy /oauth/* 127.0.0.1:24318
|
||||
reverse_proxy /.well-known/* 127.0.0.1:24318
|
||||
reverse_proxy /@atproto/* 127.0.0.1:24318
|
||||
|
||||
import common-settings
|
||||
import log pds
|
||||
import robots-txt
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
booping.synth.download {
|
||||
import common-settings
|
||||
import log sharkey
|
||||
import robots-txt
|
||||
|
||||
@activity_pub `header({'Content-Type': 'application/activity+json*'}) || header({'Content-Type': 'application/ld+json*'}) || header({'Accept': 'application/activity+json*'}) || header({'Accept': 'application/ld+json*'})`
|
||||
|
||||
route {
|
||||
# media service
|
||||
reverse_proxy /files/* 127.0.0.1:57378
|
||||
reverse_proxy /avatar/* 127.0.0.1:57378
|
||||
reverse_proxy /url 127.0.0.1:57378
|
||||
reverse_proxy /twemoji-badge/* 127.0.0.1:57378
|
||||
reverse_proxy /identicon/* 127.0.0.1:57378
|
||||
|
||||
# activitypub service
|
||||
reverse_proxy @activity_pub 127.0.0.1:47815
|
||||
reverse_proxy /api/v2/search 127.0.0.1:47815
|
||||
reverse_proxy /api/admin/federation/refresh-remote-instance-metadata 127.0.0.1:47815
|
||||
reverse_proxy /api/notes/polls/refresh 127.0.0.1:47815
|
||||
reverse_proxy /api/federation/update-remote-user 127.0.0.1:47815
|
||||
reverse_proxy /api/ap/get 127.0.0.1:47815
|
||||
reverse_proxy /api/ap/show 127.0.0.1:47815
|
||||
|
||||
# api + web frontend (+ general fallback)
|
||||
reverse_proxy 127.0.0.1:60628
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue