From b50de1e4f7aa9f742b7e873c933bd8c6177abbe7 Mon Sep 17 00:00:00 2001 From: DarkFeather Date: Tue, 30 Sep 2025 17:14:49 -0500 Subject: [PATCH] Styling updates for Gitea upgrades --- examples/msn0.yml | 15 ++++++++++----- precommit-hooks/find-data-files | 2 +- .../Foundation/files/custom/bin/gen-aninix-custom | 5 ++++- roles/Foundation/files/custom/templates/home.tmpl | 8 ++++---- .../files/web-snippets/martialarts/index | 2 +- roles/Foundation/templates/app.ini.j2 | 4 +++- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/examples/msn0.yml b/examples/msn0.yml index 43df3b7..c62fc8c 100644 --- a/examples/msn0.yml +++ b/examples/msn0.yml @@ -23,6 +23,7 @@ all: static: false wireless_ssid: 'Shadownet' ansible_python_interpreter: auto_silent + aether_primary: 'Yggdrasil' ldap: server: "10.0.1.3" orgdn: "dc=aninix,dc=net" @@ -38,6 +39,9 @@ all: ssl: # Standard SSL cryptographic standards identity: 'aninix.net-0002' # The Let's Encrypt identity to use ciphersuite: "!NULL:!SSLv2:!SSLv3:!TLSv1:EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH" + Aether_nodes: + - DedSec.msn0.aninix.net + children: managed: children: @@ -117,7 +121,7 @@ all: ipinterface: ens3 mac: 00:15:5d:01:02:10 cores: 4 - memory: 4 + memory: 6 vnc: 8 bridge: br0 uefi: true @@ -130,8 +134,8 @@ all: ipinterface: ens3 ip: 10.0.1.17 mac: 00:15:5d:01:02:05 - cores: 4 - memory: 4 + cores: 2 + memory: 2 vnc: 9 bridge: br0 disks: @@ -291,7 +295,7 @@ all: mac: 70:74:14:4f:8e:42 Node0: ip: 10.0.1.66 - mac: e0:be:03:77:0e:88 + mac: 70:32:17:46:49:89 LivingRoomTV: ip: 10.0.1.69 mac: 80:d2:1d:17:63:0e @@ -322,8 +326,9 @@ all: Gatekeeper: ip: 10.0.2.4 mac: 64:52:99:14:28:2b - # CaretakerAlpha has no network # iRobot Roomba + # CaretakerAlpha has no network CaretakerBravo: ip: 10.0.2.5 mac: 40:9f:38:95:06:34 + # CaretakerCharlie has no network diff --git a/precommit-hooks/find-data-files b/precommit-hooks/find-data-files index f14d556..638ebec 100644 --- a/precommit-hooks/find-data-files +++ b/precommit-hooks/find-data-files @@ -1,6 +1,6 @@ #!/bin/bash -result="$(find roles/*/{files,templates} -type f -exec file {} \; | grep -Ev ASCII\ text\|empty\|Unicode\ text | grep -v motd.txt.j2)" +result="$(find roles/*/{files,templates} -type f -exec file {} \; | grep -Ev ASCII\ text\||JSON|empty\|Unicode\ text | grep -v motd.txt.j2)" if [ -n "$result" ]; then echo "These files need to be evaluated -- generally, don't commit data files to Git." echo "$result" diff --git a/roles/Foundation/files/custom/bin/gen-aninix-custom b/roles/Foundation/files/custom/bin/gen-aninix-custom index 8e0f2d7..58f810e 100644 --- a/roles/Foundation/files/custom/bin/gen-aninix-custom +++ b/roles/Foundation/files/custom/bin/gen-aninix-custom @@ -1,6 +1,6 @@ #!/bin/bash -URI=https://aninix.net/assets/css/theme-arc-green.css +URI=https://aninix.net/assets/css/theme-gitea-dark.css # Gitea arc-green palette BOLDTEXT='#87ab63' @@ -62,3 +62,6 @@ for i in `find . -type f`; do cat "$i" echo "$foot") > /var/lib/gitea/custom/public/assets/"$i".html done + +# AniNIX Martial Arts Special Sauce +sed -i 's#/user/login?redirect_to=%2f#/user/login?redirect_to=%2FMartialArts#g' /var/lib/gitea/custom/public/assets/martialarts/index.html diff --git a/roles/Foundation/files/custom/templates/home.tmpl b/roles/Foundation/files/custom/templates/home.tmpl index 16bf06d..f6350f6 100644 --- a/roles/Foundation/files/custom/templates/home.tmpl +++ b/roles/Foundation/files/custom/templates/home.tmpl @@ -60,10 +60,10 @@

We host a number of web apps to make our users' lives easier.

-
RSS

AniNIX/Singularity (News powered by TT-RSS)

-

AniNIX/Yggdrasil (Media powered by Emby)

-

AniNIX/Sharingan (Monitoring powered by Graylog)

-

AniNIX/Cyberbrain (SFTP Dropbox)

+
RSS

Singularity

News powered by TT-RSS

+

Yggdrasil

Media powered by Emby

+

Sharingan

Monitoring powered by Graylog

+

Cyberbrain

SFTP Dropbox

diff --git a/roles/Foundation/files/web-snippets/martialarts/index b/roles/Foundation/files/web-snippets/martialarts/index index 412378a..1f687d0 100644 --- a/roles/Foundation/files/web-snippets/martialarts/index +++ b/roles/Foundation/files/web-snippets/martialarts/index @@ -17,7 +17,7 @@

- Open-source + Open-source

We want your training with our system to become a part of your life. This means that we provide access to a revision-controlled copy of our notes that all our students can download, keep, and contribute to. We're tired of the old era where how the system works is kept hidden from students and piecemealed out as a marketing ploy -- we want to be as trasparent as possible in how our program and our martial art function. Transparency keeps our instructors honest and our students engaged -- this means a better martial arts experience for everyone. diff --git a/roles/Foundation/templates/app.ini.j2 b/roles/Foundation/templates/app.ini.j2 index 9f8edd2..cb930ea 100644 --- a/roles/Foundation/templates/app.ini.j2 +++ b/roles/Foundation/templates/app.ini.j2 @@ -107,9 +107,11 @@ SHOW_USER_EMAIL = true ; Set the default theme for the Gitea install DEFAULT_THEME = aninix ; All available themes. Allow users select personalized themes regardless of the value of `DEFAULT_THEME`. -THEMES = gitea,arc-green,aninix +THEMES = gitea-light,gitea-dark,aninix ; Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used. DEFAULT_SHOW_FULL_NAME = false +; Disabling since we can check as a pre-commit hook +AMBIGUOUS_UNICODE_DETECTION = false [ui.admin] ; Number of users that are displayed on one page