Merge remote-tracking branch 'upstream/main'

ct/homeassistant-core.sh

@@ -85,7 +85,7 @@ function update_script() {
 
     msg_info "Updating Home Assistant"
     source /srv/homeassistant/bin/activate
-    pip install ${BR}--upgrade homeassistant &>/dev/null
+    uv pip install ${BR}--upgrade homeassistant &>/dev/null
     msg_ok "Updated Home Assistant"
 
     msg_info "Starting Home Assistant"

ct/k0s.sh

@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-source <(curl -s https://raw.githubusercontent.com/asylumexp/Proxmox/main/misc/build.func)
-# Copyright (c) 2021-2024 tteck
-# Author: tteck (tteckster)
-# License: MIT
-# https://github.com/tteck/Proxmox/raw/main/LICENSE
-
-function header_info {
-clear
-cat <<"EOF"
-    __   ____          __ __      __                         __           
-   / /__/ __ \_____   / //_/_  __/ /_  ___  _________  ___  / /____  _____
-  / //_/ / / / ___/  / ,< / / / / __ \/ _ \/ ___/ __ \/ _ \/ __/ _ \/ ___/
- / ,< / /_/ (__  )  / /| / /_/ / /_/ /  __/ /  / / / /  __/ /_/  __(__  ) 
-/_/|_|\____/____/  /_/ |_\__,_/_.___/\___/_/  /_/ /_/\___/\__/\___/____/  
-                                                                          
-EOF
-}
-header_info
-echo -e "Loading..."
-APP="k0s"
-var_disk="4"
-var_cpu="2"
-var_ram="2048"
-var_os="debian"
-var_version="11"
-variables
-color
-catch_errors
-
-function default_settings() {
-  CT_TYPE="1"
-  PW=""
-  CT_ID=$NEXTID
-  HN=$NSAPP
-  DISK_SIZE="$var_disk"
-  CORE_COUNT="$var_cpu"
-  RAM_SIZE="$var_ram"
-  BRG="vmbr0"
-  NET="dhcp"
-  GATE=""
-  APT_CACHER=""
-  APT_CACHER_IP=""
-  DISABLEIP6="no"
-  MTU=""
-  SD=""
-  NS=""
-  MAC=""
-  VLAN=""
-  SSH="no"
-  VERB="no"
-  echo_default
-}
-
-function update_script() {
-header_info
-if [[ ! -f /etc/k0s/k0s.yaml ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
-msg_info "Updating ${APP} LXC"
-apt-get update &>/dev/null
-apt-get -y upgrade &>/dev/null
-msg_ok "Updated Successfully"
-exit
-}
-
-start
-build_container
-description
-
-msg_ok "Completed Successfully!\n"

ct/keycloak.sh

@@ -57,8 +57,32 @@ function update_script() {
 header_info
 if [[ ! -f /etc/systemd/system/keycloak.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
 msg_info "Updating ${APP} LXC"
+
+msg_info "Updating packages"
 apt-get update &>/dev/null
 apt-get -y upgrade &>/dev/null
+
+RELEASE=$(curl -s https://api.github.com/repos/keycloak/keycloak/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+msg_info "Downloading Keycloak v$RELEASE"
+cd /opt
+wget -q https://github.com/keycloak/keycloak/releases/download/$RELEASE/keycloak-$RELEASE.tar.gz
+$STD tar -xvf keycloak-$RELEASE.tar.gz
+
+msg_info "Merging configuration files"
+cp -r keycloak/conf keycloak-$RELEASE
+cp -r keycloak/providers keycloak-$RELEASE
+cp -r keycloak/themes keycloak-$RELEASE
+
+msg_info "Updating Keycloak"
+mv keycloak keycloak.old
+mv keycloak-$RELEASE keycloak
+
+msg_info "Delete temporary installation files"
+rm keycloak-$RELEASE.tar.gz
+rm -rf keycloak.old
+
+msg_info "Restating Keycloak"
+systemctl restart keycloak
 msg_ok "Updated Successfully"
 exit
 }

ct/nginxproxymanager.sh

@@ -168,6 +168,7 @@ EOF
 
   msg_info "Starting Services"
   sed -i 's/user npm/user root/g; s/^pid/#pid/g' /usr/local/openresty/nginx/conf/nginx.conf
+  sed -i 's/su npm npm/su root root/g' /etc/logrotate.d/nginx-proxy-manager
   sed -i 's/include-system-site-packages = false/include-system-site-packages = true/g' /opt/certbot/pyvenv.cfg
   systemctl enable -q --now openresty
   systemctl enable -q --now npm

ct/spoolman.sh

@@ -71,7 +71,7 @@ if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_v
   rm -rf spoolman_bak
   mv spoolman spoolman_bak
   wget -q https://github.com/Donkie/Spoolman/releases/download/${RELEASE}/spoolman.zip 
-  unzip -q spoolman.zip -d spoolman 
+  unzip -q spoolman.zip -d spoolman
   cd spoolman
   pip3 install -r requirements.txt >/dev/null 2>&1
   wget -q https://raw.githubusercontent.com/Donkie/Spoolman/master/.env.example -O .env

ct/traefik.sh

@@ -62,6 +62,7 @@ if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}
   tar -C /tmp -xzf traefik*.tar.gz
   mv /tmp/traefik /usr/bin/
   rm -rf traefik*.tar.gz
+  systemctl restart traefik.service
   msg_ok "Updated $APP LXC"
 else
   msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/whoogle.sh

@@ -57,6 +57,7 @@ header_info
 if [[ ! -f /usr/local/bin/whoogle-search ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
 msg_info "Updating ${APP} LXC"
 pip3 install whoogle-search --upgrade &>/dev/null
+systemctl restart whoogle.service
 msg_ok "Updated Successfully"
 exit
 }