From 59f9037b838dc02e439ae11eeeab0c66e5df4047 Mon Sep 17 00:00:00 2001 From: richard-austin Date: Mon, 3 Jun 2024 16:32:38 +0100 Subject: [PATCH 1/3] * Include drawdown calculator in the .deb installation. --- xtrn-scripts-and-config/deb-file-creation/postinst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xtrn-scripts-and-config/deb-file-creation/postinst b/xtrn-scripts-and-config/deb-file-creation/postinst index e3fbe057..2e3f6e10 100755 --- a/xtrn-scripts-and-config/deb-file-creation/postinst +++ b/xtrn-scripts-and-config/deb-file-creation/postinst @@ -8,6 +8,9 @@ mv /tmp/server.xml /var/lib/tomcat9/conf mv /tmp/tomcat-users.xml /var/lib/tomcat9/conf mv /tmp/server-7.3.war /var/lib/tomcat9/webapps/ROOT.war mv /tmp/cua.war /var/lib/tomcat9/webapps/cua.war +# Get the drawdown calculator from the 2.1.0 release area +wget -O /var/lib/tomcat9/webapps/dc.war https://github.com/richard-austin/drawdown-calculator/releases/download/2.1.0/dc.war + mkdir -p /usr/local/bin wget -O /usr/local/bin/ffmpeg https://github.com/richard-austin/ffmpeg-4.4.4/releases/download/1.0.0/ffmpeg From 62fff7569cbf8d66baf9d0023d2a3d32b340aa8b Mon Sep 17 00:00:00 2001 From: richard-austin Date: Fri, 28 Jun 2024 14:24:11 +0100 Subject: [PATCH 2/3] * Correction to python version used in dev environment venvs. * Add warning note to installation section not to set up the Wi-Fi in the Imager. --- .idea/modules/security-cam.iml | 1 + README.md | 6 +++++- camera-recordings-service/camera-recordings-service.iml | 2 +- wifi-setup-service/wifi-setup-service.iml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.idea/modules/security-cam.iml b/.idea/modules/security-cam.iml index d1de65d2..d25fa6ce 100644 --- a/.idea/modules/security-cam.iml +++ b/.idea/modules/security-cam.iml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/README.md b/README.md index 7d946aba..ca8c10b4 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,10 @@ The firmware from Reolink main downloads site does not fully support this functi ## Installation * Set up Ubuntu 24.04 Server (Noble Numbat) on a Raspberry pi 4 or 5 + * NOTE: You can use the Edit Settings feature of the Raspberry pi Imager to set up the hostname, user account locale and enable ssh for the + Raspberry pi, but **DO NOT** set up the Wi-Fi with this facility as the NVRs own Wi-Fi set up utility will then not work. The NVR uses + nmcli to control the Wi-Fi wheres the Imager will set it up under wpa_supplicant which will make the Wi-Fi device unavailable to nmcli. + This means you will need to do the initial setup on the Raspberry pi connect8ed through Ethernet or a direct terminal. * ```bash sudo apt update sudo apt upgrade @@ -65,7 +69,7 @@ The firmware from Reolink main downloads site does not fully support this functi * ssh to the Raspberry pi. * ```bash # Install with - sudo apt install ./security-cam_9.0.0_arm64.deb + sudo apt install ./security-cam_9.1.1_arm64.deb # (or whichever version you have built or downloaded from the release area) ``` * See [SETTING-UP.md](SETTING-UP.md) for how to set up user account, wifi, cameras etc. diff --git a/camera-recordings-service/camera-recordings-service.iml b/camera-recordings-service/camera-recordings-service.iml index 5708e9e4..f375a6bd 100644 --- a/camera-recordings-service/camera-recordings-service.iml +++ b/camera-recordings-service/camera-recordings-service.iml @@ -15,7 +15,7 @@ - + diff --git a/wifi-setup-service/wifi-setup-service.iml b/wifi-setup-service/wifi-setup-service.iml index 63353bf6..f836e105 100644 --- a/wifi-setup-service/wifi-setup-service.iml +++ b/wifi-setup-service/wifi-setup-service.iml @@ -15,7 +15,7 @@ - + From a906e49796e9fd4189d6a69869166ce3df0cffe1 Mon Sep 17 00:00:00 2001 From: richard-austin Date: Fri, 28 Jun 2024 14:28:26 +0100 Subject: [PATCH 3/3] Update README.md Fix typos --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca8c10b4..1f3cd323 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,8 @@ The firmware from Reolink main downloads site does not fully support this functi * Set up Ubuntu 24.04 Server (Noble Numbat) on a Raspberry pi 4 or 5 * NOTE: You can use the Edit Settings feature of the Raspberry pi Imager to set up the hostname, user account locale and enable ssh for the Raspberry pi, but **DO NOT** set up the Wi-Fi with this facility as the NVRs own Wi-Fi set up utility will then not work. The NVR uses - nmcli to control the Wi-Fi wheres the Imager will set it up under wpa_supplicant which will make the Wi-Fi device unavailable to nmcli. - This means you will need to do the initial setup on the Raspberry pi connect8ed through Ethernet or a direct terminal. + nmcli to control the Wi-Fi whereas the Imager will set it up under wpa_supplicant which will make the Wi-Fi device unavailable to nmcli. + This means you will need to do the initial setup on the Raspberry pi connected through Ethernet or a direct terminal. * ```bash sudo apt update sudo apt upgrade