Compare commits
43 Commits
1ac6174029
...
1.0.13
| Author | SHA1 | Date | |
|---|---|---|---|
| 2fc1547401 | |||
| 6d0f4b7614 | |||
| 96c9785f97 | |||
| 142d2978d0 | |||
| abda022dfb | |||
| 29ff158901 | |||
| c07889ddb9 | |||
| 172435e78e | |||
| d3073d7b6e | |||
| fa73ce8f58 | |||
| 24f624a673 | |||
| ce18848bb0 | |||
| 37254883a4 | |||
| 722f32e0a9 | |||
| d97b679f1e | |||
| 4bfa632dff | |||
| 0c30da7e6d | |||
| 2fcf3ad3a2 | |||
| 930c550385 | |||
| ea31268ef5 | |||
| c1b575f5a9 | |||
| ad67e1831b | |||
| 7330851694 | |||
| 62829cecad | |||
| afa3886de5 | |||
| d066bed021 | |||
| 1cf9089e33 | |||
| 9aeb4b44b4 | |||
| f3f6fd7be5 | |||
| 138fa27962 | |||
| 234992141c | |||
| 89d9610ba8 | |||
| 73cad693a1 | |||
| acc4e3f324 | |||
| 7b5af1e979 | |||
| 6a633ec2eb | |||
| 67f15c17e6 | |||
| 3b5544f99f | |||
| b57bcea176 | |||
| dbd6856dce | |||
| 36f5753088 | |||
| 7909e8f91d | |||
| 063ffd6f34 |
6
.dockerignore
Normal file
6
.dockerignore
Normal file
@@ -0,0 +1,6 @@
|
||||
.git
|
||||
.gitignore
|
||||
.templates
|
||||
deploy.sh
|
||||
README.md
|
||||
test.sh
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1 @@
|
||||
*.swp
|
||||
/files
|
||||
|
||||
54
.gitlab-ci.yml
Normal file
54
.gitlab-ci.yml
Normal file
@@ -0,0 +1,54 @@
|
||||
#
|
||||
# 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
|
||||
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
|
||||
--tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
|
||||
--push
|
||||
.
|
||||
- docker images
|
||||
Build_Tag:
|
||||
stage: build
|
||||
only:
|
||||
- tags
|
||||
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_REF_NAME
|
||||
--tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
|
||||
--push
|
||||
.
|
||||
- docker images
|
||||
3
Dockerfile
Normal file
3
Dockerfile
Normal file
@@ -0,0 +1,3 @@
|
||||
FROM php:7-apache
|
||||
COPY ./ /var/www/html/
|
||||
EXPOSE 80
|
||||
10
README.md
10
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.
|
||||
|
||||
@@ -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>
|
||||
|
||||
10
deploy.sh
10
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
|
||||
|
||||
0
files/.keep
Normal file
0
files/.keep
Normal file
@@ -1,25 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
|
||||
<title>9iron - Garry's Mod</title>
|
||||
</head>
|
||||
<body>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
|
||||
<div class="content">
|
||||
<div class="section">
|
||||
<h1>Garry's Mod</h1>
|
||||
<p>Just toss the IP into your favorites or open it through the console. Ask around for the password.</p>
|
||||
</div>
|
||||
<div class="section">
|
||||
<h1>Servers</h1>
|
||||
<div class="subcontainer">
|
||||
<h2>Trouble in Terrorist Town</h2>
|
||||
<p><code>ttt.src.9iron.club</code></p>
|
||||
<p><a href="https://steamcommunity.com/sharedfiles/filedetails/?id=2155532035">Addons List</a></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
|
||||
</body>
|
||||
</html>
|
||||
13
index.php
13
index.php
@@ -19,15 +19,10 @@
|
||||
<h1>Terraria</h1>
|
||||
<p>A game we've sunk just as much time into as Minecraft. Sometimes modded, sometimes not</p>
|
||||
</a>
|
||||
<a href="/tes3mp" class="iconbutton">
|
||||
<i class="fa fa-moon"></i>
|
||||
<h1>TES3MP</h1>
|
||||
<p>Morrowind, but multiplayer. And it's nowhere near as jank as it sounds</p>
|
||||
</a>
|
||||
<a href="/gmod" class="iconbutton">
|
||||
<i class="fa fa-circle-o"></i>
|
||||
<h1>Garry's Mod</h1>
|
||||
<p>It's second banana to other games, but we may have a server up from time to time</p>
|
||||
<a href="/smz3mw" class="iconbutton">
|
||||
<i class="fa fa-random"></i>
|
||||
<h1>SMZ3 Multiworld</h1>
|
||||
<p>Strap two games together, then strap a bunch of those games together and shake them real hard</p>
|
||||
</a>
|
||||
</div>
|
||||
<div class="break"></div>
|
||||
|
||||
@@ -42,11 +42,11 @@ function echo_pack($pack) {
|
||||
|
||||
# A small button to browse previous world downloads
|
||||
if (file_exists("../files/packs/$pack/worlds")) {
|
||||
echo "<p><a href=\"/files/packs/$pack/worlds\" class=\"worldsbutton\">Browse world backups</a></p>";
|
||||
echo "<p><a href=\"https://srv.9iron.club/files/packs/$pack/worlds\" class=\"worldsbutton\">Browse world backups</a></p>";
|
||||
}
|
||||
|
||||
# And a bright big download button
|
||||
echo "<a href=\"/files/packs/$pack/latest.zip\" class=\"downloadbutton\">Download</a>";
|
||||
echo "<a href=\"https://srv.9iron.club/files/packs/$pack/latest.zip\" class=\"downloadbutton\">Download</a>";
|
||||
echo '</div>';
|
||||
}
|
||||
# Get list of modpacks
|
||||
|
||||
3
minecraft/packs/1.16.5-valhelsia/desc.html
Normal file
3
minecraft/packs/1.16.5-valhelsia/desc.html
Normal file
@@ -0,0 +1,3 @@
|
||||
<h2>Valhelsia 3+</h2>
|
||||
<p>1.16.5, Forge 36.1.13</p>
|
||||
<p>Valhelsia 3.3.1 with some tweaks, such as chunk loaders and a disappointingly non-clicky version of InventoryTweaks.</p>
|
||||
BIN
minecraft/packs/1.16.5-valhelsia/icon.png
Normal file
BIN
minecraft/packs/1.16.5-valhelsia/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
@@ -1 +1 @@
|
||||
1.7.10-magicpack
|
||||
1.16.5-valhelsia
|
||||
@@ -1 +1 @@
|
||||
magic.thefuck.how
|
||||
thefuck.how
|
||||
|
||||
75
smz3mw/index.php
Normal file
75
smz3mw/index.php
Normal file
@@ -0,0 +1,75 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
|
||||
<title>9iron - SMZ3 Multiworld</title>
|
||||
</head>
|
||||
<body>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
|
||||
<div class="content">
|
||||
<h1>Setting Up the <i>Super Metroid</i>/<i>The Legend of Zelda - A Link to the Past</i> Multiworld Item Randomizer</h1>
|
||||
<p>Disclaimer: Most of this information is duplicated from <a href="https://samus.link/mwinstructions">upstream documentation</a>. If anything here breaks, please consult that guide as the instructions may have changed.</p>
|
||||
<div class="subcontainer">
|
||||
<h2>1. Installing QUSB2SNES</h2>
|
||||
<p>It's a big fancy name that means "driver to allow your emulator to talk to the multiworld server".</p>
|
||||
<ol>
|
||||
<li><a href="https://github.com/Skarsnik/QUsb2snes/releases">Go here</a></li>
|
||||
<li>Download the latest release (expand "Assets" and pick the file that ends in ".exe")</li>
|
||||
<li>Put it somewhere</li>
|
||||
<li>Run it</li>
|
||||
<li>Pick the option for "Enable Lua Bridge (snes9x-rr)" (you may have to right-click the tray icon if you don't get a window when you start the application)</li>
|
||||
</ol>
|
||||
</div>
|
||||
<div class="subcontainer">
|
||||
<h2>2. Installing Snes9x-rr</h2>
|
||||
<p>We have to install a special emulator to interact with some special tooling and allow items to be sent between worlds.</p>
|
||||
<ol>
|
||||
<li><a href="https://github.com/gocha/snes9x-rr/releases/">Go here</a></li>
|
||||
<li>Download the latest release (ends in "win32.zip")</li>
|
||||
<li>Unzip it somewhere</li>
|
||||
<li>Run <code>snes9x.exe</code> to start the emulator</li>
|
||||
<li>File -> Lua Scripting -> New Lua Script Window</li>
|
||||
<li>Load "luabridge.lua" from the directory you ran snes9x out of</li>
|
||||
</ol>
|
||||
</div>
|
||||
<div class="subcontainer">
|
||||
<h2>3. Connecting to the Multiworld</h2>
|
||||
<p>From here, you have an emulator and a program to expose that emulator to the internet. Now we connect it to the multiworld randomizer engine so you can join the game.</p>
|
||||
<ol>
|
||||
<li>Ask somebody for the link to the party at <a href="https://samus.link">samus.link</a></li>
|
||||
<li>Visit the link in your browser</li>
|
||||
<li>Hit the "Connect" button next to your name</li>
|
||||
<li>Upload your totally legitimately obtained Super Metroid and ALttP ROMs (the randomizer is very picky about which ones you upload; ask around for the right ones if you don't have them)</li>
|
||||
<li>Pick your favorite sprites and colors and energy beep frequency</li>
|
||||
<li>Download and play the ROM in snes9x</li>
|
||||
<li>Hate life</li>
|
||||
</ol>
|
||||
</div>
|
||||
<div class="subcontainer">
|
||||
<h2>4. Playing the Game</h2>
|
||||
<p>There are a number of resources available to help you in managing the sheer amount of information that you'll need to keep track of during the randomizer. Make good use of these:</p>
|
||||
<ul>
|
||||
<li><a href="http://smalttpr.mymm1.com/tracker/">ALttP Item Tracker</a> - Plug in what items you have and it'll tell you where you can go. Accounts for crossing through Super Metroid to get to somewhere you normally couldn't</li>
|
||||
<li><a href="https://wiki.supermetroid.run/List_of_rooms">List of Rooms in Super Metroid</a> - The game is huge, so naming each room helps keep track of where you are. You can also see full screenshots of each room</li>
|
||||
</ul>
|
||||
<p>Also some tips:</p>
|
||||
<ul>
|
||||
<li>There are several points at which you can softlock in Super Metroid. Save early, save often, and know when to reset</li>
|
||||
<li>You start with a full map in Super Metroid detailing every item's location. It's very helpful</li>
|
||||
<li>There are many ways to skin a cat, some of them more or less painful than others</li>
|
||||
</ul>
|
||||
<ul>
|
||||
<li>Kakariko Village is incredibly lucrative early on; there are 10-15 items in that area you can acquire with literally no items</li>
|
||||
<li>Getting to the Dark World is a huge priority; you need the Moon Pearl and either a Hammer or a Glove to get there</li>
|
||||
<li>Certain trees can be pulled in ALttP to yield pickups. The pickups that drop are random for each player</li>
|
||||
</ul>
|
||||
<ul>
|
||||
<li>Just because you CAN get somewhere doesn't mean there will be anything helpful there. Glitches yield sequence breaks, not progression</li>
|
||||
<li>Having a trusted third party available to check the spoiler log might not be a bad idea</li>
|
||||
<li>Sometimes your progression can be in somebody else's world. If you know there's nothing for you to do, there's no shame in going and getting some Burger King while you wait</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
|
||||
</body>
|
||||
</html>
|
||||
@@ -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,14 +124,20 @@
|
||||
// - 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!\"",
|
||||
// - Jacob
|
||||
"\"Much edge\"",
|
||||
// - Jacob
|
||||
"\"Oh it's a bear\"",
|
||||
// - Lea, moments before being mauled by a grizzly bear
|
||||
"\"I'm in danger!\"",
|
||||
// - At least four of us, constantly shittalking
|
||||
"\"He got cancer and became a Nazi\"",
|
||||
@@ -160,8 +168,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",
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -56,6 +56,12 @@ dl dt {
|
||||
dl dd {
|
||||
margin: 0;
|
||||
}
|
||||
ol,ul {
|
||||
margin: 1em 2em;
|
||||
}
|
||||
ol li,ul li {
|
||||
padding: 0.25em 0.5em;
|
||||
}
|
||||
|
||||
/* CUSTOM DIVS AND SPANS */
|
||||
a.quickbutton {
|
||||
@@ -127,7 +133,7 @@ img.bigimg {
|
||||
}
|
||||
.header nav ul li {
|
||||
display: inline-block;
|
||||
padding: 0.8em;
|
||||
padding: 1em;
|
||||
}
|
||||
.header nav ul li:hover {
|
||||
background: var(--link-hover);
|
||||
@@ -146,7 +152,7 @@ img.bigimg {
|
||||
border-radius: 8px;
|
||||
box-shadow: 5px 5px var(--shadow);
|
||||
margin: 1em 0;
|
||||
padding: 1em;
|
||||
padding: 2em;
|
||||
}
|
||||
.subcontainer h2 {
|
||||
margin: 0;
|
||||
@@ -170,6 +176,7 @@ img.bigimg {
|
||||
}
|
||||
.footer p {
|
||||
margin: 0;
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
/* MOBILE */
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<p>A pretty light modpack (as Terraria packs tend to be) with Calamity, extra music, and Magic Storage. Also the 1.4 door tweak thing, that's important too.</p>
|
||||
<p>World Backups:</p>
|
||||
<ul>
|
||||
<li><a href="/files/calamity1.tgz">calamity1</a> - 2020-10-05</li>
|
||||
<li><a href="https://srv.9iron.club/files/calamity1.tgz">calamity1</a> - 2020-10-05</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="subcontainer">
|
||||
@@ -34,7 +34,7 @@
|
||||
<p>It totally met the hype, but was simultaneously underwhelming. I don't know how they did it.</p>
|
||||
<p>World Backups:</p>
|
||||
<ul>
|
||||
<li><a href="/files/1401-farm-master1.wld">1401-farm-master1</a> - 2020-06-01</li>
|
||||
<li><a href="https://srv.9iron.club/files/1401-farm-master1.wld">1401-farm-master1</a> - 2020-06-01</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
|
||||
<title>9iron - TES3MP</title>
|
||||
</head>
|
||||
<body>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
|
||||
<div class="content">
|
||||
<div class="section">
|
||||
<h1>TES3MP - Morrowind Multiplayer</h1>
|
||||
<p>TES3MP is a multiplayer mod for OpenMW, a Morrowind engine rewrite. World state is tied to your character, so multiple people can have multiple playthroughs at the same time.</p>
|
||||
</div>
|
||||
<div class="section">
|
||||
<h1>Installation</h1>
|
||||
<ol>
|
||||
<li>Download the package: <a href="https://github.com/TES3MP/openmw-tes3mp/releases/download/0.7.0-alpha/tes3mp-client.Win32.prerelease.0.7-alpha.zip">Windows</a>, <a href="https://github.com/TES3MP/openmw-tes3mp/releases/download/0.7.0-alpha/tes3mp-GNU+Linux-x86_64-release-0.7.0-alpha-abc4090a0f-01d297f5c6.tar.gz">Linux</a></li>
|
||||
<li>Extract it somewhere</li>
|
||||
</ol>
|
||||
</div>
|
||||
<div class="section">
|
||||
<h1>Connecting to the Server</h1>
|
||||
<ol>
|
||||
<li>Go to where you extracted TES3MP</li>
|
||||
<li>Run <code>tes3mp-browser</code></li>
|
||||
<li>Search for "9iron" and enter the server</li>
|
||||
</ol>
|
||||
<p>The password is "dicks". The password is always "dicks".</p>
|
||||
</div>
|
||||
</div>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user