Merge from MiczFlor/future3/develop

Release v3.5.1
AlvinSchiller · Feb 11, 2024 · cbaf33c · cbaf33c
2 parents 92b4c4b + 9110c94
commit cbaf33c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/documentation/developers/rfid/README.md b/documentation/developers/rfid/README.md
@@ -8,6 +8,7 @@
   * [RDM6300 Reader](rdm6300.md)
   * [MFRC522 SPI Reader](mfrc522_spi.md)
   * [PN532 I2C Reader](pn532_i2c.md)
+  * [Generic Readers without HID (NFCpy)](generic_nfcpy.md)
   * [Mock Reader](mock_reader.md)
   * [Template Reader](template_reader.md)
-
+
diff --git a/documentation/developers/rfid/generic_nfcpy.md b/documentation/developers/rfid/generic_nfcpy.md
@@ -4,7 +4,7 @@ This module is based on the user space NFC reader library [nfcpy](https://nfcpy.
 The link above also contains a list of [supported devices](https://nfcpy.readthedocs.io/en/latest/overview.html#supported-devices).
 
 The goal of this module is to handle USB NFC devices, that don't have a HID-keyboard
-driver, and thus cannot be used with the [genericusb](genericusb.md) module. 
+driver, and thus cannot be used with the [genericusb](genericusb.md) module. Also some serial devices are supported.
 
 > [!NOTE]
 > Since nfcpy is a user-space library, it is required to supress the kernel from loading its driver.

diff --git a/installation/includes/02_helpers.sh b/installation/includes/02_helpers.sh
@@ -299,6 +299,21 @@ verify_file_contains_string() {
     log "  CHECK"
 }
 
+verify_file_does_not_contain_string() {
+    local string="$1"
+    local file="$2"
+    log "  Verify '${string}' not found in '${file}'"
+
+    if [[ -z "${string}" || -z "${file}" ]]; then
+        exit_on_error "ERROR: at least one parameter value is missing!"
+    fi
+
+    if grep -iq "${string}" "${file}"; then
+        exit_on_error "ERROR: '${string}' found in '${file}'"
+    fi
+    log "  CHECK"
+}
+
 verify_file_contains_string_once() {
     local string="$1"
     local file="$2"

diff --git a/installation/routines/setup_jukebox_webapp.sh b/installation/routines/setup_jukebox_webapp.sh
@@ -117,6 +117,10 @@ _jukebox_webapp_register_as_system_service_with_nginx() {
   sudo cp -f "${INSTALLATION_PATH}/resources/default-settings/nginx.default" "${WEBAPP_NGINX_SITE_DEFAULT_CONF}"
   sudo sed -i "s|%%INSTALLATION_PATH%%|${INSTALLATION_PATH}|g" "${WEBAPP_NGINX_SITE_DEFAULT_CONF}"
 
+  if [ "$DISABLE_IPv6" = true ] ; then
+    sudo sed -i '/listen \[::\]:80/d' "${WEBAPP_NGINX_SITE_DEFAULT_CONF}"
+  fi
+
   # make sure nginx can access the home directory of the user
   sudo chmod o+x "${HOME_PATH}"
 
@@ -147,6 +151,10 @@ _jukebox_webapp_check() {
     verify_apt_packages nginx
     verify_files_exists "${WEBAPP_NGINX_SITE_DEFAULT_CONF}"
 
+    if [ "$DISABLE_IPv6" = true ] ; then
+      verify_file_does_not_contain_string "listen [::]:80" "${WEBAPP_NGINX_SITE_DEFAULT_CONF}"
+    fi
+
     verify_service_enablement nginx.service enabled
 }
 

diff --git a/src/jukebox/jukebox/version.py b/src/jukebox/jukebox/version.py
@@ -1,7 +1,7 @@
 
 VERSION_MAJOR = 3
 VERSION_MINOR = 5
-VERSION_PATCH = 0
+VERSION_PATCH = 1
 VERSION_EXTRA = ""
 
 # build a version string in compliance with the SemVer specification