Config files for my server. Except not my secrets

switch off of git modules lol

vielle.dev bb710e17 e49bb441

verified
Changed files
+18 -34
caddy
-12
.gitmodules
··· 1 - [submodule "prs"] 2 - path = prs 3 - url = https://tangled.sh/@vielle.dev/site 4 - [submodule "dong-web"] 5 - path = dong-web 6 - url = https://tangled.sh/@vielle.dev/dong-web 7 - [submodule "saltire-the-gays"] 8 - path = saltire-the-gays 9 - url = https://tangled.sh/@vielle.dev/saltire-the-gays 10 - [submodule "dnd"] 11 - path = dnd 12 - url = https://tangled.sh/@vielle.dev/dnd-astral-powers
+15 -13
caddy/Dockerfile
··· 1 1 ######### 2 2 # BUILD # 3 3 ######### 4 - FROM node:24-alpine AS build-templ 4 + FROM node:24-alpine AS build 5 5 WORKDIR /app 6 + 7 + RUN apk add git 6 8 7 9 # install pnpm 8 10 ENV PNPM_HOME="/pnpm" ··· 10 12 RUN corepack enable pnpm && corepack install -g pnpm@latest 11 13 12 14 # dong web 13 - FROM build-templ AS build-dong-web 15 + FROM build AS build-dong 14 16 WORKDIR /app 15 - COPY ./dong-web /app/dong-web 16 - RUN pnpm --dir /app/dong-web install --prod 17 - RUN pnpm --dir /app/dong-web run build --outDir /app/dong-web/dist 17 + RUN git clone https://tangled.org/vielle.dev/dong-web.git /app/dong 18 + RUN pnpm --dir /app/dong install --prod 19 + RUN pnpm --dir /app/dong run build --outDir /app/dong/dist 18 20 19 21 # saltire 20 - FROM build-templ AS build-saltire-the-gays 22 + FROM build AS build-saltire 21 23 WORKDIR /app 22 - COPY ./saltire-the-gays /app/saltire-the-gays 23 - RUN pnpm --dir /app/saltire-the-gays install --prod 24 - RUN pnpm --dir /app/saltire-the-gays run build --outDir /app/saltire-the-gays/dist 24 + RUN git clone https://tangled.org/vielle.dev/saltire-the-gays.git /app/saltire 25 + RUN pnpm --dir /app/saltire install --prod 26 + RUN pnpm --dir /app/saltire run build --outDir /app/saltire/dist 25 27 26 28 # astral powers 27 - FROM build-templ AS build-dnd 29 + FROM build AS build-dnd 28 30 WORKDIR /app 29 - COPY ./dnd /app/dnd 31 + RUN git clone https://tangled.org/vielle.dev/dnd-astral-powers.git /app/dnd 30 32 RUN pnpm --dir /app/dnd install --prod 31 33 RUN pnpm --dir /app/dnd run build --outDir /app/dnd/dist 32 34 ··· 36 38 FROM caddy:2.10.2 37 39 38 40 # copy built files to /srv 39 - COPY --from=build-dong-web /app/dong-web/dist /srv/dong-web 40 - COPY --from=build-saltire-the-gays /app/saltire-the-gays/dist /srv/saltire-the-gays 41 + COPY --from=build-dong /app/dong/dist /srv/dong 42 + COPY --from=build-saltire /app/saltire/dist /srv/saltire 41 43 COPY --from=build-dnd /app/dnd/dist /srv/dnd 42 44 43 45 CMD caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
+2 -8
commit.sh
··· 1 1 #!/usr/bin/env bash 2 2 3 - echo 4 - echo 5 - echo "Got new commit: $(date)" 6 - echo "---" 7 - echo 3 + echo "\n\nGot new commit: $(date)\n---\n\n" 8 4 9 5 # pull latest version 10 6 git fetch --all ··· 27 23 # restart/rebuild all containers 28 24 docker compose build --no-cache 29 25 docker compose up -d --force-recreate 30 - # add second docker compose up because it acts up ?? 31 - docker compose up -d 32 26 33 27 # clear out dockerfiles to stop my drive exploding 34 - docker system prune -af 28 + docker system prune -af > /dev/null 35 29 36 30 cat <<- BODY | curl -d @- http://compuper:6500/notify 37 31 name=vps%3A%20ready%20($(git log -1 --pretty=format:%h))\
+1 -1
compose.yaml
··· 1 1 services: 2 2 prs: 3 - build: ./prs 3 + build: https://tangled.sh/@vielle.dev/site.git 4 4 restart: unless-stopped 5 5 env_file: ./prs.env 6 6 volumes: