From 5c491085d04d12168a26abc1414344639e6c2d67 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Sun, 4 Feb 2024 23:09:36 +0100 Subject: [PATCH 1/4] Bump to v3.6.0-alpha --- src/jukebox/jukebox/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jukebox/jukebox/version.py b/src/jukebox/jukebox/version.py index 65ccc87c0..a7f37c5e6 100644 --- a/src/jukebox/jukebox/version.py +++ b/src/jukebox/jukebox/version.py @@ -1,8 +1,8 @@ VERSION_MAJOR = 3 -VERSION_MINOR = 5 +VERSION_MINOR = 6 VERSION_PATCH = 0 -VERSION_EXTRA = "" +VERSION_EXTRA = "alpha" # build a version string in compliance with the SemVer specification # https://semver.org/#semantic-versioning-specification-semver From b35013c70def28506e7bae3a79fdc0e01b6d656f Mon Sep 17 00:00:00 2001 From: s-martin Date: Mon, 5 Feb 2024 10:54:43 +0100 Subject: [PATCH 2/4] Link to nfcpy in docs (#2238) * Link to nfcpy * update doc for serial devices * Change name Co-authored-by: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> --------- Co-authored-by: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> --- documentation/developers/rfid/README.md | 3 ++- documentation/developers/rfid/generic_nfcpy.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/documentation/developers/rfid/README.md b/documentation/developers/rfid/README.md index c1412a90b..0b2df4db3 100644 --- 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) - \ No newline at end of file + diff --git a/documentation/developers/rfid/generic_nfcpy.md b/documentation/developers/rfid/generic_nfcpy.md index bea7b302a..76de98d88 100644 --- 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. From 027ec2905e006565fbba2f51f90e2a7d3053838c Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Sun, 11 Feb 2024 22:10:39 +0100 Subject: [PATCH 3/4] remove listen on ipv6 if disabled (#2254) --- installation/includes/02_helpers.sh | 15 +++++++++++++++ installation/routines/setup_jukebox_webapp.sh | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/installation/includes/02_helpers.sh b/installation/includes/02_helpers.sh index be496b1b9..dfad65187 100644 --- 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 index 7fcbce7ff..f95e547f1 100644 --- 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 } From 9110c9424ea086aa7289a59ac7d69d0297b3adc0 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Sun, 11 Feb 2024 23:50:56 +0100 Subject: [PATCH 4/4] hotfix v3.5.1 --- src/jukebox/jukebox/version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jukebox/jukebox/version.py b/src/jukebox/jukebox/version.py index a7f37c5e6..dae1bc8c0 100644 --- a/src/jukebox/jukebox/version.py +++ b/src/jukebox/jukebox/version.py @@ -1,8 +1,8 @@ VERSION_MAJOR = 3 -VERSION_MINOR = 6 -VERSION_PATCH = 0 -VERSION_EXTRA = "alpha" +VERSION_MINOR = 5 +VERSION_PATCH = 1 +VERSION_EXTRA = "" # build a version string in compliance with the SemVer specification # https://semver.org/#semantic-versioning-specification-semver