Merge remote-tracking branch 'upstream/main'

Author: openhabian

.github/workflows/bats-action.yml

@@ -51,11 +51,11 @@ jobs:
         run: sudo -E ./tests/ci-setup.bash github
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.12.0
+        uses: docker/setup-buildx-action@v4.1.0
         with:
           driver-opts: network=host
       - name: Build Docker image
-        uses: docker/build-push-action@v6.19.2
+        uses: docker/build-push-action@v7.2.0
         with:
           context: .
           file: ${{ matrix.dockerfile }}

.github/workflows/build-action.yml

@@ -86,7 +86,7 @@ jobs:
 
        - name: Create release template
          if: ${{ success() && github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }}
-         uses: "softprops/action-gh-release@v2"
+         uses: "softprops/action-gh-release@v3"
          env:
            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          with:

.github/workflows/installation-action.yml

@@ -74,11 +74,11 @@ jobs:
           sed -i 's|^java_opt=.*$|java_opt='"${{ matrix.java_opt }}"'|' build-image/openhabian.conf
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.12.0
+        uses: docker/setup-buildx-action@v4.1.0
         with:
           driver-opts: network=host
       - name: Build Docker image
-        uses: docker/build-push-action@v6.19.2
+        uses: docker/build-push-action@v7.2.0
         with:
           context: .
           file: ${{ matrix.dockerfile }}

docs/openhabian-backup.md

@@ -178,7 +178,7 @@ root@pi:/home/pi#
 root@pi:/home/pi# mkdir -p /storage/server
 root@pi:/home/pi# echo "192.168.1.100://share/freespace     /storage/server    nfs     nolock,noatime  0       0" >> /etc/fstab
 root@pi:/home/pi# mount /storage/server
-root@pi:/home/pi# df -k /server
+root@pi:/home/pi# df -k /storage/server
 Filesystem                       1K-blocks       Used Available  Use% Mounted on
 192.168.1.100://share/freespace 2882740768 2502091488 380649280   87% /storage/server
 root@pi:/home/pi#

docs/openhabian-exim.md

@@ -1,3 +1,9 @@
+---
+layout: documentation
+title: openHABian Mail Configuration
+source: https://github.com/openhab/openhabian/blob/main/docs/openhabian-exim.md
+---
+
 ## Mail Transfer Agent configuration
 
 When you choose the "Mail Transfer Agent" install option in `openhabian-config` menu to install `exim4` as the mail transfer agent on your system, you will be presented with a number of questions on how to relay emails through a public service such as Google gmail.

docs/openhabian.md

@@ -211,6 +211,9 @@ We try to setup everything for you so that you don't have to do any additional c
 -   **Language**: By default we set the `locale` setting to `en_US.UTF8` as this tends to be the best for error messages, it can be changed using menu option 32.
 -   **Passwords**: You should change the default password using menu option 34.
 
+NOTE: You should have been configuring timezone and locale at installation time via `openhabian.conf` settings.
+
+
 ##### Default Passwords
 
 For reference, the default username and passwords are as follows:
@@ -255,6 +258,9 @@ The ESPHome configuration files are secured by the openHABbian backup function.
 
 Many settings are configurable prior to the first boot of openHABian by changing the key value pairs in the `/boot/openhabian.conf` file on the SD card once you have flashed the initial image onto it.
 
+Most notably you should be setting the timezone and locale this way if yours differ from the defaults.
+Also make sure to read the [Networking] section and eventually preconfigure your Wi-Fi setup before you boot for the first time.
+
 Please note that - in case you use a Windows system for writing the SD card - the `/boot/` partition will be mounted to a drive named `bootfs`. So, e.g. if this drive has the letter `D:`, `/boot/openhabian.conf` will be found as `D:\openhabian.conf`.
 
 The openHABian configuration file uses key value pairs, essentially a list of `option=value` settings in a plain text file.

functions/auth.bash

@@ -92,7 +92,7 @@ change_password() {
   fi
   if [[ $chosenAccounts == *"Grafana"* ]]; then
     echo -n "$(timestamp) [openHABian] Changing password for Grafana admininistration account \"admin\"... "
-    if grafana-cli admin reset-admin-password --homepath "/usr/share/grafana" --config "/etc/grafana/grafana.ini" "$pass"; then echo "OK"; else echo "FAILED"; return 1; fi
+    if grafana cli admin reset-admin-password --homepath "/usr/share/grafana" --config "/etc/grafana/grafana.ini" "$pass"; then echo "OK"; else echo "FAILED"; return 1; fi
   fi
 
   if [[ -n $INTERACTIVE ]]; then

functions/backup.bash

@@ -111,7 +111,7 @@ amanda_install() {
 
   if ! amanda_is_installed; then
     echo -n "$(timestamp) [openHABian] Installing Amanda backup system... "
-    if cond_redirect apt-get install --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" amanda-common amanda-server amanda-client; then echo "OK"; else echo "FAILED"; return 1; fi
+    if cond_redirect apt-get install --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" amanda-common amanda-server amanda-client nfs-common; then echo "OK"; else echo "FAILED"; return 1; fi
   fi
   if ! dpkg -s 'exim4' &> /dev/null; then
     if ! exim_setup; then return 1; fi

functions/influxdb+grafana.bash

@@ -269,7 +269,7 @@ grafana_install(){
   # Password reset required if Grafana password was already set before (not first-time install)
   cond_echo "\\nResetting Grafana admin password... "
   if ! cond_redirect chsh --shell /bin/bash "grafana"; then echo "FAILED (chsh grafana)"; return 1; fi
-  if ! cond_redirect grafana-cli admin reset-admin-password "${adminPassword}"; then echo "FAILED (admin password)"; return 1; fi
+  if ! cond_redirect grafana cli admin reset-admin-password "${adminPassword}"; then echo "FAILED (admin password)"; return 1; fi
 
   cond_echo "\\nUpdating Grafana configuration... "
   if ! cond_redirect sed -i -e '/^# disable user signup \/ registration/ { n ; s/^;allow_sign_up = true/allow_sign_up = false/ }' /etc/grafana/grafana.ini; then echo "FAILED (no user signup)"; return 1; fi

functions/openhab.bash

@@ -112,7 +112,7 @@ openhab_setup() {
     fi
 
     # shellcheck disable=SC2086
-    if cond_redirect apt-get install --allow-downgrades --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" --option Dpkg::Options::="--force-confnew" $installVersion; then echo "OK"; else echo "FAILED"; return 1; fi
+    if cond_redirect apt-get install --allow-downgrades --allow-change-held-packages --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" --option Dpkg::Options::="--force-confnew" $installVersion; then echo "OK"; else echo "FAILED"; return 1; fi
   else
     echo -n "$(timestamp) [openHABian] Installing cached openHAB version... "
     if cond_redirect apt-get install --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" --option Dpkg::Options::="--force-confnew" ${ohPkgName} ${ohPkgName}-addons; then echo "OK"; else echo "FAILED"; return 1; fi