Update CHANGELOG.md (#885)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/pull_request_template.md

@@ -7,13 +7,13 @@
 ## ✍️ Description
 Provide a summary of the changes made and/or reference the issue being addressed.
 
-- 
+ 
 
 - - -
-
+**_Please remove unneeded lines!_**
 - Related Issue: # (issue number, if applicable)  
 - Related PR: # (if applicable)  
-- Related Discussion: [Link](https://github.com/community-scripts/ProxmoxVE/discussions)  
+- Related Discussion: []()(if applicable)  
 
 ---
 

CHANGELOG.md

@@ -16,6 +16,27 @@ All LXC instances created using this repository come pre-installed with Midnight
 > [!IMPORTANT]
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow
 
+## 2024-12-17
+
+### Changed
+
+### 🚀 Updated Scripts
+
+- Fix Alpine-Nextcloud: Bump PHP Version to 8.3 [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#865](https://github.com/community-scripts/ProxmoxVE/pull/865))
+- Correction of Jellyfin CT Port [@mneten](https://github.com/mneten) ([#884](https://github.com/community-scripts/ProxmoxVE/pull/884))
+- fix spinner on lxc-ip-tag [@MickLesk](https://github.com/MickLesk) ([#876](https://github.com/community-scripts/ProxmoxVE/pull/876))
+- Fix Keycloak Installation [@MickLesk](https://github.com/MickLesk) ([#874](https://github.com/community-scripts/ProxmoxVE/pull/874))
+- Fix ports ressources [@MickLesk](https://github.com/MickLesk) ([#867](https://github.com/community-scripts/ProxmoxVE/pull/867))
+
+### 🧰 Maintenance
+
+- Small Changes to the PR Template [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#862](https://github.com/community-scripts/ProxmoxVE/pull/862))
+
+### ❔ Unlabelled
+
+- calculate terminal size for header_info [@MickLesk](https://github.com/MickLesk) ([#879](https://github.com/community-scripts/ProxmoxVE/pull/879))
+- Fix header creation with figlet for alpine [@MickLesk](https://github.com/MickLesk) ([#869](https://github.com/community-scripts/ProxmoxVE/pull/869))
+
 ## 2024-12-16
 
 ### Changed

ct/adguard.sh

@@ -8,9 +8,9 @@ source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/m
 # App Default Values
 APP="Adguard"
 var_tags="adblock"
-var_cpu="2"
-var_ram="2048"
-var_disk="4"
+var_cpu="1"
+var_ram="512"
+var_disk="2"
 var_os="debian"
 var_version="12"
 var_unprivileged="1"

ct/calibre-web.sh

@@ -41,13 +41,13 @@ function update_script() {
   rm -rf kepubify-linux-64bit
   curl -fsSLO https://github.com/pgaskin/kepubify/releases/latest/download/kepubify-linux-64bit
   chmod +x kepubify-linux-64bit
-  menu_array=("1" "Enables gdrive as storage backend for your ebooks" OFF
-    "2" "Enables sending emails via a googlemail account without enabling insecure apps" OFF
-    "3" "Enables displaying of additional author infos on the authors page" OFF
-    "4" "Enables login via LDAP server" OFF
-    "5" "Enables login via google or github oauth" OFF
-    "6" "Enables extracting of metadata from epub, fb2, pdf files, and also extraction of covers from cbr, cbz, cbt files" OFF
-    "7" "Enables extracting of metadata from cbr, cbz, cbt files" OFF
+  menu_array=("1" "Enables gdrive as storage backend for your ebooks" OFF \
+    "2" "Enables sending emails via a googlemail account without enabling insecure apps" OFF \
+    "3" "Enables displaying of additional author infos on the authors page" OFF \
+    "4" "Enables login via LDAP server" OFF \
+    "5" "Enables login via google or github oauth" OFF \
+    "6" "Enables extracting of metadata from epub, fb2, pdf files, and also extraction of covers from cbr, cbz, cbt files" OFF \
+    "7" "Enables extracting of metadata from cbr, cbz, cbt files" OFF \
     "8" "Enables syncing with your kobo reader" OFF)
   if [ -f "/opt/calibre-web/options.txt" ]; then
     cps_options="$(cat /opt/calibre-web/options.txt)"

ct/jellyfin.sh

@@ -47,4 +47,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8086${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8096${CL}"

ct/keycloak.sh

@@ -7,7 +7,7 @@ source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/m
 
 # App Default Values
 APP="Keycloak"
-var_tags="access management"
+var_tags="access-management"
 var_cpu="2"
 var_ram="2048"
 var_disk="4"

ct/plex.sh

@@ -57,4 +57,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:23400/web${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:32400/web${CL}"

install/alpine-nextcloud-install.sh

@@ -24,18 +24,18 @@ $STD apk add nginx
 msg_ok "Installed Dependencies"
 
 msg_info "Installing PHP/Redis"
-$STD apk add php82-opcache
-$STD apk add php82-redis
-$STD apk add php82-apcu
-$STD apk add php82-fpm
-$STD apk add php82-sysvsem
-$STD apk add php82-ftp
-$STD apk add php82-pecl-smbclient
-$STD apk add php82-pecl-imagick
-$STD apk add php82-pecl-vips
-$STD apk add php82-exif
-$STD apk add php82-sodium
-$STD apk add php82-bz2
+$STD apk add php83-opcache
+$STD apk add php83-redis
+$STD apk add php83-apcu
+$STD apk add php83-fpm
+$STD apk add php83-sysvsem
+$STD apk add php83-ftp
+$STD apk add php83-pecl-smbclient
+$STD apk add php83-pecl-imagick
+$STD apk add php83-pecl-vips
+$STD apk add php83-exif
+$STD apk add php83-sodium
+$STD apk add php83-bz2
 $STD apk add redis
 msg_ok "Installed PHP/Redis"
 
@@ -50,7 +50,7 @@ echo -e "Nextcloud Database Username: \e[32m$DB_USER\e[0m" >>~/nextcloud.creds
 echo -e "Nextcloud Database Password: \e[32m$DB_PASS\e[0m" >>~/nextcloud.creds
 echo -e "Nextcloud Database Name: \e[32m$DB_NAME\e[0m" >>~/nextcloud.creds
 $STD apk add nextcloud-mysql mariadb mariadb-client
-$STD mysql_install_db --user=mysql --datadir=/var/lib/mysql
+$STD mariadb-install-db --user=mysql --datadir=/var/lib/mysql
 $STD service mariadb start
 $STD rc-update add mariadb
 mysql -uroot -p"$ADMIN_PASS" -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY '$ADMIN_PASS' WITH GRANT OPTION; DELETE FROM mysql.user WHERE User=''; DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1'); DROP DATABASE test; DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%'; CREATE DATABASE $DB_NAME; GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS'; GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost.localdomain' IDENTIFIED BY '$DB_PASS'; FLUSH PRIVILEGES;"
@@ -134,11 +134,12 @@ server {
         location ^~ /.well-known/nodeinfo { return 301 /index.php/.well-known/nodeinfo; }
 }
 EOF
-sed -i -e 's|memory_limit = 128M|memory_limit = 512M|; $aapc.enable_cli=1' /etc/php82/php.ini
-sed -i -E '/^php_admin_(flag|value)\[opcache/s/^/;/' /etc/php82/php-fpm.d/nextcloud.conf
+sed -i -e 's|memory_limit = 128M|memory_limit = 512M|; $aapc.enable_cli=1' /etc/php83/php.ini
+sed -i -E '/^php_admin_(flag|value)\[opcache/s/^/;/' /etc/php83/php-fpm.d/nextcloud.conf
 msg_ok "Installed Nextcloud"
 
 msg_info "Adding Additional Nextcloud Packages"
+$STD apk add nextcloud-occ
 $STD apk add nextcloud-default-apps
 $STD apk add nextcloud-activity
 $STD apk add nextcloud-admin_audit
@@ -163,9 +164,10 @@ msg_ok "Added Additional Nextcloud Packages"
 msg_info "Starting Services"
 $STD rc-service redis start
 $STD rc-update add redis default
-$STD rc-service php-fpm82 start
+$STD rc-service php-fpm83 start
 chown -R nextcloud:www-data /var/log/nextcloud/
-$STD rc-service php-fpm82 restart
+chown -R nextcloud:www-data /usr/share/webapps/nextcloud/
+$STD rc-service php-fpm83 restart
 $STD rc-service nginx start
 $STD rc-service nextcloud start
 $STD rc-update add nginx default
@@ -175,16 +177,16 @@ msg_ok "Started Services"
 msg_info "Start Nextcloud Setup-Wizard"
 echo -e "export VISUAL=nano\nexport EDITOR=nano" >>/etc/profile
 cd /usr/share/webapps/nextcloud
-$STD su nextcloud -s /bin/sh -c "php82 occ maintenance:install \
+$STD su nextcloud -s /bin/sh -c "php83 occ maintenance:install \
 --database='mysql' --database-name $DB_NAME \
 --database-user '$DB_USER' --database-pass '$DB_PASS' \
 --admin-user '$ADMIN_USER' --admin-pass '$ADMIN_PASS' \
 --data-dir '/var/lib/nextcloud/data'"
-$STD su nextcloud -s /bin/sh -c 'php82 occ background:cron'
+$STD su nextcloud -s /bin/sh -c 'php83 occ background:cron'
 rm -rf /usr/share/webapps/nextcloud/apps/serverinfo
 IP4=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)
 sed -i "/0 => \'localhost\',/a \    \1 => '$IP4'," /usr/share/webapps/nextcloud/config/config.php
-su nextcloud -s /bin/sh -c 'php82 -f /usr/share/webapps/nextcloud/cron.php'
+su nextcloud -s /bin/sh -c 'php83 -f /usr/share/webapps/nextcloud/cron.php'
 msg_ok "Finished Nextcloud Setup-Wizard"
 
 motd_ssh

json/photoprism.json

@@ -19,7 +19,7 @@
             "script": "ct/photoprism.sh",
             "resources": {
                 "cpu": 2,
-                "ram": 2048,
+                "ram": 3072,
                 "hdd": 8,
                 "os": "debian",
                 "version": "12"

misc/add-lxc-iptag.sh

@@ -7,8 +7,8 @@
 # Source: https://github.com/gitsang/lxc-iptag
 
 function header_info {
-  clear
-  cat <<"EOF"
+clear
+cat <<"EOF"
     __   _  ________   ________      ______           
    / /  | |/ / ____/  /  _/ __ \    /_  __/___ _____ _
   / /   |   / /       / // /_/ /_____/ / / __ `/ __ `/
@@ -41,7 +41,7 @@ catch_errors() {
 
 # This function is called when an error occurs. It receives the exit code, line number, and command that caused the error, and displays an error message.
 error_handler() {
-  if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null; then kill $SPINNER_PID > /dev/null; fi
+  if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID >/dev/null; then kill $SPINNER_PID >/dev/null; fi
   printf "\e[?25h"
   local exit_code="$?"
   local line_number="$1"
@@ -50,16 +50,18 @@ error_handler() {
   echo -e "\n$error_message\n"
 }
 
+# This function displays a spinner.
 spinner() {
   local frames=('⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏')
   local spin_i=0
   local interval=0.1
   printf "\e[?25l"
-    local orange="\e[38;5;214m"
+
+  local color="${YWB}"
 
   while true; do
-        printf "\r ${orange}%s\e[0m " "${frames[spin_i]}"
-        spin_i=$(( (spin_i + 1) % ${#frames[@]} ))
+  printf "\r ${color}%s${CL}" "${frames[spin_i]}"
+  spin_i=$(((spin_i + 1) % ${#frames[@]}))
   sleep "$interval"
   done
 }
@@ -67,33 +69,36 @@ spinner() {
 # This function displays an informational message with a yellow color.
 msg_info() {
   local msg="$1"
-    echo -ne " ${HOLD} ${YW}${msg}   "
+  echo -ne "${TAB}${YW}${HOLD}${msg}${HOLD}"
   spinner &
   SPINNER_PID=$!
 }
 
 # This function displays a success message with a green color.
 msg_ok() {
-  if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null; then kill $SPINNER_PID > /dev/null; fi
+  if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID >/dev/null; then kill $SPINNER_PID >/dev/null; fi
   printf "\e[?25h"
   local msg="$1"
-  echo -e "${BFR}${CM} ${GN}${msg}${CL}"
+  echo -e "${BFR}${CM}${GN}${msg}${CL}"
 }
 
 # This function displays a error message with a red color.
 msg_error() {
-  if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null; then kill $SPINNER_PID > /dev/null; fi
+  if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID >/dev/null; then kill $SPINNER_PID >/dev/null; fi
   printf "\e[?25h"
   local msg="$1"
-  echo -e "${BFR}${CROSS} ${RD}${msg}${CL}"
+  echo -e "${BFR}${CROSS}${RD}${msg}${CL}"
 }
 
 while true; do
   read -p "This will install ${APP} on ${hostname}. Proceed? (y/n): " yn
   case $yn in
   [Yy]*) break ;;
-    [Nn]*) msg_info "Installation cancelled."; exit ;;
-    *) msg_info "Please answer yes or no." ;;
+  [Nn]*)
+  msg_error "Installation cancelled."
+  exit
+  ;;
+  *) msg_error "Please answer yes or no." ;;
   esac
 done
 
@@ -118,10 +123,11 @@ msg_ok "Installed Dependencies"
 
 msg_info "Setting up IP-Tag Scripts"
 mkdir -p /opt/lxc-iptag
+msg_ok "Setup IP-Tag Scripts"
 
 msg_info "Setup Default Config"
 if [[ ! -f /opt/lxc-iptag/iptag.conf ]]; then
-    cat <<EOF > /opt/lxc-iptag/iptag.conf
+  cat <<EOF >/opt/lxc-iptag/iptag.conf
 # Configuration file for LXC IP tagging
 
 # List of allowed CIDRs
@@ -144,7 +150,7 @@ fi
 
 msg_info "Setup Main Function"
 if [[ ! -f /opt/lxc-iptag/iptag ]]; then
-    cat <<'EOF' > /opt/lxc-iptag/iptag
+  cat <<'EOF' >/opt/lxc-iptag/iptag
 #!/bin/bash
 
 # =============== CONFIGURATION =============== #
@@ -322,8 +328,7 @@ chmod +x /opt/lxc-iptag/iptag
 
 msg_info "Creating Service"
 if [[ ! -f /lib/systemd/system/iptag.service ]]; then
-    echo "Systemd service file not found. Creating it now..."
-    cat <<EOF > /lib/systemd/system/iptag.service
+  cat <<EOF >/lib/systemd/system/iptag.service
 [Unit]
 Description=LXC IP-Tag service
 After=network.target
@@ -347,5 +352,5 @@ msg_info "Starting Service"
 systemctl daemon-reload &>/dev/null
 systemctl enable -q --now iptag.service &>/dev/null
 msg_ok "Started Service"
-
+SPINNER_PID=""
 echo -e "\n${APP} installation completed successfully! ${CL}\n"

misc/build.func

@@ -158,8 +158,19 @@ arch_check() {
 
 # This function sets the APP-Name into an ASCII Header in Slant, figlet needed on proxmox main node.
 header_info() {
+  if [ -f /etc/debian_version ]; then
+    # Debian/Ubuntu
     apt-get install -y figlet &> /dev/null
-  ascii_art=$(figlet -f slant "$APP")
+  elif [ -f /etc/alpine-release ]; then
+    # Alpine Linux
+    apk add --no-cache figlet &> /dev/null
+  else
+    echo "Unsupported OS"
+    return 1
+  fi
+
+  term_width=$(tput cols)
+  ascii_art=$(figlet -f slant -w "$term_width" "$APP")
   clear
   cat <<EOF
 $ascii_art