Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8c36a3e3a6 | |||
| 4b6449a7a0 | |||
| 3fefa976ea | |||
| d0e38f14ac | |||
| f56c7831ed | |||
| 01600d8e50 | |||
| befb88d498 | |||
| 217ba01f12 | |||
| 96a3ca543b | |||
| 3a5e991870 | |||
| 5da241b62e | |||
| 74c4f1c1f8 | |||
| f42d2f887f |
@@ -14,7 +14,7 @@ jobs:
|
|||||||
- name: Login to Docker Registry
|
- name: Login to Docker Registry
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
registry: g.lair.moe
|
registry: g.codrs.ru
|
||||||
username: ${{ vars.DOCKER_USERNAME }}
|
username: ${{ vars.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
@@ -26,6 +26,8 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: ${{ github.event_name == 'push' }}
|
push: ${{ github.event_name == 'push' }}
|
||||||
tags: g.lair.moe/${{ vars.DOCKER_USERNAME }}/lair.moe:latest
|
tags: |
|
||||||
|
g.codrs.ru/${{ vars.DOCKER_USERNAME }}/codrs.ru:latest
|
||||||
|
g.codrs.ru/${{ vars.DOCKER_USERNAME }}/codrs.ru:${{ github.sha }}
|
||||||
cache-from: type=gha
|
cache-from: type=gha
|
||||||
cache-to: type=gha,mode=max
|
cache-to: type=gha,mode=max
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
from os import system as console
|
from os import system as console
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
from htmlmin import minify
|
|
||||||
from flask import (
|
from flask import (
|
||||||
Flask,
|
Flask,
|
||||||
g,
|
g,
|
||||||
@@ -64,16 +63,16 @@ if app.debug:
|
|||||||
|
|
||||||
@app.route("/")
|
@app.route("/")
|
||||||
def index():
|
def index():
|
||||||
return minify(render_template('index.html'), remove_empty_space=True)
|
return render_template('index.html')
|
||||||
|
|
||||||
@app.route("/host")
|
@app.route("/host")
|
||||||
def host():
|
def host():
|
||||||
return minify(render_template('host.html'), remove_empty_space=True)
|
return render_template('host.html')
|
||||||
|
|
||||||
@app.route("/us")
|
@app.route("/us")
|
||||||
def us():
|
def us():
|
||||||
return minify(render_template('us.html'), remove_empty_space=True)
|
return render_template('us.html')
|
||||||
|
|
||||||
@app.route("/risdeveau")
|
@app.route("/risdeveau")
|
||||||
def risdeveau():
|
def risdeveau():
|
||||||
return minify(render_template('personal/risdeveau.html'), remove_empty_space=True)
|
return render_template('personal/risdeveau.html')
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ about host = Über Server
|
|||||||
|
|
||||||
|
|
||||||
[index]
|
[index]
|
||||||
altfronts = Altfronts
|
|
||||||
bottom_text = Außerdem bieten wir {glitchtip}, {baikal} und {freshrss} für Mitglieder unserer Gruppe an!
|
bottom_text = Außerdem bieten wir {glitchtip}, {baikal} und {freshrss} für Mitglieder unserer Gruppe an!
|
||||||
|
|
||||||
[index.descr]
|
[index.descr]
|
||||||
@@ -18,8 +17,6 @@ copyparty = Cloud-Dateispeicher
|
|||||||
4get = Proxy-Suchmaschine
|
4get = Proxy-Suchmaschine
|
||||||
tools = Satz verschiedener Werkzeuge
|
tools = Satz verschiedener Werkzeuge
|
||||||
vert = Dateiumwandler
|
vert = Dateiumwandler
|
||||||
tl = Altfront für beliebte Suchmaschinen
|
|
||||||
lyr = Altfront für Genius
|
|
||||||
|
|
||||||
|
|
||||||
[host]
|
[host]
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ about host = About host
|
|||||||
|
|
||||||
|
|
||||||
[index]
|
[index]
|
||||||
altfronts = Altfronts
|
|
||||||
bottom_text = We also have {glitchtip}, {baikal} and {freshrss} for members of our squad!
|
bottom_text = We also have {glitchtip}, {baikal} and {freshrss} for members of our squad!
|
||||||
|
|
||||||
[index.descr]
|
[index.descr]
|
||||||
@@ -18,8 +17,6 @@ copyparty = cloud file storage
|
|||||||
4get = proxy search engine
|
4get = proxy search engine
|
||||||
tools = set of various tools
|
tools = set of various tools
|
||||||
vert = file converter
|
vert = file converter
|
||||||
tl = altfront for popular search engines
|
|
||||||
lyr = altfront for Genius
|
|
||||||
|
|
||||||
|
|
||||||
[host]
|
[host]
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ about host = À propos de serveur
|
|||||||
|
|
||||||
|
|
||||||
[index]
|
[index]
|
||||||
altfronts = Altfronts
|
|
||||||
bottom_text = On a aussi {glitchtip}, {baikal} et {freshrss} pour les membres du groupe !
|
bottom_text = On a aussi {glitchtip}, {baikal} et {freshrss} pour les membres du groupe !
|
||||||
|
|
||||||
[index.descr]
|
[index.descr]
|
||||||
@@ -18,8 +17,6 @@ copyparty = Stockage de fichiers en cloud
|
|||||||
4get = Moteur de recherche proxy
|
4get = Moteur de recherche proxy
|
||||||
tools = ensemble d'outils variés
|
tools = ensemble d'outils variés
|
||||||
vert = convertisseur de fichiers
|
vert = convertisseur de fichiers
|
||||||
tl = altfront pour les moteurs de recherche populaires
|
|
||||||
lyr = altfront pour Genius
|
|
||||||
|
|
||||||
|
|
||||||
[host]
|
[host]
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ about host = サーバーについて
|
|||||||
|
|
||||||
|
|
||||||
[index]
|
[index]
|
||||||
altfronts = 代替フロントエンド
|
|
||||||
bottom_text = メンバーには {glitchtip}、{baikal}、{freshrss} も使えるよ!
|
bottom_text = メンバーには {glitchtip}、{baikal}、{freshrss} も使えるよ!
|
||||||
|
|
||||||
[index.descr]
|
[index.descr]
|
||||||
@@ -18,8 +17,6 @@ copyparty = クラウドファイルストレージ
|
|||||||
4get = プロキシ検索エンジン
|
4get = プロキシ検索エンジン
|
||||||
tools = 様々なツールのセット
|
tools = 様々なツールのセット
|
||||||
vert = ファイル変換ツール
|
vert = ファイル変換ツール
|
||||||
tl = 人気検索エンジン向けの代替フロントエンド
|
|
||||||
lyr = Genius向けの代替フロントエンド
|
|
||||||
|
|
||||||
|
|
||||||
[host]
|
[host]
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ about host = О хосте
|
|||||||
|
|
||||||
|
|
||||||
[index]
|
[index]
|
||||||
altfronts = Альтфронты
|
|
||||||
bottom_text = Ещё у нас есть {glitchtip}, {baikal} и {freshrss} для участников нашей группы!
|
bottom_text = Ещё у нас есть {glitchtip}, {baikal} и {freshrss} для участников нашей группы!
|
||||||
|
|
||||||
[index.descr]
|
[index.descr]
|
||||||
@@ -18,8 +17,6 @@ copyparty = облачное хранилище файлов
|
|||||||
4get = прокси-поисковик
|
4get = прокси-поисковик
|
||||||
tools = набор разнообразных утилит
|
tools = набор разнообразных утилит
|
||||||
vert = конвертация файлов
|
vert = конвертация файлов
|
||||||
tl = альтфронт для популярных поисковиков
|
|
||||||
lyr = альтфронт для Genius
|
|
||||||
|
|
||||||
|
|
||||||
[host]
|
[host]
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
Flask==3.1.1
|
Flask==3.1.1
|
||||||
gunicorn
|
gunicorn
|
||||||
htmlmin2
|
|
||||||
|
|||||||
@@ -3,16 +3,17 @@ let
|
|||||||
pypkgs = pkgs.python3Packages;
|
pypkgs = pkgs.python3Packages;
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
name = "lair.moe";
|
name = "codrs.ru";
|
||||||
|
|
||||||
buildInputs = with pypkgs; [
|
buildInputs = with pypkgs; [
|
||||||
python
|
python
|
||||||
virtualenv
|
virtualenv
|
||||||
|
# pkgs.nodejs
|
||||||
pkgs.nodePackages.sass
|
pkgs.nodePackages.sass
|
||||||
];
|
];
|
||||||
|
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
if [ ! -d ".venv" ]; then
|
if [ ! -d "venv" ]; then
|
||||||
python -m venv .venv
|
python -m venv .venv
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -95,10 +95,6 @@ header {
|
|||||||
background-color: $mantle;
|
background-color: $mantle;
|
||||||
padding: .5rem;
|
padding: .5rem;
|
||||||
font-size: larger;
|
font-size: larger;
|
||||||
|
|
||||||
.header-links * + * {
|
|
||||||
padding-left: 1ch;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
footer {
|
footer {
|
||||||
@@ -194,17 +190,6 @@ footer {
|
|||||||
border-radius: .2em;
|
border-radius: .2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.webring {
|
|
||||||
margin-top: 1rem;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
|
|
||||||
a {
|
|
||||||
padding: .5rem 1rem;
|
|
||||||
margin: .1rem !important;
|
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
::-webkit-scrollbar {
|
::-webkit-scrollbar {
|
||||||
width: .5rem;
|
width: .5rem;
|
||||||
|
|||||||
+2
-3
@@ -1,18 +1,17 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<title>Lair</title>
|
<title>Coders Squad</title>
|
||||||
|
|
||||||
<link rel="stylesheet" href="/static/style/main.css">
|
<link rel="stylesheet" href="/static/style/main.css">
|
||||||
<link rel="icon" type="image/webp" href="/static/icon/codrs.webp" />
|
<link rel="icon" type="image/webp" href="/static/icon/codrs.webp" />
|
||||||
<script src="/static/script/copy-mono.js"> </script>
|
<script src="/static/script/copy-mono.js"> </script>
|
||||||
<script
|
<script
|
||||||
src="https://track.lair.moe/api/script.js"
|
src="https://track.codrs.ru/api/script.js"
|
||||||
data-site-id="1"
|
data-site-id="1"
|
||||||
defer
|
defer
|
||||||
></script>
|
></script>
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<meta name="mock-email" content="admin@example.com">
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{% include 'header.tmpl' %}
|
{% include 'header.tmpl' %}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<footer>
|
<footer>
|
||||||
<div>lair.moe © 2025</div>
|
<div>codrs.ru © 2025</div>
|
||||||
<div><a href="https://g.lair.moe/Sweetbread/lair.moe">{{ _('site source') }}</a></div>
|
<div><a href="https://g.codrs.ru/Sweetbread/codrs.ru">{{ _('site source') }}</a></div>
|
||||||
<div>{{ _('contact us') }}: <a href="mailto:admin@lair.moe">admin@lair.moe</a></div>
|
<div>{{ _('contact us') }}: <a href="mailto:admin@codrs.ru">admin@codrs.ru</a></div>
|
||||||
</footer>
|
</footer>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<header>
|
<header>
|
||||||
{%- if request.path != url_for('index') %}
|
{%- if request.path != url_for('index') %}
|
||||||
<a href="{{ url_for('index') }}">Lair</a>
|
<a href="{{ url_for('index') }}">Coders Squad</a>
|
||||||
{%- else %}
|
{%- else %}
|
||||||
<div></div>
|
<div></div>
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|||||||
+3
-3
@@ -11,11 +11,11 @@
|
|||||||
<div class="block">
|
<div class="block">
|
||||||
<strong>{{ _("host:specifications") }}</strong>:
|
<strong>{{ _("host:specifications") }}</strong>:
|
||||||
<ul>
|
<ul>
|
||||||
<li>CPU: Ryzen 9@3.4GHz (4 cores)</li>
|
<li>CPU: Ryzen i9@3.4GHz (4 cores)</li>
|
||||||
<li>RAM: 8 GB</li>
|
<li>RAM: 8 GiB</li>
|
||||||
<li>SSD: 150 GB</li>
|
<li>SSD: 150 GB</li>
|
||||||
<li>ETH: 500Mb/s</li>
|
<li>ETH: 500Mb/s</li>
|
||||||
<li>Loc: Deutschland, Frankfurt am Main</li>
|
<li>Loc: Deutchland, Frankfurt am Mein</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
+11
-23
@@ -2,18 +2,18 @@
|
|||||||
|
|
||||||
{% block title %}
|
{% block title %}
|
||||||
<img src="/static/icon/codrs.webp" class="icon" />
|
<img src="/static/icon/codrs.webp" class="icon" />
|
||||||
Lair
|
Coders Squad
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<a href="https://b.lair.moe" target="_blank" class="block">
|
<a href="https://b.codrs.ru" target="_blank" class="block">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<img src="/static/icon/service/sharkey.webp" class="icon"/>
|
<img src="/static/icon/service/sharkey.webp" class="icon"/>
|
||||||
<strong>Sharkey</strong>
|
<strong>Sharkey</strong>
|
||||||
</div>
|
</div>
|
||||||
<p>{{ _('index.descr:sharkey') }}</p>
|
<p>{{ _('index.descr:sharkey') }}</p>
|
||||||
</a>
|
</a>
|
||||||
<a href="https://g.lair.moe" target="_blank" class="block">
|
<a href="https://g.codrs.ru" target="_blank" class="block">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<img src="/static/icon/service/gitea.webp" class="icon"/>
|
<img src="/static/icon/service/gitea.webp" class="icon"/>
|
||||||
<strong>Gitea</strong>
|
<strong>Gitea</strong>
|
||||||
@@ -23,16 +23,10 @@
|
|||||||
|
|
||||||
<div class="block">
|
<div class="block">
|
||||||
<p><a href="https://m.codrs.ru" target="_blank"><strong>Matrix</strong></a> — {{ _('index.descr:matrix') }}</p>
|
<p><a href="https://m.codrs.ru" target="_blank"><strong>Matrix</strong></a> — {{ _('index.descr:matrix') }}</p>
|
||||||
<p><a href="https://c.lair.moe" target="_blank"><strong>Copyparty</strong></a> — {{ _('index.descr:copyparty') }}</p>
|
<p><a href="https://c.codrs.ru" target="_blank"><strong>Copyparty</strong></a> — {{ _('index.descr:copyparty') }}</p>
|
||||||
<p><a href="https://tools.lair.moe" target="_blank"><strong>IT-tools</strong></a> — {{ _('index.descr:tools') }}</p>
|
<p><a href="https://s.codrs.ru" target="_blank"><strong>4get</strong></a> — {{ _('index.descr:4get') }}</p>
|
||||||
<p><a href="https://vert.lair.moe" target="_blank"><strong>Vert</strong></a> — {{ _('index.descr:vert') }}</p>
|
<p><a href="https://tools.codrs.ru" target="_blank"><strong>IT-tools</strong></a> — {{ _('index.descr:tools') }}</p>
|
||||||
</div>
|
<p><a href="https://vert.codrs.ru" target="_blank"><strong>Vert</strong></a> — {{ _('index.descr:vert') }}</p>
|
||||||
|
|
||||||
<div class="block">
|
|
||||||
<strong>{{ _('index:altfronts') }}</strong>
|
|
||||||
<p><a href="https://s.lair.moe" target="_blank"><strong>4get</strong></a> — {{ _('index.descr:4get') }}</p>
|
|
||||||
<p><a href="https://tl.lair.moe" target="_blank"><strong>TransLite</strong></a> — {{ _('index.descr:tl') }}</p>
|
|
||||||
<p><a href="https://lyr.lair.moe" target="_blank"><strong>Intellectual</strong></a> — {{ _('index.descr:lyr') }}</p>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="block">
|
<div class="block">
|
||||||
@@ -40,8 +34,8 @@
|
|||||||
<strong>DNS</strong>:
|
<strong>DNS</strong>:
|
||||||
<ul>
|
<ul>
|
||||||
<li><span class="mono">64.188.64.176</span></li>
|
<li><span class="mono">64.188.64.176</span></li>
|
||||||
<li>DoT: <span class="mono">lair.moe:853</span></li>
|
<li>DoT: <span class="mono">codrs.ru:853</span></li>
|
||||||
<li>DoH: <span class="mono">dns.lair.moe</span></li>
|
<li>DoH: <span class="mono">dns.codrs.ru</span></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<p>
|
<p>
|
||||||
@@ -54,15 +48,9 @@
|
|||||||
{{
|
{{
|
||||||
_('index:bottom_text',
|
_('index:bottom_text',
|
||||||
glitchtip='<a href="https://bug.codrs.ru" target="_blank"><strong>GlitchTip</strong></a>',
|
glitchtip='<a href="https://bug.codrs.ru" target="_blank"><strong>GlitchTip</strong></a>',
|
||||||
baikal='<a href="https://dav.lair.moe" target="_blank"><strong>Baikal</strong></a>',
|
baikal='<a href="https://dav.codrs.ru" target="_blank"><strong>Baikal</strong></a>',
|
||||||
freshrss='<a href="https://rss.lair.moe" target="_blank"><strong>FreshRSS</strong></a>',
|
freshrss='<a href="https://rss.codrs.ru" target="_blank"><strong>FreshRSS</strong></a>',
|
||||||
) | safe
|
) | safe
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="webring">
|
|
||||||
<a class="block" href="https://webring.otomir23.me/lair/prev"><</a>
|
|
||||||
<a class="block" href="https://webring.otomir23.me/">Otoring</a>
|
|
||||||
<a class="block" href="https://webring.otomir23.me/lair/next">></a>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<link rel="stylesheet" href="/static/style/risdeveau.css">
|
<link rel="stylesheet" href="/static/style/risdeveau.css">
|
||||||
<link rel="icon" type="image/webp" href="/static/icon/us/risdeveau.webp" />
|
<link rel="icon" type="image/webp" href="/static/icon/us/risdeveau.webp" />
|
||||||
<script
|
<script
|
||||||
src="https://track.lair.moe/api/script.js"
|
src="https://track.codrs.ru/api/script.js"
|
||||||
data-site-id="1"
|
data-site-id="1"
|
||||||
defer
|
defer
|
||||||
></script>
|
></script>
|
||||||
@@ -15,13 +15,13 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header>
|
<header>
|
||||||
<a href="{{ url_for('index') }}">Lair</a>
|
<a href="{{ url_for('index') }}">Coders Squad</a>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<main>
|
<main>
|
||||||
<h3>Development</h3>
|
<h3>Development</h3>
|
||||||
<div class="blocks badges">
|
<div class="blocks badges">
|
||||||
<a class="block" href="//g.lair.moe/Sweetbread">
|
<a class="block" href="//g.codrs.ru/Sweetbread">
|
||||||
<img class="icon" src="/static/icon/service/gitea.webp" />
|
<img class="icon" src="/static/icon/service/gitea.webp" />
|
||||||
Gitea
|
Gitea
|
||||||
</a>
|
</a>
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
<img class="icon" src="https://matrix.org/assets/favicon.ico" />
|
<img class="icon" src="https://matrix.org/assets/favicon.ico" />
|
||||||
Matrix
|
Matrix
|
||||||
</a>
|
</a>
|
||||||
<a class="block" href="//b.lair.moe/@risdeveau">
|
<a class="block" href="//b.codrs.ru/@risdeveau">
|
||||||
<img class="icon" src="/static/icon/service/sharkey.webp" />
|
<img class="icon" src="/static/icon/service/sharkey.webp" />
|
||||||
Fediverse
|
Fediverse
|
||||||
</a>
|
</a>
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
<img class="icon" src="https://cdn.prod.website-files.com/6257adef93867e50d84d30e2/66e3d80db9971f10a9757c99_Symbol.svg" />
|
<img class="icon" src="https://cdn.prod.website-files.com/6257adef93867e50d84d30e2/66e3d80db9971f10a9757c99_Symbol.svg" />
|
||||||
Discord
|
Discord
|
||||||
</a>
|
</a>
|
||||||
<a class="block" href="mailto:risdeveau@lair.moe">
|
<a class="block" href="mailto:risdeveau@codrs.ru">
|
||||||
Mail
|
Mail
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user