Merge branch 'master' of git.xw3.org:hanez/home

This commit is contained in:
Johannes Findeisen 2024-12-23 19:53:41 +01:00
commit a87a5bd516
3 changed files with 28 additions and 4 deletions

View file

@ -132,6 +132,7 @@ gamesmenu = {
graphicsmenu = {
{ "aseprite", "/usr/bin/aseprite", "/usr/share/icons/hicolor/48x48/apps/aseprite.png" },
{ "blender", "/usr/bin/blender", "/usr/share/icons/hicolor/scalable/apps/blender.svg" },
{ "eyedropper", "/usr/bin/eyedropper", "/usr/share/icons/hicolor/scalable/apps/com.github.finefindus.eyedropper.svg" },
{ "font manager", "/usr/bin/font-manager", "/usr/share/icons/gnome/48x48/apps/preferences-desktop-font.png" },
{ "font viewer", "/usr/bin/gnome-font-viewer", "/usr/share/icons/gnome/48x48/apps/preferences-desktop-font.png" },
{ "gimp", "/usr/bin/gimp", "/usr/share/icons/hicolor/48x48/apps/gimp.png" },
@ -186,6 +187,7 @@ multimediamenu = {
{ "kaffeine", "/usr/bin/kaffeine", "/usr/share/icons/hicolor/scalable/apps/kaffeine.svg" },
{ "mediathekview", "/home/hanez/opt/MediathekView/MediathekView", "/home/hanez/opt/MediathekView/MediathekView.svg" },
{ "plex", "/usr/bin/plexmediaplayer", "/usr/share/icons/hicolor/scalable/apps/plexmediaplayer.svg" },
{ "shortwave", "/usr/bin/shortwave", "/usr/share/icons/hicolor/scalable/apps/de.haeckerfelix.Shortwave.svg" },
{ "spotiflyer", "/opt/spotiflyer/bin/SpotiFlyer", "/opt/spotiflyer/lib/SpotiFlyer.png" },
{ "spotify", "/usr/bin/spotify-tray", "/usr/share/pixmaps/spotify-client.png" },
{ "spotube", "/usr/bin/spotube", "/usr/share/icons/spotube/spotube-logo.png" },

6
.zshrc
View file

@ -8,9 +8,9 @@ source ~/.penv
#export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
# Android / Kivy Development Stuff
export ANDROID_HOME=i$HOME/.android/sdk
export ANDROIDSDK="$HOME/.android/sdk"
export ANDROID_SDK_ROOT="$HOME/.android/sdk"
export ANDROID_HOME=$HOME/android/sdk
export ANDROIDSDK="$HOME/android/sdk"
export ANDROID_SDK_ROOT="$HOME/android/sdk"
#export ANDROIDNDK="/opt/android-ndk"
#export ANDROIDAPI="27"
#export ANDROIDNDKVER="r16b"

View file

@ -1,5 +1,22 @@
#!/bin/bash
cd /etc/lighttpd/vhosts.d
HOSTS="de.hacknf.lists
de.waffelgut
org.linspector
org.xw3.cloud
org.xw3.git
org.xw3.lists
org.xw3.mail
org.xw3.siem
org.xw3.sql"
for host in $HOSTS; do
cat /etc/lighttpd/vhosts.d/$host.conf.min > /etc/lighttpd/vhosts.d/$host.conf
done
/etc/init.d/lighttpd restart
mv /root/.acme.sh/acme.sh.log /root/.acme.sh/$(date +%s).log
acme.sh --cron --force --home /root/.acme.sh
@ -10,8 +27,13 @@ for host in $(ls /etc/acme | tr '\n' ' '); do
cat /etc/acme/$host/fullchain.cer >> /etc/acme/$host/$host.pem
done
for host in $HOSTS; do
cat /etc/lighttpd/vhosts.d/$host.conf.full > /etc/lighttpd/vhosts.d/$host.conf
done
/etc/init.d/lighttpd restart
/etc/init.d/nginx restart
#/etc/init.d/nginx restart
/etc/init.d/prosody restart
cat /etc/acme/mail.xw3.org/fullchain.cer > /opt/mailcow-dockerized/data/assets/ssl/mail.xw3.org/cert.pem