Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 73366663ab | |||
| 42480f0c09 | |||
| 501b5715b0 | |||
| 4d3ac51569 | |||
| a4cde53a63 | |||
| cdd06e78d0 | |||
| 5229ecd6b6 | |||
| 7e45b51a8a | |||
| 5a3efb8d99 | |||
| 6041244174 | |||
| ff4412cf19 | |||
| 57c19f545c | |||
| 77b642fd5e | |||
| bad0005ca8 | |||
| c459302873 | |||
| 4485eaf2ea | |||
| be62eaab90 | |||
| e3cda80e2d | |||
| 45b69f0d40 | |||
| 088f732380 | |||
| 2915d423ce | |||
| f9fc76f0aa | |||
| 1ad0702a51 | |||
| 1053c272e2 | |||
| de333c1184 | |||
| a99fef6e22 | |||
| 93349725ba | |||
| a1fd8a5e31 |
@@ -4,3 +4,4 @@
|
||||
deploy.sh
|
||||
README.md
|
||||
test.sh
|
||||
Jenkinsfile
|
||||
|
||||
@@ -10,6 +10,7 @@ variables:
|
||||
stages:
|
||||
- build
|
||||
# - test
|
||||
- deploy
|
||||
services:
|
||||
- docker:dind
|
||||
before_script:
|
||||
@@ -52,3 +53,10 @@ Build_Tag:
|
||||
--push
|
||||
.
|
||||
- docker images
|
||||
|
||||
# DEPLOY
|
||||
Deploy:
|
||||
stage: deploy
|
||||
only:
|
||||
- tags
|
||||
trigger: rehashedsalt/ansible
|
||||
|
||||
19
Jenkinsfile
vendored
Normal file
19
Jenkinsfile
vendored
Normal file
@@ -0,0 +1,19 @@
|
||||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
image 'morlay/buildx:607a2ce'
|
||||
}
|
||||
}
|
||||
stages {
|
||||
stage('Build') {
|
||||
steps {
|
||||
echo 'BUILD'
|
||||
}
|
||||
}
|
||||
stage('Build Tag') {
|
||||
steps {
|
||||
echo 'BUILD TAG'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,10 +10,6 @@ This repo is a ready-to-go webroot. `git clone` and configure Apache. `git pull`
|
||||
|
||||
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
|
||||
|
||||
29
css/index.php
Normal file
29
css/index.php
Normal file
@@ -0,0 +1,29 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-meta.php';?>
|
||||
<title>9iron - Counter-Strike: Source</title>
|
||||
</head>
|
||||
<body>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
|
||||
<div class="content">
|
||||
<div class="section">
|
||||
<h1>Counter-Strike: Source</h1>
|
||||
<p>None of us are any good.</p>
|
||||
</div>
|
||||
<div class="subcontainer">
|
||||
<h2>Connecting to the Server</h2>
|
||||
<ol>
|
||||
<li>Open Counter-Strike: Source</li>
|
||||
<li>Hit "Find Servers"</li>
|
||||
<li>Go to the "Favorites" tab</li>
|
||||
<li>Hit "Add a server"</li>
|
||||
<li>Enter <code>css.thefuck.how</code> in and hit enter</li>
|
||||
<li>Connect to "The Salty Spitoon"</li>
|
||||
<li>The password is "dicks". The password is always "dicks".</li>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
|
||||
</body>
|
||||
</html>
|
||||
21
index.php
21
index.php
@@ -19,23 +19,20 @@
|
||||
<h1>Terraria</h1>
|
||||
<p>A game we've sunk just as much time into as Minecraft. Sometimes modded, sometimes not</p>
|
||||
</a>
|
||||
<a href="/css" class="iconbutton">
|
||||
<i class="fa fa-bomb"></i>
|
||||
<h1>CS:S</h1>
|
||||
<p>Rooty tooty "The bomb has been planted"</p>
|
||||
</a>
|
||||
<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>
|
||||
<div class="iconbuttoncontainer">
|
||||
<a href="https://git.9iron.club" class="iconbutton">
|
||||
<i class="fa fa-gitea"></i>
|
||||
<h1>Gitea</h1>
|
||||
<p>Git repository host and related services</p>
|
||||
</a>
|
||||
<a href="https://nc.9iron.club" class="iconbutton">
|
||||
<i class="fa fa-nextcloud"></i>
|
||||
<h1>Nextcloud</h1>
|
||||
<p>File storage and collaboration, feed reader, task organizer, and more</p>
|
||||
<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>
|
||||
|
||||
3
minecraft/packs/1.12.2-beginnerpack/desc.html
Normal file
3
minecraft/packs/1.12.2-beginnerpack/desc.html
Normal file
@@ -0,0 +1,3 @@
|
||||
<h2>Carson's Beginner Pack</h2>
|
||||
<p>1.12.2, Forge 2823</p>
|
||||
<p>A pack made for beginners to modded Minecraft as a whole. It's not handholdy, but it's light and features a good array of easy-to-pick-up mods.</p>
|
||||
BIN
minecraft/packs/1.12.2-beginnerpack/icon.png
Normal file
BIN
minecraft/packs/1.12.2-beginnerpack/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 146 KiB |
@@ -1 +0,0 @@
|
||||
1.16.5-valhelsia
|
||||
@@ -15,12 +15,23 @@
|
||||
</a>
|
||||
<h1>Setting Up Modded Minecraft</h1>
|
||||
</div>
|
||||
<div class="subcontainer" id="foreword">
|
||||
<h2>0. Sanity Check</h2>
|
||||
<p>This guide will only work under the following conditions:</p>
|
||||
<ul>
|
||||
<li>You own Minecraft: Java Edition</li>
|
||||
<li>You log in with a Mojang account, NOT a Microsoft account</li>
|
||||
</ul>
|
||||
<p>If these aren't true for you, stop reading here and consult with one of your server admins.</p>
|
||||
</div>
|
||||
<div class="subcontainer" id="java">
|
||||
<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>
|
||||
<div class="subcontainer" id="multimc">
|
||||
|
||||
45
movienight/index.php
Normal file
45
movienight/index.php
Normal file
@@ -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 > Auto-Configuration Wizard.</p>
|
||||
<ol>
|
||||
<li>Install <a href="https://obsproject.com/download">OBS</a></li>
|
||||
<li>Go to Tools > 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>
|
||||
@@ -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",
|
||||
@@ -112,6 +113,16 @@
|
||||
// - Me, context forgotten
|
||||
"\"Brett has Mrs. Chapman nipples\"",
|
||||
// - Me
|
||||
"\"28 - 6 >= Fuck You\"",
|
||||
// - 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\"",
|
||||
@@ -126,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?\"",
|
||||
@@ -136,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\"",
|
||||
@@ -160,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\"",
|
||||
@@ -176,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",
|
||||
|
||||
@@ -21,15 +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>
|
||||
<a href="https://git.9iron.club">Gitea</a>
|
||||
<a href="https://nc.9iron.club">Nextcloud</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>
|
||||
|
||||
@@ -8,19 +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;
|
||||
--link: #286a9d;
|
||||
--link-hover: #3ea5f3;
|
||||
--greenlink: #47b625;
|
||||
--greenlink-hover: #82e24f;
|
||||
--warning: #f7cf04;
|
||||
--error: #d95757;
|
||||
--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);
|
||||
@@ -65,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;
|
||||
@@ -88,6 +92,25 @@ div.quote {
|
||||
margin: 1em 4em;
|
||||
padding: 1em;
|
||||
}
|
||||
div.warning,div.error {
|
||||
border-radius: 8px;
|
||||
box-shadow: 5px 5px var(--shadow);
|
||||
padding: 1em;
|
||||
border: 2px solid var(--text);
|
||||
margin: 1em;
|
||||
}
|
||||
div.warning {
|
||||
border-color: var(--warning);
|
||||
}
|
||||
div.warning i {
|
||||
color: var(--warning);
|
||||
}
|
||||
div.error {
|
||||
border-color: var(--error);
|
||||
}
|
||||
div.error i {
|
||||
color: var(--error);
|
||||
}
|
||||
i.badge {
|
||||
font-size: 200%;
|
||||
float: right;
|
||||
|
||||
Reference in New Issue
Block a user