Compare commits

...

50 Commits

Author SHA1 Message Date
426afc4f79 Don't serve static assets separately 2022-07-13 18:17:40 -05:00
84470571d8 Remove metrics 2022-06-15 18:03:42 -05:00
aee17c11e3 Remove some unused config 2022-06-15 18:02:47 -05:00
34affedd0b Remove boba.best (moved to bbaovanc.com vps) 2022-05-24 23:08:43 -05:00
033ee5c253 Remove drone.boba.best 2022-05-24 23:00:31 -05:00
34131debb5 Clean up some domains 2022-05-23 03:01:37 -05:00
4c641ef08d Remove archive.boba.best 2022-05-21 16:12:56 -05:00
58ff080106 Remove log
I never ended up reading the server side logging. Even with `goaccess`,
there was too much noise from bots and crawlers.
2022-05-20 23:34:56 -05:00
047f6943a3 Add archive.boba.best 2022-05-20 23:33:21 -05:00
d66f822573 Add status.bbaovanc.com 2022-05-05 16:58:42 -05:00
e5b5f10225 Remove outdated domains: peertube and turn 2022-05-05 16:33:03 -05:00
14d2955153 Move some domains to bbaovanc.com vps 2022-05-05 16:32:41 -05:00
3f2eceb101 Use double quotes in errors/index.html 2022-05-05 16:18:44 -05:00
97c4af2318 Remove matrix.boba.best 2022-04-12 17:54:00 -05:00
39afa5b8dd Add talkyard 2022-04-12 17:53:44 -05:00
f2f6027e43 Remove a couple things 2022-01-30 17:31:09 -06:00
018dc3742c Add furry.boba.best back 2021-12-30 23:23:47 -06:00
8958017294 Add sharerepo 2021-12-20 10:24:18 -06:00
26bb61b449 Clean up some random domains I don't need anymore 2021-12-17 21:16:40 -06:00
6321e97af2 Update imports 2021-12-17 21:13:56 -06:00
e3926aa2ea Update log config 2021-12-17 21:01:01 -06:00
030bf31bca Add share.boba.best 2021-12-12 23:57:19 -06:00
47c1780ebb Add ddpe.boba.best 2021-11-19 17:36:13 -06:00
5e4f85a2c5 Update errors template 2021-11-19 17:36:02 -06:00
cd00151fbd Improve dl.sh by showing command output 2021-11-08 19:06:45 -06:00
e12a37546b Redirect remark.boba.best to remark.bbaovanc.com 2021-10-31 20:28:06 -05:00
18266d5499 Add remark.bbaovanc.com to remark.boba.best 2021-10-31 19:20:44 -05:00
d10b3caf42 Ignore goaccess 2021-10-30 16:09:36 -05:00
bd51c6316d Change peertube.boba.best to a 404 2021-10-30 00:09:01 -05:00
423585bc9a Add log + remark config 2021-10-30 00:06:10 -05:00
be8294a8b2 Set Cache-Control to no-cache on boba.best 2021-10-10 18:12:05 -05:00
af1e86b7d1 Add dorito.boba.best 2021-09-27 20:18:07 -05:00
f13cd0ba64 Remove newlines and show the actual hostname in the embed in error page 2021-09-25 15:24:29 -05:00
36351cba70 Use error image in embed for error pages (and use an img_url variable) 2021-09-25 14:59:08 -05:00
9989c740cd Add uptime-kuma 2021-09-24 18:03:12 -05:00
aaef37882b Add embed to error page & use variables 2021-09-18 21:25:26 -05:00
8e4eedc8b3 Update generic worker paths 2021-09-14 08:26:00 -05:00
0d76a6423c Add lag.matrix.boba.best 2021-09-08 17:25:33 -05:00
f4a278fae7 Update matrix config for MSC3231
947dbbdfd1 (diff-4eef4606c1f655c8f2b04944a322717d2dfe2a32f6df6df8403dad7ebdd00052)
2021-09-04 23:09:28 -05:00
d265cc7253 Add hsts snippet 2021-09-04 16:47:16 -05:00
5ec08910ce Add bin.boba.best 2021-09-04 16:29:40 -05:00
adb34de0e9 Remove status page (for now) 2021-09-03 16:15:33 -05:00
8c7ae01163 Add matrix-media-repo 2021-08-28 20:52:35 -05:00
c5ebe8bd14 Revert "Remove generic3 and generic4 workers from Matrix"
This reverts commit 317fb36149.
2021-08-27 21:39:15 -05:00
509e4fccbd Add stib.boba.best 2021-08-27 16:55:14 -05:00
317fb36149 Remove generic3 and generic4 workers from Matrix 2021-08-27 15:57:10 -05:00
b9051ddd9f Move assets in gitea to /_/static/assets (see linked PR below)
https://github.com/go-gitea/gitea/pull/15219
2021-08-25 17:22:41 -05:00
ede09f7e45 Improve error page 2021-08-21 17:18:23 -05:00
acfa066ed1 Update Matrix media worker paths
See 3692f7fd33
2021-08-19 16:49:43 -05:00
eddfb0b51d Send /createRoom on matrix.boba.best to workers
See https://github.com/matrix-org/synapse/pull/10564
2021-08-19 16:48:43 -05:00
18 changed files with 55 additions and 278 deletions

View File

@ -1,38 +1,21 @@
# vim: ft=caddyfile # vim: ft=caddyfile
{ {
grace_period 30s grace_period 30s
import email import email
} }
(basicerrors) { (basicerrors) {
# servers :443 {
# protocol {
# experimental_http3
# }
# }
#}
(basicerrors) {
handle_errors { handle_errors {
templates templates
rewrite * /index.html
rewrite * /{http.error.status_code}.jpg root * /etc/caddy/errors
root * /var/www/errors file_server
file_server
} }
} }
(hsts) { (hsts) {
handle_path /.well-known/matrix/* { header Strict-Transport-Security max-age=31536000
header Access-Control-Allow-Origin "*" }
header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
header Access-Control-Allow-Headers "Origin, X-Requested-With, Content-Type, Accept, Authorization"
rewrite * {path}.json
root * /etc/caddy/matrix_well_known
file_server
}
}
import conf.d/* import conf.d/*
import conf.d/* import conf.d/*

View File

@ -1,16 +0,0 @@
# vim: ft=caddyfile
www.boba.best {
redir https://boba.best{uri}
}
boba.best {
import matrix-well-known
header Access-Control-Allow-Origin *
root * /var/www/boba.best/public
file_server {
precompressed br gzip
}
import basicerrors
}

View File

@ -1,11 +0,0 @@
# vim: ft=caddyfile
drone.boba.best {
encode zstd gzip
reverse_proxy localhost:8081 {
header_up X-Real-IP {remote_host}
}
import basicerrors
}

View File

@ -1,12 +0,0 @@
# vim: ft=caddyfile
emotes.boba.best {
encode zstd gzip
root * /var/www/emotes.boba.best/public
file_server {
index index.json
}
import basicerrors
}

View File

@ -1,13 +0,0 @@
# vim: ft=caddyfile
flower.boba.best {
encode zstd gzip
root * /var/www/flower.boba.best
handle {
rewrite * /flowerpet.gif
file_server
}
import basicerrors
}

View File

@ -1,13 +0,0 @@
# vim: ft=caddyfile
furry.boba.best {
encode zstd gzip
root * /var/www/furry.boba.best
handle {
rewrite * /alien_furry.gif
file_server
}
import basicerrors
}

View File

@ -2,11 +2,7 @@
git.boba.best { git.boba.best {
encode zstd gzip encode zstd gzip
import hsts
handle_path /_/static/* {
root * /var/www/git.boba.best/public
file_server
}
handle { handle {
reverse_proxy localhost:85 { reverse_proxy localhost:85 {

View File

@ -2,6 +2,7 @@
grafana.boba.best { grafana.boba.best {
encode zstd gzip encode zstd gzip
import hsts
reverse_proxy localhost:84 reverse_proxy localhost:84
import basicerrors import basicerrors

View File

@ -2,6 +2,7 @@
mail.boba.best mail.bbaovanc.com autodiscover.boba.best autodiscover.bbaovanc.com autoconfig.boba.best autoconfig.bbaovanc.com { mail.boba.best mail.bbaovanc.com autodiscover.boba.best autodiscover.bbaovanc.com autoconfig.boba.best autoconfig.bbaovanc.com {
encode zstd gzip encode zstd gzip
import hsts
reverse_proxy localhost:8082 { reverse_proxy localhost:8082 {
header_up X-Real-IP {remote_host} header_up X-Real-IP {remote_host}

View File

@ -1,154 +0,0 @@
# vim: ft=caddyfile
matrix.boba.best {
encode zstd gzip
import matrix-well-known
redir /admin /admin/
handle_path /admin/* {
file_server {
root /var/www/synapse-admin/build
}
}
@generic {
# Sync requests
path /_matrix/client/*/events
# Federation requests
path /_matrix/federation/v1/event/*
path /_matrix/federation/v1/state/*
path /_matrix/federation/v1/state_ids/*
path /_matrix/federation/v1/backfill/*
path /_matrix/federation/v1/get_missing_events/*
path /_matrix/federation/v1/publicRooms*
path /_matrix/federation/v1/query/*
path /_matrix/federation/v1/make_join/*
path /_matrix/federation/v1/make_leave/*
path /_matrix/federation/v1/send_join/*
path /_matrix/federation/v2/send_join/*
path /_matrix/federation/v1/send_leave/*
path /_matrix/federation/v2/send_leave/*
path /_matrix/federation/v1/invite/*
path /_matrix/federation/v2/invite/*
path /_matrix/federation/v1/query_auth/*
path /_matrix/federation/v1/event_auth/*
path /_matrix/federation/v1/exchange_third_party_invite/*
path /_matrix/federation/v1/user/devices/*
path /_matrix/federation/v1/get_groups_publicised
path /_matrix/key/v2/query
path /_matrix/key/v2/query/*
# Client API requests
path /_matrix/client/*/publicRooms
path /_matrix/client/*/rooms/*/joined_members
path /_matrix/client/*/rooms/*/context/*
path /_matrix/client/*/rooms/*/members
path /_matrix/client/*/rooms/*/state
path /_matrix/client/*/account/3pid
path /_matrix/client/*/devices
path /_matrix/client/*/keys/query
path /_matrix/client/*/keys/changes
path /_matrix/client/versions
path /_matrix/client/*/voip/turnServer
path /_matrix/client/*/joined_groups
path /_matrix/client/*/publicised_groups
path /_matrix/client/*/publicised_groups/*
path /_matrix/client/*/rooms/*/event/*
path /_matrix/client/*/joined_rooms
path /_matrix/client/*/search
# Registration/login requests
path /_matrix/client/*/login
path /_matrix/client/*/register
# Event sending requests
path /_matrix/client/*/rooms/*/redact
path /_matrix/client/*/rooms/*/send
path /_matrix/client/*/rooms/*/state/*
path_regexp /_matrix/client/*/rooms/*/(join|invite|leave|ban|unban|kick)$
path /_matrix/client/*/join/*
path /_matrix/client/*/profile/*
# Additionally, the following REST endpoints can be handled for GET requests:
path /_matrix/federation/v1/groups/*
}
@generic_iphash {
path /_matrix/client/*/rooms/*/messages
# Sync requests (again)
path /_matrix/client/*/sync
path /_matrix/client/*/initialSync
path /_matrix/client/*/rooms/*/initialSync
# Inbound federation transaction request
path /_matrix/federation/v1/send/*
}
@media {
path /_matrix/media/*
path /_synapse/admin/v1/purge_media_cache
path /_synapse/admin/v1/room/*/media*
path /_synapse/admin/v1/user/*/media*
path /_synapse/admin/v1/media/*
path /_synapse/admin/v1/quarantine_media/*
}
handle @generic {
reverse_proxy {
to localhost:8010
to localhost:8011
to localhost:8012
to localhost:8013
lb_policy round_robin
health_uri /health
health_interval 15s
health_timeout 5s
}
}
handle @generic_iphash {
reverse_proxy {
to localhost:8010
to localhost:8011
to localhost:8012
to localhost:8013
lb_policy ip_hash
health_uri /health
health_interval 15s
health_timeout 5s
}
}
handle @media {
reverse_proxy {
to localhost:8009
health_uri /health
health_interval 15s
health_timeout 5s
}
}
handle /_matrix/* {
reverse_proxy localhost:8008
}
handle /_synapse/client/* {
reverse_proxy localhost:8008
}
handle /_synapse/admin/* {
reverse_proxy localhost:8008
}
handle {
redir https://boba.best/services/bobachat/
}
import basicerrors
}

View File

@ -1,5 +0,0 @@
# vim: ft=caddyfile
:2020 {
metrics
}

View File

@ -1,11 +0,0 @@
# vim: ft=caddyfile
peertube.boba.best {
encode zstd gzip
reverse_proxy 127.0.0.1:9000 {
header_up X-Real-IP {remote_host}
}
import basicerrors
}

View File

@ -1,6 +0,0 @@
# vim: ft=caddyfile
rick.boba.best {
redir https://www.youtube.com/watch?v=dQw4w9WgXcQ temporary
import basicerrors
}

12
conf.d/share.boba.best Normal file
View File

@ -0,0 +1,12 @@
# vim: ft=caddyfile
share.boba.best {
encode zstd gzip
import hsts
handle {
reverse_proxy localhost:87
}
import basicerrors
}

View File

@ -1,10 +1,10 @@
# vim: ft=caddyfile # vim: ft=caddyfile
status.boba.best { status.boba.best, status.bbaovanc.com {
encode zstd gzip encode zstd gzip
import hsts
reverse_proxy localhost:83
reverse_proxy localhost:82 {
header_up X-Real-IP {remote_host}
}
import basicerrors import basicerrors
} }

View File

@ -1,5 +0,0 @@
# vim: ft=caddyfile
turn.boba.best {
respond "where are you"
}

View File

@ -2,6 +2,7 @@
vault.boba.best { vault.boba.best {
encode zstd gzip encode zstd gzip
import hsts
header { header {
X-XSS-Protection "1; mode=block" X-XSS-Protection "1; mode=block"

29
errors/index.html Normal file
View File

@ -0,0 +1,29 @@
{{ $code := placeholder "http.error.status_code" -}}
{{ $text := placeholder "http.error.status_text" -}}
{{ $full_text := printf "%s %s" (placeholder "http.error.status_code") (placeholder "http.error.status_text") -}}
{{ $host := placeholder "http.request.host" -}}
{{ $img_url := (printf "https://http.cat/%s.jpg" $code) -}}
<html>
<head>
<title>{{ $full_text }}</title>
<meta name="title" content="{{ $full_text }}" />
<meta name="description" content="{{ $full_text }}" />
<meta property="og:title" content="{{ $full_text }}" />
<meta property="og:description" content="{{ $full_text }}" />
<meta property="og:image" content="{{ $img_url }}"/>
<meta property="og:site_name" content="{{ $host }}" />
<meta name="twitter:card" content="summary"/>
<meta name="twitter:image" content="{{ $img_url }}"/>
<meta name="twitter:title" content="{{ $full_text }}" />
<meta name="twitter:description" content="{{ $full_text }}" />
</head>
<body bgcolor="black" text="white">
<center>
<h1>{{ $full_text }}</h1>
<img src="{{ $img_url }}" alt="cat" />
</center>
</body>
</html>