Add background color to html

This should hopefully fix white flashes
Add test script
2022-01-26 00:54:09 -06:00 · 2022-01-26 00:49:11 -06:00 · 2022-01-26 00:41:55 -06:00 · 2022-01-26 00:35:39 -06:00 · 2022-01-23 08:46:34 -06:00 · 2022-01-22 15:28:24 -06:00
9 changed files with 119 additions and 27 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,3 +4,4 @@
 deploy.sh
 README.md
 test.sh
+Jenkinsfile
--- a/19
+++ b/19
@@ -0,0 +1,19 @@
+pipeline {
+	agent {
+		docker {
+			image 'morlay/buildx:607a2ce'
+		}
+	}
+	stages {
+		stage('Build') {
+			steps {
+				echo 'BUILD'
+			}
+		}
+		stage('Build Tag') {
+			steps {
+				echo 'BUILD TAG'
+			}
+		}
+	}
+}
--- a/index.php
+++ b/index.php
@@ -29,6 +29,11 @@
 					<h1>SMZ3 Multiworld</h1>
 					<p>Strap two games together, then strap a bunch of those games together and shake them real hard</p>
 				</a>
+				<a href="/movienight" class="iconbutton">
+					<i class="fa fa-film"></i>
+					<h1>Movie Night</h1>
+					<p>Take a seat, pop some popcorn, and watch a movie with da bois. Anybody can host if they want</p>
+				</a>
 			</div>
 		</div>
 		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
--- a/minecraft/setup/index.php
+++ b/minecraft/setup/index.php
@@ -28,19 +28,11 @@
 				<h2>1. Installing Java</h2>
 				<p>Minecraft depends on Java. It's important that you have the latest 64-bit edition of Java installed.</p>
 				<ol>
-					<li>Go to <a href="https://www.java.com/en/download/manual.jsp">Java Downloads</a></li>
-					<li>Download and run the "Windows Offline (64-bit)" option</li>
+					<li>Go to <a href="https://adoptium.net/">Adoptium</a></li>
+					<li>Select "OpenJDK 8"</li>
+					<li>Click "Latest release"</li>
+					<li>Run through the installer</li>
 				</ol>
-				<div class="warning">
-					<i class="badge fa fa-warning"></i>
-					Ensure you do NOT install the 32-bit version of Java! Doing so may result in some of the following weird errors:
-					<ul>
-						<li>Being unable to launch a pack with over 4GB of memory allocated</li>
-						<li>"Java could not be invoked with the arguments specified"</li>
-						<li>Other random nebulous errors from MultiMC</li>
-					</ul>
-					If you're not sure whether or not you've installed 32-bit Java, uninstall and reinstall it just to be on the safe side.
-				</div>
 			</div>
 			<div class="subcontainer" id="multimc">
 				<h2>2. Installing MultiMC</h2>
--- a/movienight/index.php
+++ b/movienight/index.php
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
+		<title>9iron - Movie Night</title>
+	</head>
+	<body>
+		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
+		<div class="content">
+			<div class="section">
+				<h1>Movie Night</h1>
+				<div class="subcontainer">
+					<h2>Tuning In?</h2>
+					<p><a class="quickbutton" href="https://movie.desu.ltd">Click Here to Watch</a></p>
+					<h2>What's Movie Night?</h2>
+					<p>Movie Night is a service hosted on desu.ltd which provides quick, disposable, self-hosted streams; perfect for organizing a quick movie or stream session. All you need to use it is OBS.</p>
+					<p>If you're interested in using Movie Night, see the below section. <a href="/about">Contact me</a> for more details.</p>
+				</div>
+				<div class="subcontainer">
+					<h2>Hosting</h2>
+					<p>Hosting a movie night is very straightforward. Install OBS, then go to Tools &gt; Auto-Configuration Wizard.</p>
+					<ol>
+						<li>Install <a href="https://obsproject.com/download">OBS</a></li>
+						<li>Go to Tools &gt; Auto-Configuration Wizard (this wizard should also automatically appear on first launch). Provide the following details and leave the rest at defaults</li>
+						<ul>
+							<li>Service: <code>Custom</code></li>
+							<li>Server: <code>rtmp://movie.desu.ltd/live</code></li>
+							<li>Stream Key: <a href="/about">Contact me</a> for the key. Note that I may need to change it should somebody use it for nefarious purposes</li>
+							<li>Estimate bitrate with bandwidth test: <code>Checked</code></li>
+						</ul>
+						<li>Set up your scenes and sources and get ready for the stream. If you need help, I'd recommend consulting the <a href="https://obsproject.com/wiki/OBS-Studio-Quickstart">OBS Studio Quickstart Guide</a> (you've already completed step 1 by getting this far)</li>
+					</ol>
+				</div>
+				<div class="subcontainer">
+					<h2>FAQ</h2>
+					<dl>
+						<dt>Q: The chat is broken</dt>
+						<dd>A: That's not a question, but I know. I'm working on it.</dd>
+					</dl>
+				</div>
+			</div>
+		</div>
+		<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
+	</body>
+</html>
--- a/src/common-subtitle.php
+++ b/src/common-subtitle.php
@@ -52,6 +52,7 @@
 		"Better change tactics",
 		"honk.wmv",
 		"bomk",
+		"Degenerate",
 		"guys literally only want one thing",
 		"Dame da ne~!",
 		"You can't look up with your tongue out",
@@ -116,6 +117,12 @@
 		// - Me
 		"\"I fuck dirt\"",
 		// - Me
+		"\"Glorious Soviet manmeat\"",
+		// - Me
+		"\"Ah shit, soap! I'm getting hard!\"",
+		// - Me
+		"\"Tom Nook has whores in stock\"",
+		// - Me
 		"\"I suck a lot of dick, get over here\"",
 		// - Brett
 		"\"This was worth sucking dick\"",
@@ -130,6 +137,8 @@
 		// - Brett
 		"\"Let's get this cock onto a tray!\"",
 		// - Brett
+		"\"All she needs to do is step on me\"",
+		// - Brett
 		"\"This is Hell, they are all prostitutes.\"",
 		// - Jordyn
 		"\"Isn't an asshole like a brass instrument?\"",
@@ -140,8 +149,12 @@
 		// - Jacob
 		"\"Much edge\"",
 		// - Jacob
+		"\"Ranked sudoku\"",
+		// - Jacob
 		"\"Oh it's a bear\"",
 		// - Lea, moments before being mauled by a grizzly bear
+		"\"Double-bitched out of love~\"",
+		// - Lea
 		"\"I'm in danger!\"",
 		// - At least four of us, constantly shittalking
 		"\"He got cancer and became a Nazi\"",
@@ -164,12 +177,12 @@
 		// - Syd
 		"\"I'm gonna fart. I'm gonna-\"",
 		// - Tex of BPL, just before he farts medical into the next universe
-		"\"Double-bitched out of love~\"",
-		// - vampqu33n
 		"\"Fixing PHP is like coming home\"",
 		// - JE
 		"\"Now the Nazi party thinks I'm their little pogchamp\"",
 		// - Jacob, after I said he's my little pogchamp
+		"\"Fuck you, I had three ass surgeries!\"",
+		// - Jacob
 		"\"They're children you thirsty whores\"",
 		// - Sam
 		"\"Pichu is illegal\"",
@@ -180,6 +193,10 @@
 		// - Also Sam
 		"\"There's no D in BDSM\"",
 		// - Rachael
+		"\"Beans fuck\"",
+		// - Preston
+		"\"So that's 9/11\"",
+		// - Lena
 		"God dammit, Sam",
 		"God dammit, Jacob",
 		"God dammit",
--- a/startpage/index.php
+++ b/startpage/index.php
@@ -21,13 +21,14 @@
 				</div>
 				<div class="spsubsection">
 					<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>
+					<a href="https://netbox.desu.ltd">Netbox</a>
+					<a href="https://nagios.desu.ltd">Nagios</a>
 				</div>
 				<div class="spsubsection">
-					<h4>9iron</h4>
-					<a href="https://9iron.club">Index</a>
+					<h4>Others</h4>
+					<a href="https://9iron.club">9iron</a>
+					<a href="http://local.desu.ltd">Localnet</a>
 				</div>
 				<div class="spsubsection">
 					<h4>Resources</h4>
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -8,21 +8,22 @@
 /* GLOBALS */

 :root {
-	--background-bright: #fdfcfa;
-	--background: #ecebe9;
+	--background-bright: #323232;
+	--background: #2a2a2a;
 	--line: rgba(0,0,0,0.1);
-	--greenlink: #327117;
-	--greenlink-hover: #47b625;
+	--greenlink: #47b625;
+	--greenlink-hover: #82e24f;
 	--warning: #f7cf04;
 	--error: #d95757;
-	--link: #286a9d;
-	--link-hover: #3ea5f3;
+	--link: #5da9fb;
+	--link-hover: #81ccfb;
 	--shadow: 8px -5px rgba(0,0,0,0.1);
-	--text: #414040;
-	--text-code: #a7674e;
+	--text: #d9d9d9;
+	--text-code: #d48163;
 }
 html {
 	overflow-y: scroll;
+	background: var(--background);
 }
 body {
 	background: var(--background);
@@ -67,9 +68,10 @@ ol li,ul li {

 /* CUSTOM DIVS AND SPANS */
 a.quickbutton {
-	background: var(--background-bright);
+	background: var(--link);
 	border-radius: 8px;
 	box-shadow: 5px 5px var(--shadow);
+	color: var(--background);
 	display: block;
 	font-size: 150%;
 	margin: 0.5em 0;
--- a/test.sh
+++ b/test.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+#
+# test.sh
+# Copyright (C) 2020 Vintage Salt <rehashedsalt@cock.li>
+#
+# Distributed under terms of the MIT license.
+#
+
+sudo docker run -p 8080:80 -it "$(sudo docker build -q .)"
+
Author	SHA1	Message	Date
Salt	73366663ab	Add background color to html This should hopefully fix white flashes	2022-01-26 00:54:09 -06:00
Salt	42480f0c09	Add test script Some checks failed Git Desu/9iron/pipeline/head There was a failure building this commit Details	2022-01-26 00:49:11 -06:00
Salt	501b5715b0	Dark mode? Dark mode All checks were successful Git Desu/9iron/pipeline/head This commit looks good Details	2022-01-26 00:41:55 -06:00
Salt	4d3ac51569	Fix typo	2022-01-26 00:35:39 -06:00
Salt	a4cde53a63	Switch to a Docker agent (hopefully) Some checks failed Git Desu/9iron/pipeline/head There was a failure building this commit Details	2022-01-23 08:46:34 -06:00
Salt	cdd06e78d0	Fix syntax error in Jenkinsfile All checks were successful Git Desu/9iron/pipeline/head This commit looks good Details	2022-01-22 15:28:24 -06:00
Salt	5229ecd6b6	Merge gitlab.com:rehashedsalt/9iron Some checks failed Git Desu/9iron/pipeline/head There was a failure building this commit Details	2022-01-22 15:25:31 -06:00
Salt	7e45b51a8a	Add test Jenkinsfile	2022-01-22 15:25:03 -06:00
Salt	5a3efb8d99	Add a quote	2022-01-16 21:07:39 -06:00
Salt	6041244174	Goddammit I missed a comma	2022-01-01 22:30:16 -06:00
Salt	ff4412cf19	Add a bunch of new quotes	2022-01-01 13:01:00 -06:00
Salt	57c19f545c	Add docs on MovieNight	2021-08-24 22:09:28 -05:00
Salt	77b642fd5e	Add Preston's first quote	2021-08-19 19:13:13 -05:00
Salt	bad0005ca8	Point to OpenJDK instead of Oracle Java	2021-08-11 01:05:06 -05:00
Salt	c459302873	Add Nagios	2021-08-08 01:37:32 -05:00
Salt	4485eaf2ea	Reorganize startpage things	2021-08-01 22:51:35 -05:00