diff --git a/.gitignore b/.gitignore index ed7f3d0..958d998 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ prs.env prs.refreshToken commit-out.txt -compose.override.yaml \ No newline at end of file +compose.override.yaml +*.zip \ No newline at end of file diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 6367fb5..dce3f58 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -112,6 +112,7 @@ saltire-the-gays.{$HOST:vielle.dev} { file_server } +## personal projects dnd.{$HOST:vielle.dev} { log dnd { output stdout @@ -124,6 +125,18 @@ dnd.{$HOST:vielle.dev} { file_server } +mc.{$HOST:vielle.dev} { + log mc { + output stdout + format console + } + + encode + root /srv/mc.vielle.dev + import error + file_server +} + ## atproto services ### pds pds.{$HOST:vielle.dev}, *.pds.{$HOST:vielle.dev}, *.at.{$HOST:vielle.dev}, *.at.{$DONG_HOST:dongs.zip} { diff --git a/caddy/Dockerfile b/caddy/Dockerfile index c2710ff..68ae6d1 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -38,6 +38,7 @@ RUN pnpm --dir /app/dnd run build --outDir /app/dnd/dist FROM caddy:2.10.2 # copy built files to /srv +COPY ./srv /srv COPY --from=build-dong /app/dong/dist /srv/dong COPY --from=build-saltire /app/saltire/dist /srv/saltire COPY --from=build-dnd /app/dnd/dist /srv/dnd diff --git a/caddy/srv/mc.vielle.dev/index.html b/caddy/srv/mc.vielle.dev/index.html new file mode 100644 index 0000000..efcbc62 --- /dev/null +++ b/caddy/srv/mc.vielle.dev/index.html @@ -0,0 +1,663 @@ + + + + + + mc.vielle.dev + + + +

mc.vielle.dev

+

(Whitelisted) Modded minecraft 1.20.1 SMP

+

How to join

+

+ DM me on discord with your java username and I'll add you to the + whitelist.
The server address is mc.vielle.dev +

+

Modpack

+
+ Modlist +

+ The server runs on minecraft 1.20.1 with forge + 47.4.10. The premade pack uses minecraft + 1.20.1 with neoforge 47.1.106 or forge + 47.4.10. +

+ +
+

Premade packs

+

+ There is a + premade prismlauncher instance, with + installation instructions below. If you are following the instructions + below you do not need to download the pack. Note that this includes some + performance/library mods which are not present on the server, listed + below. Resource packs and shaders are not provided, and are left as an + exercise to the user. Alternatively, you can download + the reccomended modlist or + the minimal modlist if you prefer to DIY your + instance. +

+
+ Additional mods + +
+

Installing prism launcher

+

+ To use the premade prism launcher instance, you need to install prism + launcher and import the pack +

+
    +
  1. + Download prism launcher for your platform + and install it. +
    2. +
  2. + Open prismlauncher, follow any setup, and then click + Settings (top bar) > + Java. Then look for the settings + Autodetect Java version and + Auto-download Mojang Java. Make sure both settings are enabled. +
    3. +
  3. + Click Accounts in the top right, then click + Manage Accounts. Click Add Microsoft and follow the onscreen + instructions to link your microsoft account. Make sure this is the same + account that owns a copy of minecraft java edition. +
    4. + +
  4. + 2 Next, click Add Instance, then Import. Change the name and icon to whatever you like and paste + https://mc.vielle.dev/prism-launcher.zip into the import + text input. Then click Ok. The instance will be created and you can double click it to launch. +
    5. +
+ + diff --git a/compose.yaml b/compose.yaml index 74f1de5..8f10640 100644 --- a/compose.yaml +++ b/compose.yaml @@ -20,15 +20,13 @@ services: restart: unless-stopped caddy: - build: - context: ./ - dockerfile: ./caddy/Dockerfile + build: ./caddy restart: unless-stopped ports: - 80:80 - 443:443 volumes: - - ./caddy:/etc/caddy + - ./caddy/Caddyfile:/etc/caddy/Caddyfile - ./server-health.txt:/reverse_proxy_health.txt - caddy_data:/data - caddy_config:/config