Merge branch 'main-upstream'

install/bunkerweb-install.sh

@@ -17,10 +17,9 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
-$STD apt-get install -y gnupg2 
-$STD apt-get install -y ca-certificates 
+$STD apt-get install -y gpg
+$STD apt-get install -y apt-transport-https
 $STD apt-get install -y lsb-release 
-$STD apt-get install -y debian-archive-keyring
 $STD apt-get install -y openssh-server
 msg_ok "Installed Dependencies"
 
@@ -32,9 +31,11 @@ $STD apt-get install -y nginx
 msg_ok "Installed Nginx"
 
 RELEASE=$(curl -s https://api.github.com/repos/bunkerity/bunkerweb/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-msg_info "Installing BunkerWeb v${RELEASE}"
+msg_info "Installing BunkerWeb v${RELEASE} (Patience)"
+curl -fsSL "https://repo.bunkerweb.io/bunkerity/bunkerweb/gpgkey" | gpg --dearmor >/etc/apt/keyrings/bunkerity_bunkerweb-archive-keyring.gpg
+echo "deb [signed-by=/etc/apt/keyrings/bunkerity_bunkerweb-archive-keyring.gpg] https://repo.bunkerweb.io/bunkerity/bunkerweb/debian/ bookworm main" >/etc/apt/sources.list.d/bunkerity_bunkerweb.list
+$STD apt-get update
 export UI_WIZARD=1
-curl -sSL https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | bash &>/dev/null
 $STD apt-get install -y bunkerweb=${RELEASE}
 cat <<EOF >/etc/apt/preferences.d/bunkerweb
 Package: bunkerweb

install/ersatztv-install.sh

@@ -15,24 +15,24 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies (Patience)"
-$STD apt-get install -y --no-install-recommends \
-  ffmpeg \
-  build-essential \
-  unzip \
-  pkg-config \
-  curl \
-  sudo \
-  git \
-  make \
-  mc \
-  wget \
-  ca-certificates \
-  openssh-server
+msg_info "Installing Dependencies"
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y wget
+$STD apt-get install -y ca-certificates
+$STD apt-get install -y openssh-server
 msg_ok "Installed Dependencies"
 
+msg_info "Installing FFmpeg (Patience)"
+echo "deb http://deb.debian.org/debian/ sid main" >/etc/apt/sources.list.d/sid.list
+$STD apt update
+DEBIAN_FRONTEND=noninteractive $STD apt install -t sid ffmpeg -y
+rm /etc/apt/sources.list.d/sid.list
+$STD apt update
+msg_ok "Installed FFmpeg"
 
-msg_info "Installing ErsatzTV " 
+msg_info "Installing ErsatzTV" 
 RELEASE=$(curl -s https://api.github.com/repos/ErsatzTV/ErsatzTV/releases | grep -oP '"tag_name": "\K[^"]+' | head -n 1)
 wget -qO- "https://github.com/ErsatzTV/ErsatzTV/releases/download/${RELEASE}/ErsatzTV-${RELEASE}-linux-arm64.tar.gz" | tar -xz -C /opt
 mv "/opt/ErsatzTV-${RELEASE}-linux-arm64" /opt/ErsatzTV

install/gitea-install.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2024 tteck
+# Author: tteck (tteckster)
+# Co-author: Rogue-King
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y git
+$STD apt-get install -y curl
+$STD apt-get install -y sudo
+$STD apt-get install -y mc
+$STD apt-get install -y sqlite3
+msg_ok "Installed Dependencies"
+
+msg_info "Installing Gitea"
+RELEASE=$(wget -q https://github.com/go-gitea/gitea/releases/latest -O - | grep "title>Release" | cut -d " " -f 4 | sed 's/^v//')
+wget -q https://github.com/go-gitea/gitea/releases/download/v$RELEASE/gitea-$RELEASE-linux-amd64
+mv gitea* /usr/local/bin/gitea
+chmod +x /usr/local/bin/gitea
+adduser --system --group --disabled-password --home /etc/gitea gitea > /dev/null
+mkdir -p /var/lib/gitea/{custom,data,log}
+chown -R gitea:gitea /var/lib/gitea/
+chmod -R 750 /var/lib/gitea/
+chown root:gitea /etc/gitea
+chmod 770 /etc/gitea
+msg_ok "Installed Gitea"
+
+msg_info "Creating Service"
+cat <<EOF >/etc/systemd/system/gitea.service
+[Unit]
+Description=Gitea (Git with a cup of tea)
+After=syslog.target
+After=network.target
+
+[Service]
+# Uncomment notify and watchdog if you want to use them
+# Uncomment the next line if you have repos with lots of files and get a HTTP 500 error because of that
+# LimitNOFILE=524288:524288
+RestartSec=2s
+Type=simple
+#Type=notify
+User=gitea
+Group=gitea
+#The mount point we added to the container
+WorkingDirectory=/var/lib/gitea
+#Create directory in /run
+RuntimeDirectory=gitea
+ExecStart=/usr/local/bin/gitea web --config /etc/gitea/app.ini
+Restart=always
+Environment=USER=gitea HOME=/var/lib/gitea/data GITEA_WORK_DIR=/var/lib/gitea
+#WatchdogSec=30s
+#Capabilities to bind to low-numbered ports
+#CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+#AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now gitea
+msg_ok "Created Service"
+
+motd_ssh
+customize
+
+msg_info "Cleaning up"
+$STD apt-get -y autoremove
+$STD apt-get -y autoclean
+msg_ok "Cleaned"

install/traefik-install.sh

@@ -23,7 +23,7 @@ $STD apt-get install -y wget
 $STD apt-get install -y openssh-server
 msg_ok "Installed Dependencies"
 
-RELEASE=3.0.4 #$(curl -s https://api.github.com/repos/traefik/traefik/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+RELEASE=$(curl -s https://api.github.com/repos/traefik/traefik/releases | grep -oP '"tag_name":\s*"v\K[\d.]+?(?=")' | sort -V | tail -n 1)
 msg_info "Installing Traefik v${RELEASE}"
 mkdir -p /etc/traefik/{conf.d,ssl}
 wget -q https://github.com/traefik/traefik/releases/download/v${RELEASE}/traefik_v${RELEASE}_linux_arm64.tar.gz