Compare commits
13 Commits
Author | SHA1 | Date |
---|---|---|
Salt | 60d1246546 | |
Salt | aa954d54b3 | |
Salt | 8e7d10f293 | |
Salt | 80c43ad392 | |
Salt | 2dd01f43b3 | |
Salt | 9fb8222425 | |
Salt | b74b132072 | |
Salt | 879b62eb0b | |
Salt | a1963a10ae | |
Salt | 6c685db1b5 | |
Salt | 69bcd0a4ff | |
Salt | 20ee5563a8 | |
Salt | 05b7eb0556 |
|
@ -10,7 +10,7 @@ variables:
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
# - test
|
# - test
|
||||||
- push
|
- deploy
|
||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
before_script:
|
before_script:
|
||||||
|
@ -32,48 +32,24 @@ Build:
|
||||||
--platform linux/amd64,linux/arm64
|
--platform linux/amd64,linux/arm64
|
||||||
--cache-from $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
|
--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:$CI_COMMIT_SHORT_SHA
|
||||||
|
--tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:bleeding
|
||||||
--push
|
--push
|
||||||
.
|
.
|
||||||
- docker images
|
- docker images
|
||||||
|
Build_Tag:
|
||||||
# TEST
|
stage: build
|
||||||
# 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:
|
only:
|
||||||
- tags
|
- tags
|
||||||
script:
|
script:
|
||||||
- docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
- docker pull $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest || true
|
||||||
|
- docker buildx create --use
|
||||||
- >
|
- >
|
||||||
docker tag
|
docker buildx build
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
--pull
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
|
--platform linux/amd64,linux/arm64
|
||||||
- >
|
--cache-from $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
|
||||||
docker tag
|
--tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:$CI_COMMIT_SHORT_SHA
|
--tag $CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
|
||||||
$CI_HUB_USERNAME/$CI_PROJECT_NAME:latest
|
--push
|
||||||
|
.
|
||||||
- docker images
|
- 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
|
|
||||||
|
|
|
@ -12,9 +12,7 @@
|
||||||
<p>desu.ltd is free and open-source software (to the degree that these documents can be considered software). It hosts its own source under a git repo at <a href="https://git.desu.ltd/salt/desultd">git.desu.ltd/salt/desultd</a>.</p>
|
<p>desu.ltd is free and open-source software (to the degree that these documents can be considered software). It hosts its own source under a git repo at <a href="https://git.desu.ltd/salt/desultd">git.desu.ltd/salt/desultd</a>.</p>
|
||||||
<p>While the repo may say different, if you're reading this text, you can use any content within this site that I hold rights to under the terms of the Creative Commons CC0 license. I really don't give a shit.</p>
|
<p>While the repo may say different, if you're reading this text, you can use any content within this site that I hold rights to under the terms of the Creative Commons CC0 license. I really don't give a shit.</p>
|
||||||
<h1>Contact Information</h1>
|
<h1>Contact Information</h1>
|
||||||
<p>You can contact me using the email address I use for my commits. You can also get ahold of me over these applications:
|
<p>Maybe don't. If you're so inclined, my email is attached to my commits.</p>
|
||||||
<ul>
|
|
||||||
<li>Fedi: <code>@salt@cowfee.moe</code></li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
░█████╗░░█████╗░░█████╗░██╗░░██╗
|
||||||
|
██╔══██╗██╔══██╗██╔══██╗██║░██╔╝
|
||||||
|
██║░░╚═╝██║░░██║██║░░╚═╝█████═╝░
|
||||||
|
██║░░██╗██║░░██║██║░░██╗██╔═██╗░
|
||||||
|
╚█████╔╝╚█████╔╝╚█████╔╝██║░╚██╗
|
||||||
|
░╚════╝░░╚════╝░░╚════╝░╚═╝░░╚═╝
|
|
@ -0,0 +1,14 @@
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⠀⠤⠴⠶⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣶⣾⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠂⠉⡇⠀⠀⠀⢰⣿⣿⣿⣿⣧⠀⠀⢀⣄⣀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⢠⣶⣶⣷⠀⠀⠀⠸⠟⠁⠀⡇⠀⠀⠀⠀⠀⢹⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠘⠟⢹⣋⣀⡀⢀⣤⣶⣿⣿⣿⣿⣿⡿⠛⣠⣼⣿⡟⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⣴⣾⣿⣿⣿⣿⢁⣾⣿⣿⣿⣿⣿⣿⡿⢁⣾⣿⣿⣿⠁⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠸⣿⣿⣿⣿⣿⣿⢸⣿⣿⣿⣿⣿⣿⣿⡇⢸⣿⣿⣿⠿⠇⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠳⣤⣙⠟⠛⢻⠿⣿⠸⣿⣿⣿⣿⣿⣿⣿⣇⠘⠉⠀⢸⠀⢀⣠⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠈⠻⣷⣦⣼⠀⠀⠀⢻⣿⣿⠿⢿⡿⠿⣿⡄⠀⠀⣼⣷⣿⣿⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠈⣿⣿⣿⣶⣄⡈⠉⠀⠀⢸⡇⠀⠀⠉⠂⠀⣿⣿⣿⣧⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠘⣿⣿⣿⣿⣿⣷⣤⣀⣸⣧⣠⣤⣴⣶⣾⣿⣿⣿⡿⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⠘⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠟⠛⠉⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠉⠉⠉⠉⠉⠉⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
|
@ -0,0 +1,12 @@
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡜⢣⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⠎⡴⢦⠱⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⢎⣜⣉⣉⣧⡱⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⢃⡞⠒⣒⣒⠒⢳⡘⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⣰⢡⣎⡩⠭⠤⠤⠭⢍⣱⡜⣆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⡴⢡⡯⠴⢒⣈⣩⣉⣑⡒⠠⣹⡌⢦⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⠀⠀⡔⣡⣣⠔⡺⡋⡁⢀⡀⢈⠙⢟⠢⣝⣄⢢⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⠀⢀⡜⣰⡟⠁⢰⡓⢎⣀⣸⣿⣷⡱⢚⡆⠈⢻⣆⢣⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⠀⢀⠎⡼⣇⠣⡀⠸⡄⢊⢿⣿⣿⡿⡑⢠⠇⢀⠜⣸⢧⠱⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⠀⢠⢋⢼⡙⢌⠳⣍⠲⢽⣄⣁⠂⠐⣈⣠⡯⠔⣡⠞⡡⢊⣧⡙⡄⠀⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⠀⣠⢃⣞⠣⡙⠦⡑⠦⣍⡒⠤⠬⠭⠭⠥⠤⢒⣩⠴⢊⠴⢋⠜⣳⡘⣄⠀⠀⠀⠀⠀⠀⠀
|
||||||
|
⣰⣃⣛⣚⣓⣚⣓⣚⣓⣒⣛⣛⣓⣒⣒⣚⣛⣛⣒⣚⣓⣚⣓⣚⣒⣛⣘⣆⠀⠀
|
|
@ -0,0 +1,11 @@
|
||||||
|
⠀⠀⠀⢀⣀⣤⣴⣶⣶⣾⣿⣷⣶⣶⣦⣄⡀
|
||||||
|
⠀⢠⣴⣿⣿⣿⣿⣿⣭⣭⣭⣭⣭⣿⣿⣿⣿⣧⣀
|
||||||
|
⢰⣿⣿⣿⣿⣿⣯⣿⡶⠶⠶⠶⠶⣶⣭⣽⣿⣿⣷⣆
|
||||||
|
⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿
|
||||||
|
⠈⢿⣿⣿⡿⠋⠉⠁⠈⠉⠛⠉⠀⠀⠀⠈⠻⣿⡿⠃
|
||||||
|
⠀⠀⠀⠉⠁⠀⢴⣐⢦⠀⠀⠀⣴⡖⣦⠀⠀⠈
|
||||||
|
⠀⠀⠀⠀⠀⠀⠈⠛⠋⠀⠀⠀⠈⠛⠁
|
||||||
|
⠀⠀⠀⠀⠀⣀⡀⠀⠀⠀⣀⠀⠀⠀⢀⡀
|
||||||
|
⠀⠀⢀⡔⣻⣭⡇⠀⣼⣿⣿⣿⡇⠦⣬⣟⢓⡄
|
||||||
|
⠀⠀⠀⠉⠁⠀⠀⠀⣿⣿⣿⣿⡇⠀⠀⠉⠉
|
||||||
|
⠀⠀⠀⠀⠀⠀⠀⠀⠻⠿⠿⠟⠁
|
|
@ -0,0 +1,22 @@
|
||||||
|
⣿⣿⣿⣿⠛⠛⠉⠄⠁⠄⠄⠉⠛⢿⣿⣿⣿⣿⣿⣿⣿
|
||||||
|
⣿⣿⡟⠁⠄⠄⠄⠄⠄⠄⠄⠄⠄⠄⣿⣿⣿⣿⣿⣿⣿
|
||||||
|
⣿⣿⡇⠄⠄⠄⠐⠄⠄⠄⠄⠄⠄⠄⠠⣿⣿⣿⣿⣿⣿
|
||||||
|
⣿⣿⡇⠄⢀⡀⠠⠃⡐⡀⠠⣶⠄⠄⢀⣿⣿⣿⣿⣿⣿
|
||||||
|
⣿⣿⣶⠄⠰⣤⣕⣿⣾⡇⠄⢛⠃⠄⢈⣿⣿⣿⣿⣿⣿
|
||||||
|
⣿⣿⣿⡇⢀⣻⠟⣻⣿⡇⠄⠧⠄⢀⣾⣿⣿⣿⣿⣿⣿
|
||||||
|
⣿⣿⣿⣟⢸⣻⣭⡙⢄⢀⠄⠄⠄⠈⢹⣯⣿⣿⣿⣿⣿
|
||||||
|
⣿⣿⣿⣭⣿⣿⣿⣧⢸⠄⠄⠄⠄⠄⠈⢸⣿⣿⣿⣿⣿
|
||||||
|
⣿⣿⣿⣼⣿⣿⣿⣽⠘⡄⠄⠄⠄⠄⢀⠸⣿⣿⣿⣿⣿
|
||||||
|
⡿⣿⣳⣿⣿⣿⣿⣿⠄⠓⠦⠤⠤⠤⠼⢸⣿⣿⣿⣿⣿
|
||||||
|
⡹⣧⣿⣿⣿⠿⣿⣿⣿⣿⣿⣿⣿⢇⣓⣾⣿⣿⣿⣿⣿
|
||||||
|
⡞⣸⣿⣿⢏⣼⣶⣶⣶⣶⣤⣶⡤⠐⣿⣿⣿⣿⣿⣿⣿
|
||||||
|
⣯⣽⣛⠅⣾⣿⣿⣿⣿⣿⡽⣿⣧⡸⢿⣿⣿⣿⣿⣿⣿
|
||||||
|
⣿⣿⣿⡷⠹⠛⠉⠁⠄⠄⠄⠄⠄⠄⠐⠛⠻⣿⣿⣿⣿
|
||||||
|
⣿⣿⣿⠃⠄⠄⠄⠄⠄⣠⣤⣤⣤⡄⢤⣤⣤⣤⡘⠻⣿
|
||||||
|
⣿⣿⡟⠄⠄⣀⣤⣶⣿⣿⣿⣿⣿⣿⣆⢻⣿⣿⣿⡎⠝
|
||||||
|
⣿⡏⠄⢀⣼⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡎⣿⣿⣿⣿⠐
|
||||||
|
⣿⡏⣲⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢇⣿⣿⣿⡟⣼
|
||||||
|
⣿⡠⠜⣿⣿⣿⣿⣟⡛⠿⠿⠿⠿⠟⠃⠾⠿⢟⡋⢶⣿
|
||||||
|
⣿⣧⣄⠙⢿⣿⣿⣿⣿⣿⣷⣦⡀⢰⣾⣿⣿⡿⢣⣿⣿
|
||||||
|
⣿⣿⣿⠂⣷⣶⣬⣭⣭⣭⣭⣵⢰⣴⣤⣤⣶⡾⢐⣿⣿
|
||||||
|
⣿⣿⣿⣷⡘⣿⣿⣿⣿⣿⣿⣿⢸⣿⣿⣿⣿⢃⣼⣿⣿
|
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@desu.ltd sudo git -C /var/www/desu.ltd pull
|
|
||||||
|
|
14
index.php
14
index.php
|
@ -8,21 +8,13 @@
|
||||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
|
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-header.php';?>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<h1>desu.ltd?</h1>
|
<h1>desu.ltd?</h1>
|
||||||
<p>desu.ltd. The domain of me, a guy on the internet named Salt.</p>
|
<p>desu.ltd. The domain of me, a guy on the internet.</p>
|
||||||
<h1>Webservices</h1>
|
<p>There's not much here, at least that you should care about.</p>
|
||||||
<ul>
|
|
||||||
<li><a href="https://git.desu.ltd">Gitea</a> - My personal code forge</li>
|
|
||||||
<li><a href="https://nc.desu.ltd">Nextcloud</a> - For storing files and other things</li>
|
|
||||||
<li><a href="https://cowfee.moe">Pleroma</a> - A place to shitpost to strangers</li>
|
|
||||||
</ul>
|
|
||||||
<h1>Docs</h1>
|
<h1>Docs</h1>
|
||||||
<ul>
|
<ul>
|
||||||
|
<li><a href="/about">/about</a> - A page with some info about me</li>
|
||||||
<li><a href="/ascii">/ascii</a> - ASCII art I've collected over time</li>
|
<li><a href="/ascii">/ascii</a> - ASCII art I've collected over time</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h1>Related Websites</h1>
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://www.9iron.club">9iron.club</a> - The place where me and my friends keep docs and cool shit.</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
|
<?php include $_SERVER['DOCUMENT_ROOT'].'/src/common-footer.php';?>
|
||||||
</body>
|
</body>
|
||||||
|
|
Loading…
Reference in New Issue