Merge pull request #58 from tteck/main

[pull] main from tteck:main

ct/bunkerweb.sh

@@ -55,10 +55,25 @@ function default_settings() {
 function update_script() {
 header_info
 if [[ ! -d /etc/bunkerweb ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
-msg_info "Updating $APP"
+
-apt-get update &>/dev/null
+RELEASE=$(curl -s https://api.github.com/repos/bunkerity/bunkerweb/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-apt-get -y upgrade &>/dev/null
+if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
-msg_ok "Updated $APP"
+
+  msg_info "Updating ${APP} to ${RELEASE}"
+  cat <<EOF >/etc/apt/preferences.d/bunkerweb
+Package: bunkerweb
+Pin: version ${RELEASE}
+Pin-Priority: 1001
+EOF
+  apt-get update
+  apt-get install nginx -y
+  apt-get install -y bunkerweb=${RELEASE}
+  echo "${RELEASE}" >/opt/${APP}_version.txt
+  msg_ok "Updated ${APP} to ${RELEASE}"
+
+else
+  msg_ok "No update required. ${APP} is already at ${RELEASE}"
+fi
 exit
 }
 

ct/jellyseerr.sh

@@ -21,7 +21,7 @@ echo -e "Loading..."
 APP="Jellyseerr"
 var_disk="8"
 var_cpu="2"
-var_ram="4096"
+var_ram="2048"
 var_os="debian"
 var_version="12"
 variables
@@ -66,7 +66,7 @@ then
   systemctl start jellyseerr
   exit
 fi
-yarn install &>/dev/null
+CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000 &>/dev/null
 yarn build &>/dev/null
 systemctl start jellyseerr
 msg_ok "Updated $APP"
@@ -77,10 +77,6 @@ start
 build_container
 description
 
-msg_info "Setting Container to Normal Resources"
-pct set $CTID -memory 2048
-msg_ok "Set Container to Normal Resources"
-
 msg_ok "Completed Successfully!\n"
 echo -e "${APP} should be reachable by going to the following URL.
          ${BL}http://${IP}:5055${CL} \n"

ct/traefik.sh

@@ -55,7 +55,7 @@ function default_settings() {
 function update_script() {
 header_info
 if [[ ! -f /etc/systemd/system/traefik.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
-RELEASE=$(curl -s https://api.github.com/repos/traefik/traefik/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+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) }')
 msg_info "Updating $APP LXC"
 if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}_version.txt ]]; then
   wget -q https://github.com/traefik/traefik/releases/download/v${RELEASE}/traefik_v${RELEASE}_linux_arm64.tar.gz

install/bunkerweb-install.sh

@@ -24,19 +24,25 @@ $STD apt-get install -y debian-archive-keyring
 $STD apt-get install -y openssh-server
 msg_ok "Installed Dependencies"
 
-msg_info "Installing Nginx v1.20.0"
+msg_info "Installing Nginx"
 wget -qO- https://nginx.org/keys/nginx_signing.key | gpg --dearmor >/usr/share/keyrings/nginx-archive-keyring.gpg
-echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/debian `lsb_release -cs` nginx" >/etc/apt/sources.list.d/nginx.list
+echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/debian $(lsb_release -cs) nginx" >/etc/apt/sources.list.d/nginx.list
 $STD apt-get update
-$STD apt-get install -y nginx=1.24.0-1~$(lsb_release -cs)
+$STD apt-get install -y nginx
-msg_ok "Installed Nginx v1.20.0"
+msg_ok "Installed Nginx"
 
-msg_info "Installing BunkerWeb v1.5.7"
+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}"
 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=1.5.7
+$STD apt-get install -y bunkerweb=${RELEASE}
-#$STD apt-mark hold nginx bunkerweb
+cat <<EOF >/etc/apt/preferences.d/bunkerweb
-msg_ok "Installed BunkerWeb v1.5.7"
+Package: bunkerweb
+Pin: version ${RELEASE}
+Pin-Priority: 1001
+EOF
+echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
+msg_ok "Installed BunkerWeb v${RELEASE}"
 
 motd_ssh
 customize

install/jellyseerr-install.sh

@@ -34,15 +34,17 @@ $STD apt-get update
 $STD apt-get install -y nodejs
 msg_ok "Installed Node.js"
 
-msg_info "Installing pnpm"
+msg_info "Installing Yarn"
-$STD npm install -g pnpm
+$STD npm install -g yarn
-msg_ok "Installed pnpm"
+msg_ok "Installed Yarn"
 
 msg_info "Installing Jellyseerr (Patience)"
 git clone -q https://github.com/Fallenbagel/jellyseerr.git /opt/jellyseerr
 cd /opt/jellyseerr
-CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile &>/dev/null
+$STD git checkout main
-$STD pnpm build
+CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000 &>/dev/null
+$STD yarn install
+$STD yarn build
 mkdir -p /etc/jellyseerr/
 cat <<EOF >/etc/jellyseerr/jellyseerr.conf
 PORT=5055
@@ -54,17 +56,15 @@ msg_ok "Installed Jellyseerr"
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/jellyseerr.service
 [Unit]
-Description=Jellyseerr Service
+Description=jellyseerr Service
-Wants=network-online.target
+After=network.target
-After=network-online.target
 
 [Service]
 EnvironmentFile=/etc/jellyseerr/jellyseerr.conf
 Environment=NODE_ENV=production
 Type=exec
-Restart=on-failure
 WorkingDirectory=/opt/jellyseerr
-ExecStart=/usr/bin/node dist/index.js
+ExecStart=/usr/bin/yarn start
 
 [Install]
 WantedBy=multi-user.target

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=$(curl -s https://api.github.com/repos/traefik/traefik/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+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) }')
 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