Config files for my server. Except not my secrets

refactor caddyfile logging

vielle.dev ddc02eee 0dfd4dc8

verified
Changed files
+16 -40
caddy
+15 -40
caddy/Caddyfile
··· 60 } 61 } 62 63 ## main site 64 www.{$HOST:vielle.dev} { 65 redir https://{$HOST:vielle.dev}{uri} 66 } 67 68 {$HOST:vielle.dev} { 69 - log prs { 70 - output stdout 71 - format console 72 - } 73 - 74 reverse_proxy prs:4321 75 } 76 77 ## dongs.zip 78 {$DONG_HOST:dongs.zip} { 79 - log dong { 80 - output stdout 81 - format console 82 - } 83 - 84 import did-web "{$DONG_HOST:dongs.zip}" "{$DONG_HOST:dongs.zip}" "zQ3sha8L4YgButkPAFtN4LB2cNai6bBbm7yFJ2kS5iG6KySxd", "pds.vielle.dev" 85 import error 86 ··· 101 102 ## toy projects 103 saltire-the-gays.{$HOST:vielle.dev} { 104 - log saltire { 105 - output stdout 106 - format console 107 - } 108 - 109 encode 110 root /srv/saltire 111 import error ··· 114 115 ## personal projects 116 dnd.{$HOST:vielle.dev} { 117 - log dnd { 118 - output stdout 119 - format console 120 - } 121 - 122 encode 123 root /srv/dnd 124 import error ··· 126 } 127 128 mc.{$HOST:vielle.dev} { 129 - log mc { 130 - output stdout 131 - format console 132 - } 133 - 134 encode 135 root /srv/mc.vielle.dev 136 import error ··· 140 ## atproto services 141 ### pds 142 pds.{$HOST:vielle.dev}, *.pds.{$HOST:vielle.dev}, *.at.{$HOST:vielle.dev}, *.at.{$DONG_HOST:dongs.zip} { 143 - log pds { 144 - output stdout 145 - format console 146 - } 147 - 148 tls { 149 on_demand 150 } ··· 186 ### tangled knot 187 # (see nginx.conf for ssh proxying) 188 knot.{$HOST:vielle.dev} { 189 - log knot { 190 - output stdout 191 - format console 192 - } 193 - 194 rewrite / /knot 195 @landing path /knot /styles.css 196 reverse_proxy @landing landing:8000 ··· 201 ### piper instance 202 # technically publicly visible... its _fine_ (+ i cant do jack shit abt it rn so) 203 piper.{$HOST:vielle.dev} { 204 - log piper { 205 - output stdout 206 - format console 207 - } 208 - 209 reverse_proxy {$ADDR_PIPER} 210 }
··· 60 } 61 } 62 63 + (log) { 64 + log {args[0]} { 65 + output stdout 66 + format console 67 + } 68 + } 69 + 70 ## main site 71 www.{$HOST:vielle.dev} { 72 redir https://{$HOST:vielle.dev}{uri} 73 } 74 75 {$HOST:vielle.dev} { 76 + import log prs 77 reverse_proxy prs:4321 78 } 79 80 ## dongs.zip 81 {$DONG_HOST:dongs.zip} { 82 + import log dong 83 import did-web "{$DONG_HOST:dongs.zip}" "{$DONG_HOST:dongs.zip}" "zQ3sha8L4YgButkPAFtN4LB2cNai6bBbm7yFJ2kS5iG6KySxd", "pds.vielle.dev" 84 import error 85 ··· 100 101 ## toy projects 102 saltire-the-gays.{$HOST:vielle.dev} { 103 + import log saltire 104 encode 105 root /srv/saltire 106 import error ··· 109 110 ## personal projects 111 dnd.{$HOST:vielle.dev} { 112 + import log dnd 113 encode 114 root /srv/dnd 115 import error ··· 117 } 118 119 mc.{$HOST:vielle.dev} { 120 + import log mc 121 encode 122 root /srv/mc.vielle.dev 123 import error ··· 127 ## atproto services 128 ### pds 129 pds.{$HOST:vielle.dev}, *.pds.{$HOST:vielle.dev}, *.at.{$HOST:vielle.dev}, *.at.{$DONG_HOST:dongs.zip} { 130 + import log pds 131 tls { 132 on_demand 133 } ··· 169 ### tangled knot 170 # (see nginx.conf for ssh proxying) 171 knot.{$HOST:vielle.dev} { 172 + import log knot 173 rewrite / /knot 174 @landing path /knot /styles.css 175 reverse_proxy @landing landing:8000 ··· 180 ### piper instance 181 # technically publicly visible... its _fine_ (+ i cant do jack shit abt it rn so) 182 piper.{$HOST:vielle.dev} { 183 + import log piper 184 reverse_proxy {$ADDR_PIPER} 185 }
+1
caddy/Dockerfile
··· 38 FROM caddy:2.10.2 39 40 # copy built files to /srv 41 COPY ./srv /srv 42 COPY --from=build-dong /app/dong/dist /srv/dong 43 COPY --from=build-saltire /app/saltire/dist /srv/saltire
··· 38 FROM caddy:2.10.2 39 40 # copy built files to /srv 41 + COPY ./Caddyfile /etc/caddy/Caddyfile 42 COPY ./srv /srv 43 COPY --from=build-dong /app/dong/dist /srv/dong 44 COPY --from=build-saltire /app/saltire/dist /srv/saltire