From 3c4149907405a03acc869776e86ca4844312f89e Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 11 Aug 2024 05:51:33 -0400 Subject: [PATCH 01/20] Update frigate-install.sh clean up code --- install/frigate-install.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/install/frigate-install.sh b/install/frigate-install.sh index a8d9ee3b7..09a14e658 100644 --- a/install/frigate-install.sh +++ b/install/frigate-install.sh @@ -171,7 +171,6 @@ msg_ok "Installed Coral Object Detection Model" msg_info "Building Nginx with Custom Modules" $STD /opt/frigate/docker/main/build_nginx.sh -#sed -i 's/exec nginx/exec \/usr\/local\/nginx\/sbin\/nginx/g' /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run sed -e '/s6-notifyoncheck/ s/^#*/#/' -i /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run sed -i 's/error_log \/dev\/stdout warn\;/error_log \/dev\/shm\/logs\/nginx\/current warn\;/' /usr/local/nginx/conf/nginx.conf sed -i 's/access_log \/dev\/stdout main\;/access_log \/dev\/shm\/logs\/nginx\/current main\;/' /usr/local/nginx/conf/nginx.conf @@ -212,7 +211,6 @@ RestartSec=1 User=root ExecStartPre=+rm /dev/shm/logs/go2rtc/current ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run -#ExecStart=/bin/bash -c "bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run 2> >(/usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S ' >&2) | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S '" StandardOutput=file:/dev/shm/logs/go2rtc/current StandardError=file:/dev/shm/logs/go2rtc/current @@ -235,7 +233,6 @@ RestartSec=1 User=root ExecStartPre=+rm /dev/shm/logs/frigate/current ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run -#ExecStart=/bin/bash -c "bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run 2> >(/usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S ' >&2) | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S '" StandardOutput=file:/dev/shm/logs/frigate/current StandardError=file:/dev/shm/logs/frigate/current @@ -257,8 +254,7 @@ Restart=always RestartSec=1 User=root ExecStartPre=+rm /dev/shm/logs/nginx/current -#ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run -ExecStart=/bin/bash -c "bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run 2> >(/usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S ' >&2) | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S '" +ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run StandardOutput=file:/dev/shm/logs/nginx/current StandardError=file:/dev/shm/logs/nginx/current From a28eb2fd46d2798d4e8b16287a61d49795059839 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 11 Aug 2024 08:34:02 -0400 Subject: [PATCH 02/20] Update matterbridge-install.sh refactor fixes https://github.com/tteck/Proxmox/issues/3499 --- install/matterbridge-install.sh | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/install/matterbridge-install.sh b/install/matterbridge-install.sh index 479484715..bac8578f5 100644 --- a/install/matterbridge-install.sh +++ b/install/matterbridge-install.sh @@ -15,17 +15,11 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies (Patience)" -$STD apt-get install -y --no-install-recommends \ - build-essential \ - unzip \ - curl \ - sudo \ - git \ - make \ - gnupg \ - ca-certificates \ - mc +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 gpg msg_ok "Installed Dependencies" msg_info "Setting up Node.js Repository" @@ -40,15 +34,7 @@ $STD apt-get install -y nodejs msg_ok "Installed Node.js" msg_info "Install Matterbridge" -RELEASE=$(curl -s https://api.github.com/repos/Luligu/matterbridge/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') -wget -q "https://github.com/Luligu/matterbridge/archive/refs/tags/${RELEASE}.zip" -unzip -q ${RELEASE}.zip -mv matterbridge-${RELEASE} /opt/matterbridge -rm -R ${RELEASE}.zip -cd /opt/matterbridge -$STD npm ci -$STD npm run build -echo "${RELEASE}" >/opt/${APPLICATION}_version.txt +$STD npm install -g matterbridge msg_ok "Installed Matterbridge" msg_info "Creating Service" @@ -59,16 +45,13 @@ After=network-online.target [Service] Type=simple -ExecStart=/usr/bin/npm run start:bridge -WorkingDirectory=/opt/matterbridge +ExecStart=matterbridge -bridge -service +WorkingDirectory=/root/Matterbridge StandardOutput=inherit StandardError=inherit Restart=always RestartSec=10s TimeoutStopSec=30s -User=root -Environment=PATH=/usr/bin:/usr/local/bin:/opt/matterbridge/bin -Environment=NODE_ENV=production [Install] WantedBy=multi-user.target From 08debd9442a599214651a5abd331493ebed270d1 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 11 Aug 2024 08:42:40 -0400 Subject: [PATCH 03/20] Update matterbridge-install.sh create directory --- install/matterbridge-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/matterbridge-install.sh b/install/matterbridge-install.sh index bac8578f5..2d895e251 100644 --- a/install/matterbridge-install.sh +++ b/install/matterbridge-install.sh @@ -34,6 +34,7 @@ $STD apt-get install -y nodejs msg_ok "Installed Node.js" msg_info "Install Matterbridge" +mkdir -p /root/Matterbridge $STD npm install -g matterbridge msg_ok "Installed Matterbridge" From 41b63495dbf14fae13a2bb27c1bb8d2164c33a5b Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 11 Aug 2024 08:49:29 -0400 Subject: [PATCH 04/20] Update matterbridge.sh refactor update --- ct/matterbridge.sh | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/ct/matterbridge.sh b/ct/matterbridge.sh index e0d04f268..097d025a3 100644 --- a/ct/matterbridge.sh +++ b/ct/matterbridge.sh @@ -55,36 +55,7 @@ function default_settings() { function update_script() { header_info if [[ ! -d /opt/matterbridge ]]; then msg_error "No ${APP} Installation Found!"; exit; fi - -RELEASE=$(curl -s https://api.github.com/repos/Luligu/matterbridge/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}') -if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then - msg_info "Stopping ${APP} Service" - systemctl stop matterbridge - msg_ok "Stopped ${APP} Service" - - msg_info "Updating ${APP} to ${RELEASE}" - cd /opt/matterbridge - wget -q "https://github.com/Luligu/matterbridge/archive/refs/tags/${RELEASE}.zip" - unzip -q ${RELEASE}.zip - mv matterbridge-${RELEASE} /opt/matterbridge - cd /opt/matterbridge - npm ci >/dev/null 2>&1 - npm run build >/dev/null 2>&1 - echo "${RELEASE}" >/opt/${APP}_version.txt - msg_ok "Updated ${APP} to ${RELEASE}" - - msg_info "Cleaning up" - rm /opt/${RELEASE}.zip - msg_ok "Cleaned" - - msg_info "Starting ${APP} Service" - systemctl start matterbridge - sleep 1 - msg_ok "Started ${APP} Service" - msg_ok "Updated Successfully!\n" -else - msg_ok "No update required. ${APP} is already at ${RELEASE}" -fi +msg_error "Update via the Matterbridge UI" exit } From 448cf931630fb895426a22fd9e0212f75b6a5e81 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 11 Aug 2024 08:50:55 -0400 Subject: [PATCH 05/20] Update matterbridge.sh tweak --- ct/matterbridge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/matterbridge.sh b/ct/matterbridge.sh index 097d025a3..48245bd51 100644 --- a/ct/matterbridge.sh +++ b/ct/matterbridge.sh @@ -54,7 +54,7 @@ function default_settings() { function update_script() { header_info -if [[ ! -d /opt/matterbridge ]]; then msg_error "No ${APP} Installation Found!"; exit; fi +if [[ ! -d /root/Matterbridge ]]; then msg_error "No ${APP} Installation Found!"; exit; fi msg_error "Update via the Matterbridge UI" exit } From e4ad002ce52caea2024ef416d8e36b0835b58850 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 12 Aug 2024 07:24:04 -0400 Subject: [PATCH 06/20] Update frigate-install.sh make `ln` command silent --- install/frigate-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/frigate-install.sh b/install/frigate-install.sh index 09a14e658..bdb57a7c4 100644 --- a/install/frigate-install.sh +++ b/install/frigate-install.sh @@ -174,13 +174,13 @@ $STD /opt/frigate/docker/main/build_nginx.sh sed -e '/s6-notifyoncheck/ s/^#*/#/' -i /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run sed -i 's/error_log \/dev\/stdout warn\;/error_log \/dev\/shm\/logs\/nginx\/current warn\;/' /usr/local/nginx/conf/nginx.conf sed -i 's/access_log \/dev\/stdout main\;/access_log \/dev\/shm\/logs\/nginx\/current main\;/' /usr/local/nginx/conf/nginx.conf -ln -svf /usr/local/nginx/sbin/nginx /usr/local/bin/nginx +ln -sf /usr/local/nginx/sbin/nginx /usr/local/bin/nginx msg_ok "Built Nginx" msg_info "Installing Tempio" sed -i 's|/rootfs/usr/local|/usr/local|g' /opt/frigate/docker/main/install_tempio.sh $STD /opt/frigate/docker/main/install_tempio.sh -ln -svf /usr/local/tempio/bin/tempio /usr/local/bin/tempio +ln -sf /usr/local/tempio/bin/tempio /usr/local/bin/tempio msg_ok "Installed Tempio" msg_info "Creating Services" From aca97a3da3d1677cfec7e9324306b26881c887c1 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 12 Aug 2024 10:19:08 -0400 Subject: [PATCH 07/20] Update frigate-install.sh revert service files --- install/frigate-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/frigate-install.sh b/install/frigate-install.sh index bdb57a7c4..b04dd94f0 100644 --- a/install/frigate-install.sh +++ b/install/frigate-install.sh @@ -210,7 +210,7 @@ Restart=always RestartSec=1 User=root ExecStartPre=+rm /dev/shm/logs/go2rtc/current -ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run +ExecStart=/bin/bash -c "bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run 2> >(/usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S ' >&2) | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S '" StandardOutput=file:/dev/shm/logs/go2rtc/current StandardError=file:/dev/shm/logs/go2rtc/current @@ -232,7 +232,7 @@ Restart=always RestartSec=1 User=root ExecStartPre=+rm /dev/shm/logs/frigate/current -ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run +ExecStart=/bin/bash -c "bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run 2> >(/usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S ' >&2) | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S '" StandardOutput=file:/dev/shm/logs/frigate/current StandardError=file:/dev/shm/logs/frigate/current @@ -254,7 +254,7 @@ Restart=always RestartSec=1 User=root ExecStartPre=+rm /dev/shm/logs/nginx/current -ExecStart=bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run +ExecStart=/bin/bash -c "bash /opt/frigate/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run 2> >(/usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S ' >&2) | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%.S '" StandardOutput=file:/dev/shm/logs/nginx/current StandardError=file:/dev/shm/logs/nginx/current From 72dfc20090ada0e197e3f681e95b4c839c69814e Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 13 Aug 2024 08:43:41 -0400 Subject: [PATCH 08/20] Update changedetection-install.sh use browserless v2 https://github.com/dgtlmoon/changedetection.io/discussions/1953 --- install/changedetection-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/changedetection-install.sh b/install/changedetection-install.sh index 5a10f7795..d42c5bb32 100644 --- a/install/changedetection-install.sh +++ b/install/changedetection-install.sh @@ -74,7 +74,7 @@ msg_ok "Installed Change Detection" msg_info "Installing Browserless & Playwright" mkdir /opt/browserless $STD python3 -m pip install playwright -$STD git clone -b v1 https://github.com/browserless/chrome /opt/browserless +$STD git clone https://github.com/browserless/chrome /opt/browserless $STD npm install --prefix /opt/browserless $STD npm run build --prefix /opt/browserless $STD npm prune production --prefix /opt/browserless @@ -123,8 +123,8 @@ Wants=browserless.service [Service] Type=simple WorkingDirectory=/opt/changedetection -Environment="WEBDRIVER_URL=http://127.0.0.1:4444/wd/hub" -Environment="PLAYWRIGHT_DRIVER_URL=ws://127.0.0.1:3000/?stealth=1&--disable-web-security=true" +Environment=WEBDRIVER_URL=http://127.0.0.1:4444/wd/hub +Environment=PLAYWRIGHT_DRIVER_URL=ws://browserless-chrome:3000/chrome?launch={"defaultViewport":{"height":720,"width":1280},"headless":false,"stealth":true}&blockAds=true ExecStart=changedetection.io -d /opt/changedetection -p 5000 [Install] WantedBy=multi-user.target From 604b7ee6287c7e3afed143e85ef3951fac960048 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 17 Aug 2024 06:44:53 -0400 Subject: [PATCH 09/20] Update bunkerweb-install.sh Install nginx=1.26.1* --- install/bunkerweb-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/bunkerweb-install.sh b/install/bunkerweb-install.sh index 4f15709cc..aeb4e5872 100644 --- a/install/bunkerweb-install.sh +++ b/install/bunkerweb-install.sh @@ -26,7 +26,7 @@ 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 +$STD apt-get install -y nginx=1.26.1* 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) }') From 631ef46466dfc8feffe1bd358ee5289850f89b1d Mon Sep 17 00:00:00 2001 From: tteckster Date: Sat, 17 Aug 2024 06:47:34 -0400 Subject: [PATCH 10/20] Update bunkerweb.sh nginx=1.26.1* --- ct/bunkerweb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/bunkerweb.sh b/ct/bunkerweb.sh index 14e8a2a64..42f0e50fd 100644 --- a/ct/bunkerweb.sh +++ b/ct/bunkerweb.sh @@ -66,7 +66,7 @@ Pin: version ${RELEASE} Pin-Priority: 1001 EOF apt-get update - apt-get install nginx -y + apt-get install -y nginx=1.26.1* apt-get install -y bunkerweb=${RELEASE} echo "${RELEASE}" >/opt/${APP}_version.txt msg_ok "Updated ${APP} to ${RELEASE}" From 28085bb2e78b63503b23922dd07f06276dd699d4 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 18 Aug 2024 22:30:57 -0400 Subject: [PATCH 11/20] Update alpine-vaultwarden.sh restart vaultwarden --- ct/alpine-vaultwarden.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/alpine-vaultwarden.sh b/ct/alpine-vaultwarden.sh index 23bb5f261..9b06d51d3 100644 --- a/ct/alpine-vaultwarden.sh +++ b/ct/alpine-vaultwarden.sh @@ -71,7 +71,7 @@ function update_script() { header_info case $CHOICE in 1) - apk update && apk upgrade + apk update && apk upgrade && rc-service vaultwarden restart -q exit ;; 2) From 0a33d1739ec3a49011411929bd46a260e92e99f9 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 19 Aug 2024 07:35:44 -0400 Subject: [PATCH 12/20] Update commafeed-install.sh refactor closes https://github.com/tteck/Proxmox/issues/3551 --- install/commafeed-install.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/install/commafeed-install.sh b/install/commafeed-install.sh index 8db106e75..c9ee0af75 100644 --- a/install/commafeed-install.sh +++ b/install/commafeed-install.sh @@ -27,11 +27,14 @@ $STD apt-get update $STD apt-get -y install zulu17-jdk msg_ok "Installed Azul Zulu" -msg_info "Installing CommaFeed" -mkdir /opt/commafeed && cd /opt/commafeed -wget -q https://github.com/Athou/commafeed/releases/latest/download/commafeed.jar -wget -q https://github.com/Athou/commafeed/releases/latest/download/config.yml.example -O config.yml -msg_ok "Installed CommaFeed" +RELEASE=$(curl -sL https://api.github.com/repos/Athou/commafeed/releases/latest | grep '"tag_name":' | cut -d'"' -f4) +msg_info "Installing CommaFeed ${RELEASE}" +mkdir /opt/commafeed +wget -q https://github.com/Athou/commafeed/releases/download/${RELEASE}/commafeed-${RELEASE}-h2-jvm.zip +unzip -q commafeed-${RELEASE}-h2-jvm.zip +mv commafeed-${RELEASE}-h2/* /opt/commafeed/ +echo "${RELEASE}" >/opt/${APPLICATION}_version.txt +msg_ok "Installed CommaFeed ${RELEASE}" msg_info "Creating Service" cat </etc/systemd/system/commafeed.service @@ -40,7 +43,7 @@ Description=CommaFeed Service After=network.target [Service] -ExecStart=/usr/bin/java -Djava.net.preferIPv4Stack=true -jar /opt/commafeed/commafeed.jar server /opt/commafeed/config.yml +ExecStart=java -jar quarkus-run.jar WorkingDirectory=/opt/commafeed/ Restart=always @@ -54,7 +57,7 @@ motd_ssh customize msg_info "Cleaning up" -rm -rf zulu-repo_1.0.0-3_all.deb +rm -rf commafeed-${RELEASE}-h2 commafeed-${RELEASE}-h2-jvm.zip zulu-repo_1.0.0-3_all.deb $STD apt-get -y autoremove $STD apt-get -y autoclean msg_ok "Cleaned" From 52bfc1725f3efa9c056dd0d23c7e950ba9a5e7e5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 19 Aug 2024 07:56:39 -0400 Subject: [PATCH 13/20] Update commafeed.sh refactor --- ct/commafeed.sh | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/ct/commafeed.sh b/ct/commafeed.sh index c5eeecadd..eb62d0a03 100644 --- a/ct/commafeed.sh +++ b/ct/commafeed.sh @@ -55,19 +55,27 @@ function default_settings() { function update_script() { header_info if [[ ! -d /opt/commafeed ]]; then msg_error "No ${APP} Installation Found!"; exit; fi -msg_info "Stopping CommaFeed" -systemctl stop commafeed -msg_ok "Stopped CommaFeed" +RELEASE=$(curl -sL https://api.github.com/repos/Athou/commafeed/releases/latest | grep '"tag_name":' | cut -d'"' -f4) +if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then + msg_info "Stopping ${APP}" + systemctl stop commafeed + msg_ok "Stopped ${APP}" -msg_info "Updating CommaFeed" -cd /opt/commafeed -rm commafeed.jar -wget -q https://github.com/Athou/commafeed/releases/latest/download/commafeed.jar -msg_ok "Updated CommaFeed" + msg_info "Updating ${APP} to ${RELEASE}" + wget https://github.com/Athou/commafeed/releases/download/${RELEASE}/commafeed-${RELEASE}-h2-jvm.zip + unzip -q commafeed-${RELEASE}-h2-jvm.zip + rsync -a --exclude 'data/' commafeed-${RELEASE}-h2/ /opt/commafeed/ + rm -rf commafeed-${RELEASE}-h2-jvm.zip + echo "${RELEASE}" >/opt/${APP}_version.txt + msg_ok "Updated ${APP} to ${RELEASE}" -msg_info "Starting CommaFeed" -systemctl start commafeed -msg_ok "Update Completed Successfully" + msg_info "Starting ${APP}" + systemctl start commafeed + msg_ok "Started ${APP}" + msg_ok "Updated Successfully" +else + msg_ok "No update required. ${APP} is already at ${RELEASE}" +fi exit } From bfa2b0c0ee7139c57efe9cae215325b6e1b4f037 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 19 Aug 2024 07:58:58 -0400 Subject: [PATCH 14/20] Update commafeed.sh tweak --- ct/commafeed.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/commafeed.sh b/ct/commafeed.sh index eb62d0a03..34c508689 100644 --- a/ct/commafeed.sh +++ b/ct/commafeed.sh @@ -62,7 +62,7 @@ if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_v msg_ok "Stopped ${APP}" msg_info "Updating ${APP} to ${RELEASE}" - wget https://github.com/Athou/commafeed/releases/download/${RELEASE}/commafeed-${RELEASE}-h2-jvm.zip + wget -q https://github.com/Athou/commafeed/releases/download/${RELEASE}/commafeed-${RELEASE}-h2-jvm.zip unzip -q commafeed-${RELEASE}-h2-jvm.zip rsync -a --exclude 'data/' commafeed-${RELEASE}-h2/ /opt/commafeed/ rm -rf commafeed-${RELEASE}-h2-jvm.zip From 9db6aa8fbb461a901439f2f8d5ef1ab7b48435c6 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 19 Aug 2024 08:01:36 -0400 Subject: [PATCH 15/20] Update commafeed-install.sh add rsync as a dependency --- install/commafeed-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/commafeed-install.sh b/install/commafeed-install.sh index c9ee0af75..4806e863d 100644 --- a/install/commafeed-install.sh +++ b/install/commafeed-install.sh @@ -17,6 +17,7 @@ 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 rsync msg_ok "Installed Dependencies" msg_info "Installing Azul Zulu" From aec826bbb3e1cf235e7513fbb0c33aff665c26b5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 19 Aug 2024 08:03:54 -0400 Subject: [PATCH 16/20] Update commafeed.sh tweak --- ct/commafeed.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ct/commafeed.sh b/ct/commafeed.sh index 34c508689..7b8b16b6b 100644 --- a/ct/commafeed.sh +++ b/ct/commafeed.sh @@ -65,7 +65,7 @@ if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_v wget -q https://github.com/Athou/commafeed/releases/download/${RELEASE}/commafeed-${RELEASE}-h2-jvm.zip unzip -q commafeed-${RELEASE}-h2-jvm.zip rsync -a --exclude 'data/' commafeed-${RELEASE}-h2/ /opt/commafeed/ - rm -rf commafeed-${RELEASE}-h2-jvm.zip + rm -rf commafeed-${RELEASE}-h2 commafeed-${RELEASE}-h2-jvm.zip echo "${RELEASE}" >/opt/${APP}_version.txt msg_ok "Updated ${APP} to ${RELEASE}" From de1a4b0914c63849912cb5187117191b8eeba1b0 Mon Sep 17 00:00:00 2001 From: tteckster Date: Mon, 19 Aug 2024 08:09:44 -0400 Subject: [PATCH 17/20] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a7bb37ae..33f12ea0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,14 @@ Be cautious of copycat or coat-tailing sites that exploit the project's populari - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment. +## 2024-08-19 + +### Changed + +- **CommaFeed LXC** [(Commit)](https://github.com/tteck/Proxmox/commit/0a33d1739ec3a49011411929bd46a260e92e99f9) + - Refactor Code + - Breaking Change + ## 2024-08-06 ### Changed From 9d579083bf9df05f1a425a865f85da1fbcd6d73f Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 21 Aug 2024 16:10:49 -0400 Subject: [PATCH 18/20] Update wireguard.sh - refactor code - breaking change --- ct/wireguard.sh | 71 +++++-------------------------------------------- 1 file changed, 6 insertions(+), 65 deletions(-) diff --git a/ct/wireguard.sh b/ct/wireguard.sh index 5feee4ac4..a183c6bb3 100644 --- a/ct/wireguard.sh +++ b/ct/wireguard.sh @@ -19,11 +19,11 @@ EOF header_info echo -e "Loading..." APP="Wireguard" -var_disk="2" +var_disk="4" var_cpu="1" var_ram="512" var_os="debian" -var_version="11" +var_version="12" variables color catch_errors @@ -53,70 +53,9 @@ function default_settings() { } function update_script() { -if [[ ! -d /etc/pivpn/wireguard ]]; then msg_error "No ${APP} Installation Found!"; exit; fi -UPD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 2 \ - "1" "Update ${APP} LXC" ON \ - "2" "Install WGDashboard" OFF \ - 3>&1 1>&2 2>&3) -header_info -if [ "$UPD" == "1" ]; then -msg_info "Updating ${APP} LXC" -apt-get update &>/dev/null -apt-get -y upgrade &>/dev/null -msg_ok "Updated ${APP} LXC" +if [[ ! -d /etc/wireguard ]]; then msg_error "No ${APP} Installation Found!"; exit; fi +msg_error "Update WireGuard via apt" exit -fi -if [ "$UPD" == "2" ]; then - if [[ -f /etc/systemd/system/wg-dashboard.service ]]; then - cd /etc/wgdashboard/src - chmod u+x wgd.sh - ./wgd.sh update - msg_ok "Updated Successfully" - exit - fi -IP=$(hostname -I | awk '{print $1}') -msg_info "Installing Python3-pip" -apt-get install -y python3-pip &>/dev/null -pip install flask &>/dev/null -pip install ifcfg &>/dev/null -pip install flask_qrcode &>/dev/null -pip install icmplib &>/dev/null -msg_ok "Installed Python3-pip" - -msg_info "Installing WGDashboard" -WGDREL=$(curl -s https://api.github.com/repos/donaldzou/WGDashboard/releases/latest | - grep "tag_name" | - awk '{print substr($2, 2, length($2)-3) }') - -git clone -b ${WGDREL} https://github.com/donaldzou/WGDashboard.git /etc/wgdashboard &>/dev/null -cd /etc/wgdashboard/src -chmod u+x wgd.sh -./wgd.sh install &>/dev/null -chmod -R 755 /etc/wireguard -msg_ok "Installed WGDashboard" - -msg_info "Creating Service" -service_path="/etc/systemd/system/wg-dashboard.service" -echo "[Unit] -After=systemd-networkd.service - -[Service] -WorkingDirectory=/etc/wgdashboard/src -ExecStart=/usr/bin/python3 /etc/wgdashboard/src/dashboard.py -Restart=always - - -[Install] -WantedBy=default.target" >$service_path -chmod 664 /etc/systemd/system/wg-dashboard.service -systemctl daemon-reload -systemctl enable wg-dashboard.service &>/dev/null -systemctl start wg-dashboard.service &>/dev/null -msg_ok "Created Service" -echo -e "WGDashboard should be reachable by going to the following URL. - ${BL}http://${IP}:10086${CL} admin|admin \n" -exit -fi } start @@ -124,3 +63,5 @@ build_container description msg_ok "Completed Successfully!\n" +echo -e "WGDashboard should be reachable by going to the following URL. + ${BL}http://${IP}:10086${CL} admin|admin \n" From 723365a79df7cc0fd29b1af8f7ef200a7e0921b1 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 21 Aug 2024 16:12:01 -0400 Subject: [PATCH 19/20] Update wireguard-install.sh - refactor code - breaking change --- install/wireguard-install.sh | 55 +++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/install/wireguard-install.sh b/install/wireguard-install.sh index 7cd004031..e1b470fc3 100644 --- a/install/wireguard-install.sh +++ b/install/wireguard-install.sh @@ -17,29 +17,46 @@ 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 gunicorn +$STD apt-get install -y git msg_ok "Installed Dependencies" -msg_info "Installing WireGuard (using pivpn.io)" -OPTIONS_PATH='/options.conf' -cat >$OPTIONS_PATH <>/etc/sysctl.conf +$STD sysctl -p /etc/sysctl.conf +msg_ok "Installed WGDashboard" + +msg_info "Creating Service" +cat </etc/systemd/system/wg-dashboard.service +[Unit] +After=syslog.target network-online.target +Wants=wg-quick.target +ConditionPathIsDirectory=/etc/wireguard + +[Service] +Type=forking +PIDFile=/etc/wgdashboard/src/gunicorn.pid +WorkingDirectory=/etc/wgdashboard/src +ExecStart=/etc/wgdashboard/src/wgd.sh start +ExecStop=/etc/wgdashboard/src/wgd.sh stop +ExecReload=/etc/wgdashboard/src/wgd.sh restart +TimeoutSec=120 +PrivateTmp=yes +Restart=always + +[Install] +WantedBy=multi-user.target +EOF +systemctl enable -q --now wg-dashboard.service +msg_ok "Created Service" + motd_ssh customize From 561419f1a2465c4def1c175a9eec21038b6d1215 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 21 Aug 2024 16:14:24 -0400 Subject: [PATCH 20/20] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33f12ea0d..fd304c7d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,14 @@ Be cautious of copycat or coat-tailing sites that exploit the project's populari - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment. +## 2024-08-21 + +### Changed + +- **WireGuard LXC** [(Commit)](https://github.com/tteck/Proxmox/commit/723365a79df7cc0fd29b1af8f7ef200a7e0921b1) + - Refactor Code + - Breaking Change + ## 2024-08-19 ### Changed