From daa896894dc796f3a8b5fa98469af3d369f2bb4c Mon Sep 17 00:00:00 2001 From: indiscreettuna Date: Thu, 8 Aug 2024 18:36:34 +1000 Subject: [PATCH 1/5] Allow git clone over SSH (#3490) --- install/gitea-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/gitea-install.sh b/install/gitea-install.sh index 2ed5e7514..02c8310e2 100644 --- a/install/gitea-install.sh +++ b/install/gitea-install.sh @@ -27,12 +27,13 @@ RELEASE=$(wget -q https://github.com/go-gitea/gitea/releases/latest -O - | grep 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 +adduser --system --group --disabled-password --shell /bin/bash --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 +sudo -u gitea ln -s /var/lib/gitea/data/.ssh/ /etc/gitea/.ssh msg_ok "Installed Gitea" msg_info "Creating Service" From e428bb8604b08d7cef403e6dc07a6662ba2598cf Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 8 Aug 2024 12:21:17 -0400 Subject: [PATCH 2/5] Update trilium-install.sh switch to TriliumNext --- install/trilium-install.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/install/trilium-install.sh b/install/trilium-install.sh index 6e7861a69..d2e7ae3f4 100644 --- a/install/trilium-install.sh +++ b/install/trilium-install.sh @@ -19,15 +19,13 @@ $STD apt-get install -y sudo $STD apt-get install -y mc msg_ok "Installed Dependencies" -RELEASE=$(curl -s https://api.github.com/repos/zadam/trilium/releases/latest | - grep "tag_name" | - awk '{print substr($2, 3, length($2)-4) }') +RELEASE=$(curl -s https://api.github.com/repos/TriliumNext/Notes/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -msg_info "Installing Trilium" -wget -q https://github.com/zadam/trilium/releases/download/v$RELEASE/trilium-linux-x64-server-$RELEASE.tar.xz +msg_info "Installing TriliumNext" +wget -q https://github.com/TriliumNext/Notes/releases/download/v$RELEASE/trilium-linux-x64-server-$RELEASE.tar.xz $STD tar -xvf trilium-linux-x64-server-$RELEASE.tar.xz mv trilium-linux-x64-server /opt/trilium -msg_ok "Installed Trilium" +msg_ok "Installed TriliumNext" msg_info "Creating Service" service_path="/etc/systemd/system/trilium.service" From 9c88dcdbd64a4f302acb38f14aaff8efe8467bd0 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 8 Aug 2024 12:23:46 -0400 Subject: [PATCH 3/5] Update trilium.sh Switch to TriliumNext --- ct/trilium.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ct/trilium.sh b/ct/trilium.sh index d4ade9590..ac162c500 100644 --- a/ct/trilium.sh +++ b/ct/trilium.sh @@ -55,9 +55,7 @@ function default_settings() { function update_script() { header_info if [[ ! -d /opt/trilium ]]; then msg_error "No ${APP} Installation Found!"; exit; fi -RELEASE=$(curl -s https://api.github.com/repos/zadam/trilium/releases/latest | - grep "tag_name" | - awk '{print substr($2, 3, length($2)-4) }') +RELEASE=$(curl -s https://api.github.com/repos/TriliumNext/Notes/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') msg_info "Stopping ${APP}" systemctl stop trilium.service @@ -65,7 +63,7 @@ sleep 1 msg_ok "Stopped ${APP}" msg_info "Updating to v${RELEASE}" -wget -q https://github.com/zadam/trilium/releases/download/v$RELEASE/trilium-linux-x64-server-$RELEASE.tar.xz +wget -q https://github.com/TriliumNext/Notes/releases/download/v$RELEASE/trilium-linux-x64-server-$RELEASE.tar.xz tar -xvf trilium-linux-x64-server-$RELEASE.tar.xz &>/dev/null cp -r trilium-linux-x64-server/* /opt/trilium/ msg_ok "Updated to v${RELEASE}" From 2782502e0614fe7fc0c37c0a3871178086d710a5 Mon Sep 17 00:00:00 2001 From: tteckster Date: Thu, 8 Aug 2024 13:41:56 -0400 Subject: [PATCH 4/5] Update frigate-install.sh pin version to 13.2 --- install/frigate-install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/frigate-install.sh b/install/frigate-install.sh index f97652862..7d84f3703 100644 --- a/install/frigate-install.sh +++ b/install/frigate-install.sh @@ -46,7 +46,8 @@ if [[ "$CTTYPE" == "0" ]]; then fi msg_ok "Set Up Hardware Acceleration" -RELEASE=$(curl -s https://api.github.com/repos/blakeblackshear/frigate/releases/latest | jq -r '.tag_name') +#RELEASE=$(curl -s https://api.github.com/repos/blakeblackshear/frigate/releases/latest | jq -r '.tag_name') +RELEASE=v0.13.2 msg_ok "Stop spinner to prevent segmentation fault" msg_info "Installing Frigate $RELEASE (Perseverance)" if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null; then kill $SPINNER_PID > /dev/null; fi From 23ebc32489a9598594a3938f5f8068c2bdbf729e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20B=C3=A9dard-Couture?= Date: Fri, 9 Aug 2024 01:06:02 -0400 Subject: [PATCH 5/5] Support frigate latest release (#3495) --- install/frigate-install.sh | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/install/frigate-install.sh b/install/frigate-install.sh index 7d84f3703..61a10d9e2 100644 --- a/install/frigate-install.sh +++ b/install/frigate-install.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash # Copyright (c) 2021-2024 tteck -# Authors: tteck (tteckster) +# Author: tteck (tteckster) +# Co-Author: remz1337 # License: MIT # https://github.com/tteck/Proxmox/raw/main/LICENSE @@ -14,11 +15,12 @@ network_check update_os msg_info "Installing Dependencies (Patience)" -$STD apt-get install -y {curl,sudo,mc,git,gpg,automake,build-essential,xz-utils,libtool,ccache,pkg-config,libgtk-3-dev,libavcodec-dev,libavformat-dev,libswscale-dev,libv4l-dev,libxvidcore-dev,libx264-dev,libjpeg-dev,libpng-dev,libtiff-dev,gfortran,openexr,libatlas-base-dev,libssl-dev,libtbb2,libtbb-dev,libdc1394-22-dev,libopenexr-dev,libgstreamer-plugins-base1.0-dev,libgstreamer1.0-dev,gcc,gfortran,libopenblas-dev,liblapack-dev,libusb-1.0-0-dev,jq} +$STD apt-get install -y {curl,sudo,mc,git,gpg,automake,build-essential,xz-utils,libtool,ccache,pkg-config,libgtk-3-dev,libavcodec-dev,libavformat-dev,libswscale-dev,libv4l-dev,libxvidcore-dev,libx264-dev,libjpeg-dev,libpng-dev,libtiff-dev,gfortran,openexr,libatlas-base-dev,libssl-dev,libtbb2,libtbb-dev,libdc1394-22-dev,libopenexr-dev,libgstreamer-plugins-base1.0-dev,libgstreamer1.0-dev,gcc,gfortran,libopenblas-dev,liblapack-dev,libusb-1.0-0-dev,jq,moreutils} msg_ok "Installed Dependencies" msg_info "Installing Python3 Dependencies" $STD apt-get install -y {python3,python3-dev,python3-setuptools,python3-distutils,python3-pip} +$STD pip install --upgrade pip msg_ok "Installed Python3 Dependencies" msg_info "Installing Node.js" @@ -46,8 +48,7 @@ if [[ "$CTTYPE" == "0" ]]; then fi msg_ok "Set Up Hardware Acceleration" -#RELEASE=$(curl -s https://api.github.com/repos/blakeblackshear/frigate/releases/latest | jq -r '.tag_name') -RELEASE=v0.13.2 +RELEASE=$(curl -s https://api.github.com/repos/blakeblackshear/frigate/releases/latest | jq -r '.tag_name') msg_ok "Stop spinner to prevent segmentation fault" msg_info "Installing Frigate $RELEASE (Perseverance)" if [ -n "$SPINNER_PID" ] && ps -p $SPINNER_PID > /dev/null; then kill $SPINNER_PID > /dev/null; fi @@ -63,6 +64,7 @@ export TARGETARCH="amd64" echo 'libc6 libraries/restart-without-asking boolean true' | debconf-set-selections wget -q -O /opt/frigate/docker/main/install_deps.sh https://raw.githubusercontent.com/blakeblackshear/frigate/dev/docker/main/install_deps.sh $STD /opt/frigate/docker/main/install_deps.sh +$STD apt update $STD ln -svf /usr/lib/btbn-ffmpeg/bin/ffmpeg /usr/local/bin/ffmpeg $STD ln -svf /usr/lib/btbn-ffmpeg/bin/ffprobe /usr/local/bin/ffprobe $STD pip3 install -U /wheels/*.whl @@ -119,7 +121,7 @@ if grep -q -o -m1 'avx[^ ]*' /proc/cpuinfo; then detectors: ov: type: openvino - device: AUTO + device: CPU model: path: /openvino-model/FP16/ssdlite_mobilenet_v2.xml model: @@ -169,11 +171,19 @@ 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 -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 +ln -svf /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 +msg_ok "Installed Tempio" + msg_info "Creating Services" cat </etc/systemd/system/create_directories.service [Unit] @@ -201,7 +211,8 @@ 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=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 @@ -223,7 +234,8 @@ 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=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 @@ -245,7 +257,8 @@ 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=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 @@ -261,4 +274,4 @@ customize msg_info "Cleaning up" $STD apt-get -y autoremove $STD apt-get -y autoclean -msg_ok "Cleaned" +msg_ok "Cleaned" \ No newline at end of file