Update about page

Unfortunately, I can't use --load, I'll have to use --push directly

.dockerignore

@@ -0,0 +1,6 @@
+.git
+.gitignore
+.templates
+deploy.sh
+README.md
+test.sh

.gitignore

@@ -1,2 +1 @@
 *.swp
-/files

.gitlab-ci.yml

@@ -0,0 +1,79 @@
+#
+# This guy is awesome: https://dev.to/bzinoun/gitlab-ci-to-build-and-push-containers-to-registry-538a
+#
+
+image: morlay/buildx:607a2ce
+variables:
+  # DinD's vfs driver is pretty intensive; this is less so
+  DOCKER_DRIVER: overlay2
+  CI_HUB_USERNAME: rehashedsalt
+stages:
+  - build
+#  - test
+  - push
+services:
+  - docker:dind
+before_script:
+  - echo -n "$CI_LOGIN_PASSWORD" | docker login -u "$CI_LOGIN_USERNAME" --password-stdin
+  - docker version
+  - docker info
+after_script:
+  - docker logout hub.docker.com
+
+# BUILD
+Build:
+  stage: build
+  script:
+    - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest || true
+    - docker buildx create --use
+    - >
+      docker buildx build
+      --pull
+      --platform linux/amd64,linux/arm64
+      --cache-from $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
+      --tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+      --push
+      .
+    - docker images
+
+# TEST
+# TODO: Fix this
+#Test_HTTP_200:
+#  stage: test
+#  script:
+#    - apk add curl
+#    - docker run -d -p 8889:80 $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+#    - sleep 10
+#    - docker ps
+#    - netstat -tulpn
+#    - curl localhost:8889 | grep -ie '200 OK'
+#    - docker kill $(docker ps -q)
+
+# PUSH
+Push_When_Tag:
+  stage: push
+  only:
+    - tags
+  script:
+    - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+    - >
+      docker tag
+      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+    - >
+      docker tag
+      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+      $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
+    - docker images
+    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
+Push_Bleeding:
+  stage: push
+  script:
+    - docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+    - >
+      docker tag
+      $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
+      $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
+    - docker images
+    - docker push $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding

Dockerfile

@@ -0,0 +1,3 @@
+FROM php:7-apache
+COPY ./ /var/www/html/
+EXPOSE 80

README.md

@@ -6,6 +6,16 @@ A website for me and my friends.
 
 This repo is a ready-to-go webroot. `git clone` and configure Apache. `git pull` for updates.
 
+## Docker
+
+You can pull the image from `rehashedsalt/9iron`. The `:latest` tag will always have the latest git tag applied and the `:bleeding` tag will always be the latest *commit*.
+
+The following directories contain stateful content that you will be interested in keeping in a PV:
+
+* `/var/www/html/files`
+
+The image listens on `:80` and does not terminate SSL; proxy connections if you're interested in that.
+
 ## Random Subtitles
 
 I've got random subtitles generated at page load. Hit me up (i.e. open an issue) if you've got dumb ideas for some.

about/index.php

@@ -11,7 +11,7 @@
 				<h1>About 9iron</h1>
 				<p>9iron is a website spun up by yours truly to unify the services I host and inevitably rope my friends into. It also aggregates documentation about the various games we play.</p>
 				<h1>About Me</h1>
-				<p>I am Salt. I'm a sysadmin and I play video games. I try to be most active on Matrix, but inevitably have to use Discord all the damn time. You can also reach me very effectively through the Fediverse and email.</p>
+				<p>I am Salt. I'm a sysadmin and I play video games. I'm regrettably most active on Discord because there are no good alternatives (that my friends will join). You can also reach me very effectively through the Fediverse and email.</p>
 				<p>Hit me up if you wanna play something or if shit breaks.</p>
 				<dl>
 					<dt>Fedi:</dt>

deploy.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# post-deploy.sh
-# Copyright (C) 2020 Vintage Salt <rehashedsalt@cock.li>
-#
-# Distributed under terms of the MIT license.
-#
-
-ssh -t salt@www.9iron.club sudo git -C /var/www/www.9iron.club pull
-

minecraft/packs/current

@@ -1 +1 @@
-1.7.10-magicpack
+null

src/common-subtitle.php

@@ -110,6 +110,8 @@
 		// - Me, irritating Sam
 		"\"My heart runs Linux\"",
 		// - Me, context forgotten
+		"\"Brett has Mrs. Chapman nipples\"",
+		// - Me
 		"\"I suck a lot of dick, get over here\"",
 		// - Brett
 		"\"This was worth sucking dick\"",
@@ -122,8 +124,12 @@
 		// - Brett
 		"\"Be grody on my back. Wait-\"",
 		// - Brett
+		"\"Let's get this cock onto a tray!\"",
+		// - Brett
 		"\"This is Hell, they are all prostitutes.\"",
 		// - Jordyn
+		"\"Isn't an asshole like a brass instrument?\"",
+		// - Jordyn
 		"\"Sir, this is an M32 grenade launcher\"",
 		// - Jacob https://www.youtube.com/watch?v=DJRkFLFnv3c
 		"\"OHNO!\"",
@@ -160,8 +166,14 @@
 		// - Jacob, after I said he's my little pogchamp
 		"\"They're children you thirsty whores\"",
 		// - Sam
+		"\"Pichu is illegal\"",
+		// - Sam
+		"\"DEDEDE FUCKS\"",
+		// - Sam
 		"\"Imagine 'Blades of Glory' but they fuck\"",
 		// - Also Sam
+		"\"There's no D in BDSM\"",
+		// - Rachael
 		"God dammit, Sam",
 		"God dammit, Jacob",
 		"God dammit",

startpage/index.php

@@ -23,6 +23,7 @@
 					<h4>desu.ltd</h4>
 					<a href="https://desu.ltd">Index</a>
 					<a href="https://git.desu.ltd">Gitea</a>
+					<a href="http://local.desu.ltd">Local</a>
 				</div>
 				<div class="spsubsection">
 					<h4>9iron</h4>

styles/styles.css

@@ -10,12 +10,12 @@
 :root {
 	--background-bright: #fdfcfa;
 	--background: #ecebe9;
-	--line: #d6d5d3;
+	--line: rgba(0,0,0,0.1);
 	--greenlink: #327117;
 	--greenlink-hover: #47b625;
 	--link: #286a9d;
 	--link-hover: #3ea5f3;
-	--shadow: 8px -5px #d6d5d3;
+	--shadow: 8px -5px rgba(0,0,0,0.1);
 	--text: #414040;
 	--text-code: #a7674e;
 }

test.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-#
-# test.sh
-# Copyright (C) 2020 Vintage Salt <rehashedsalt@cock.li>
-#
-# Distributed under terms of the MIT license.
-#
-
-php -S localhost:8000
-