diff --git a/README.md b/README.md index 333614b..0c97007 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Stuff that's deployed on [matthewtran.com](matthewtran.com). Tested on Ubuntu Server 22.04.3 LTS. Currently running the following services. - website -- gitlab +- gitea (`git.matthewtran.com`) - monerod - p2pool (`xmrig -o matthewtran.com:3333`) - minecraft diff --git a/compose.yml b/compose.yml index 0fbc414..c337594 100644 --- a/compose.yml +++ b/compose.yml @@ -1,12 +1,19 @@ services: + website: + restart: always + build: website/. + # entrypoint: ["/bin/sh", "/home/matt/entry.sh"] + ports: + - "80:80" + - "443:443" + # volumes: + # - ./monerod/.bitmonero:/home/matt/.bitmonero monerod: restart: always build: monerod/. entrypoint: ["/bin/sh", "/home/matt/entry.sh"] ports: - "18080:18080" - - "18081:18081" - - "18083:18083" volumes: - ./monerod/.bitmonero:/home/matt/.bitmonero p2pool: @@ -19,6 +26,7 @@ services: - "37889:37889" volumes: - ./p2pool/cache:/home/matt/cache + - /dev/hugepages:/dev/hugepages minecraft: restart: always build: minecraft/. diff --git a/website/Dockerfile b/website/Dockerfile index d965fe8..3f20166 100644 --- a/website/Dockerfile +++ b/website/Dockerfile @@ -1,3 +1,10 @@ -FROM nginx +FROM ubuntu:22.04 -COPY nginx/matthewtran.com/html /usr/share/nginx/html +RUN apt-get update && apt-get upgrade +# RUN apt-get install -y wget + +RUN useradd -m matt +USER matt +WORKDIR /home/matt + +# TODO everything else diff --git a/website/matthewtran.com/html/bg.js b/website/main/bg.js similarity index 100% rename from website/matthewtran.com/html/bg.js rename to website/main/bg.js diff --git a/website/matthewtran.com/html/fade.js b/website/main/fade.js similarity index 100% rename from website/matthewtran.com/html/fade.js rename to website/main/fade.js diff --git a/website/matthewtran.com/html/imgs/bg0.jpg b/website/main/imgs/bg0.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg0.jpg rename to website/main/imgs/bg0.jpg diff --git a/website/matthewtran.com/html/imgs/bg1.jpg b/website/main/imgs/bg1.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg1.jpg rename to website/main/imgs/bg1.jpg diff --git a/website/matthewtran.com/html/imgs/bg10.jpg b/website/main/imgs/bg10.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg10.jpg rename to website/main/imgs/bg10.jpg diff --git a/website/matthewtran.com/html/imgs/bg11.jpg b/website/main/imgs/bg11.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg11.jpg rename to website/main/imgs/bg11.jpg diff --git a/website/matthewtran.com/html/imgs/bg12.jpg b/website/main/imgs/bg12.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg12.jpg rename to website/main/imgs/bg12.jpg diff --git a/website/matthewtran.com/html/imgs/bg13.jpg b/website/main/imgs/bg13.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg13.jpg rename to website/main/imgs/bg13.jpg diff --git a/website/matthewtran.com/html/imgs/bg2.jpg b/website/main/imgs/bg2.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg2.jpg rename to website/main/imgs/bg2.jpg diff --git a/website/matthewtran.com/html/imgs/bg3.jpg b/website/main/imgs/bg3.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg3.jpg rename to website/main/imgs/bg3.jpg diff --git a/website/matthewtran.com/html/imgs/bg4.jpg b/website/main/imgs/bg4.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg4.jpg rename to website/main/imgs/bg4.jpg diff --git a/website/matthewtran.com/html/imgs/bg5.jpg b/website/main/imgs/bg5.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg5.jpg rename to website/main/imgs/bg5.jpg diff --git a/website/matthewtran.com/html/imgs/bg6.jpg b/website/main/imgs/bg6.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg6.jpg rename to website/main/imgs/bg6.jpg diff --git a/website/matthewtran.com/html/imgs/bg7.jpg b/website/main/imgs/bg7.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg7.jpg rename to website/main/imgs/bg7.jpg diff --git a/website/matthewtran.com/html/imgs/bg8.jpg b/website/main/imgs/bg8.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg8.jpg rename to website/main/imgs/bg8.jpg diff --git a/website/matthewtran.com/html/imgs/bg9.jpg b/website/main/imgs/bg9.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/bg9.jpg rename to website/main/imgs/bg9.jpg diff --git a/website/matthewtran.com/html/imgs/favicons/android-chrome-192x192.png b/website/main/imgs/favicons/android-chrome-192x192.png similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/android-chrome-192x192.png rename to website/main/imgs/favicons/android-chrome-192x192.png diff --git a/website/matthewtran.com/html/imgs/favicons/android-chrome-512x512.png b/website/main/imgs/favicons/android-chrome-512x512.png similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/android-chrome-512x512.png rename to website/main/imgs/favicons/android-chrome-512x512.png diff --git a/website/matthewtran.com/html/imgs/favicons/apple-touch-icon.png b/website/main/imgs/favicons/apple-touch-icon.png similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/apple-touch-icon.png rename to website/main/imgs/favicons/apple-touch-icon.png diff --git a/website/matthewtran.com/html/imgs/favicons/browserconfig.xml b/website/main/imgs/favicons/browserconfig.xml similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/browserconfig.xml rename to website/main/imgs/favicons/browserconfig.xml diff --git a/website/matthewtran.com/html/imgs/favicons/favicon-16x16.png b/website/main/imgs/favicons/favicon-16x16.png similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/favicon-16x16.png rename to website/main/imgs/favicons/favicon-16x16.png diff --git a/website/matthewtran.com/html/imgs/favicons/favicon-32x32.png b/website/main/imgs/favicons/favicon-32x32.png similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/favicon-32x32.png rename to website/main/imgs/favicons/favicon-32x32.png diff --git a/website/matthewtran.com/html/imgs/favicons/favicon.ico b/website/main/imgs/favicons/favicon.ico similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/favicon.ico rename to website/main/imgs/favicons/favicon.ico diff --git a/website/matthewtran.com/html/imgs/favicons/mstile-150x150.png b/website/main/imgs/favicons/mstile-150x150.png similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/mstile-150x150.png rename to website/main/imgs/favicons/mstile-150x150.png diff --git a/website/matthewtran.com/html/imgs/favicons/safari-pinned-tab.svg b/website/main/imgs/favicons/safari-pinned-tab.svg similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/safari-pinned-tab.svg rename to website/main/imgs/favicons/safari-pinned-tab.svg diff --git a/website/matthewtran.com/html/imgs/favicons/site.webmanifest b/website/main/imgs/favicons/site.webmanifest similarity index 100% rename from website/matthewtran.com/html/imgs/favicons/site.webmanifest rename to website/main/imgs/favicons/site.webmanifest diff --git a/website/matthewtran.com/html/imgs/social.jpg b/website/main/imgs/social.jpg similarity index 100% rename from website/matthewtran.com/html/imgs/social.jpg rename to website/main/imgs/social.jpg diff --git a/website/matthewtran.com/html/index.html b/website/main/index.html similarity index 100% rename from website/matthewtran.com/html/index.html rename to website/main/index.html diff --git a/website/matthewtran.com/html/sitemap.xml b/website/main/sitemap.xml similarity index 100% rename from website/matthewtran.com/html/sitemap.xml rename to website/main/sitemap.xml diff --git a/website/matthewtran.com/html/style.css b/website/main/style.css similarity index 100% rename from website/matthewtran.com/html/style.css rename to website/main/style.css