From ef27851d31944d10995b3cf75f508c2dfbbf11b6 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 09:06:30 -0400 Subject: [PATCH 01/12] Update bunkerweb.sh tweak `function update_script()` --- ct/bunkerweb.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/ct/bunkerweb.sh b/ct/bunkerweb.sh index 701d6d83e..3873484f2 100644 --- a/ct/bunkerweb.sh +++ b/ct/bunkerweb.sh @@ -55,10 +55,18 @@ 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 -apt-get -y upgrade &>/dev/null -msg_ok "Updated $APP" +RELEASE=$(curl -s https://api.github.com/repos/bunkerity/bunkerweb/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') +if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then + + msg_info "Updating ${APP} to ${RELEASE}" + 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 } From 85418addac13e6860b0a6f45bd04a7f83b64be1a Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 09:21:41 -0400 Subject: [PATCH 02/12] Update bunkerweb-install.sh always install the newest release --- install/bunkerweb-install.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/install/bunkerweb-install.sh b/install/bunkerweb-install.sh index f0a8d4aa7..d25539cd4 100644 --- a/install/bunkerweb-install.sh +++ b/install/bunkerweb-install.sh @@ -23,19 +23,20 @@ $STD apt-get install -y lsb-release $STD apt-get install -y debian-archive-keyring 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 $STD apt-get update -$STD apt-get install -y nginx=1.24.0-1~$(lsb_release -cs) -msg_ok "Installed Nginx v1.20.0" +$STD apt-get install -y nginx +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-mark hold nginx bunkerweb -msg_ok "Installed BunkerWeb v1.5.7" +$STD apt-get install -y bunkerweb=$(RELEASE} +echo "${RELEASE}" >/opt/${APPLICATION}_version.txt +msg_ok "Installed BunkerWeb v$(RELEASE}" motd_ssh customize From 5ef5f0086ee25b476fe3c96b3d9bf2dcd97f8f50 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 09:26:20 -0400 Subject: [PATCH 03/12] Update bunkerweb.sh - works for 1.5.8 and newer - if the update fails with 1.5.7 execute `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 install -y bunkerweb=${RELEASE}` in the LXC console --- ct/bunkerweb.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ct/bunkerweb.sh b/ct/bunkerweb.sh index 3873484f2..121aaab90 100644 --- a/ct/bunkerweb.sh +++ b/ct/bunkerweb.sh @@ -55,6 +55,7 @@ function default_settings() { function update_script() { header_info if [[ ! -d /etc/bunkerweb ]]; then msg_error "No ${APP} Installation Found!"; exit; fi + RELEASE=$(curl -s https://api.github.com/repos/bunkerity/bunkerweb/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then From 15be0761ff4d0577313e5be58396f2817bc948fc Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 09:38:44 -0400 Subject: [PATCH 04/12] Update bunkerweb-install.sh fix curly braces --- install/bunkerweb-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install/bunkerweb-install.sh b/install/bunkerweb-install.sh index d25539cd4..29ed74bdd 100644 --- a/install/bunkerweb-install.sh +++ b/install/bunkerweb-install.sh @@ -25,18 +25,18 @@ msg_ok "Installed Dependencies" 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 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}" 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} +$STD apt-get install -y bunkerweb=${RELEASE} echo "${RELEASE}" >/opt/${APPLICATION}_version.txt -msg_ok "Installed BunkerWeb v$(RELEASE}" +msg_ok "Installed BunkerWeb v${RELEASE}" motd_ssh customize From 7daad62fad96ab832dcdaac975b3e6a8a5538822 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 10:01:49 -0400 Subject: [PATCH 05/12] Update bunkerweb-install.sh hold bunkerweb version --- install/bunkerweb-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/bunkerweb-install.sh b/install/bunkerweb-install.sh index 29ed74bdd..20ccd2b42 100644 --- a/install/bunkerweb-install.sh +++ b/install/bunkerweb-install.sh @@ -35,6 +35,7 @@ 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=${RELEASE} +$STD apt-mark hold bunkerweb echo "${RELEASE}" >/opt/${APPLICATION}_version.txt msg_ok "Installed BunkerWeb v${RELEASE}" From e6b86f3d47058af503a008feec0b9423394676fc Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 10:04:23 -0400 Subject: [PATCH 06/12] Update bunkerweb.sh tweak --- ct/bunkerweb.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ct/bunkerweb.sh b/ct/bunkerweb.sh index 121aaab90..9e1559748 100644 --- a/ct/bunkerweb.sh +++ b/ct/bunkerweb.sh @@ -60,8 +60,11 @@ RELEASE=$(curl -s https://api.github.com/repos/bunkerity/bunkerweb/releases/late if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then msg_info "Updating ${APP} to ${RELEASE}" + apt-get update apt-get install nginx -y + apt-mark unhold bunkerweb apt-get install -y bunkerweb=${RELEASE} + apt-mark hold bunkerweb echo "${RELEASE}" >/opt/${APP}_version.txt msg_ok "Updated ${APP} to ${RELEASE}" From f64e8ef47b6153db164df71a3e162eab3b1e22d8 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 10:22:46 -0400 Subject: [PATCH 07/12] Update bunkerweb-install.sh change the "hold" method --- install/bunkerweb-install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install/bunkerweb-install.sh b/install/bunkerweb-install.sh index 20ccd2b42..a26cb4247 100644 --- a/install/bunkerweb-install.sh +++ b/install/bunkerweb-install.sh @@ -35,7 +35,11 @@ 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=${RELEASE} -$STD apt-mark hold bunkerweb +cat </etc/apt/preferences.d/bunkerweb +Package: bunkerweb +Pin: version ${RELEASE} +Pin-Priority: 1001 +EOF echo "${RELEASE}" >/opt/${APPLICATION}_version.txt msg_ok "Installed BunkerWeb v${RELEASE}" From fc5ea73e450190b915aa5298f423b77a8a8baad3 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 10:24:42 -0400 Subject: [PATCH 08/12] Update bunkerweb.sh change the "hold" method --- ct/bunkerweb.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ct/bunkerweb.sh b/ct/bunkerweb.sh index 9e1559748..14e8a2a64 100644 --- a/ct/bunkerweb.sh +++ b/ct/bunkerweb.sh @@ -60,11 +60,14 @@ RELEASE=$(curl -s https://api.github.com/repos/bunkerity/bunkerweb/releases/late if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then msg_info "Updating ${APP} to ${RELEASE}" + cat </etc/apt/preferences.d/bunkerweb +Package: bunkerweb +Pin: version ${RELEASE} +Pin-Priority: 1001 +EOF apt-get update apt-get install nginx -y - apt-mark unhold bunkerweb apt-get install -y bunkerweb=${RELEASE} - apt-mark hold bunkerweb echo "${RELEASE}" >/opt/${APP}_version.txt msg_ok "Updated ${APP} to ${RELEASE}" From 65968509182c9f25c7445eaeed3f9ca22f441b8d Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 13:12:59 -0400 Subject: [PATCH 09/12] Update traefik-install.sh hard-code version --- install/traefik-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/traefik-install.sh b/install/traefik-install.sh index b8346196a..7b5c44b3b 100644 --- a/install/traefik-install.sh +++ b/install/traefik-install.sh @@ -21,7 +21,7 @@ $STD apt-get install -y gpg $STD apt-get install -y apt-transport-https 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_amd64.tar.gz From 496b9bf92ce8ba1a8995bfce0f6f9f8cbee0d49a Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 3 Jul 2024 13:14:12 -0400 Subject: [PATCH 10/12] Update traefik.sh hard-code version --- ct/traefik.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/traefik.sh b/ct/traefik.sh index 503d51dce..0da650d11 100644 --- a/ct/traefik.sh +++ b/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_amd64.tar.gz From dad9da5e678618114e100762589ef41d7284b749 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 4 Jul 2024 10:55:39 -0400 Subject: [PATCH 11/12] Update jellyseerr.sh tweak update (main branch) --- ct/jellyseerr.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ct/jellyseerr.sh b/ct/jellyseerr.sh index 36f352d07..5f3548bf5 100644 --- a/ct/jellyseerr.sh +++ b/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" From 8562dd1b9360933789e25c85a1705e5dfe02f02e Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 4 Jul 2024 10:56:52 -0400 Subject: [PATCH 12/12] Update jellyseerr-install.sh switch back to the main branch --- install/jellyseerr-install.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/install/jellyseerr-install.sh b/install/jellyseerr-install.sh index 5de57a62e..38ae8b22d 100644 --- a/install/jellyseerr-install.sh +++ b/install/jellyseerr-install.sh @@ -33,15 +33,17 @@ $STD apt-get update $STD apt-get install -y nodejs msg_ok "Installed Node.js" -msg_info "Installing pnpm" -$STD npm install -g pnpm -msg_ok "Installed pnpm" +msg_info "Installing Yarn" +$STD npm install -g yarn +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 pnpm build +$STD git checkout main +CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000 &>/dev/null +$STD yarn install +$STD yarn build mkdir -p /etc/jellyseerr/ cat </etc/jellyseerr/jellyseerr.conf PORT=5055 @@ -53,17 +55,15 @@ msg_ok "Installed Jellyseerr" msg_info "Creating Service" cat </etc/systemd/system/jellyseerr.service [Unit] -Description=Jellyseerr Service -Wants=network-online.target -After=network-online.target +Description=jellyseerr Service +After=network.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