From 7bd8e9d86dd627d0b34e27f20382d8ac75d104f4 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Wed, 3 Apr 2024 02:27:00 +0200 Subject: [PATCH 1/5] fix: remove dist codename from config filenames removed obsolete files --- .../MQTT-protocol/README.md | 4 ++-- ...niebox-mqtt-client.service-default.sample} | 0 ...ple => 15-fastcgi-php.conf-default.sample} | 0 .../deviceName.txt.stretch-default.sample | 1 - ...e => dhcpcd.conf-default-noHotspot.sample} | 0 ...lt.sample => lighttpd.conf-default.sample} | 0 ...activate-amplifier.service-default.sample} | 0 ...niebox-rfid-reader.service-default.sample} | 0 ...ox-startup-scripts.service-default.sample} | 0 ...artup-sound.service.stretch-default.sample | 16 -------------- ...-default.sample => php.ini-default.sample} | 0 ...default.sample => smb.conf-default.sample} | 18 +++++++-------- ...-default.sample => sudoers-default.sample} | 0 scripts/installscripts/install-jukebox.sh | 22 ++++++++----------- 14 files changed, 20 insertions(+), 41 deletions(-) rename components/smart-home-automation/MQTT-protocol/{phoniebox-mqtt-client.service.stretch-default.sample => phoniebox-mqtt-client.service-default.sample} (100%) rename misc/sampleconfigs/{15-fastcgi-php.conf.buster-default.sample => 15-fastcgi-php.conf-default.sample} (100%) mode change 100755 => 100644 delete mode 100755 misc/sampleconfigs/deviceName.txt.stretch-default.sample rename misc/sampleconfigs/{dhcpcd.conf.buster-default-noHotspot.sample => dhcpcd.conf-default-noHotspot.sample} (100%) mode change 100755 => 100644 rename misc/sampleconfigs/{lighttpd.conf.buster-default.sample => lighttpd.conf-default.sample} (100%) mode change 100755 => 100644 rename misc/sampleconfigs/{phoniebox-activate-amplifier.service.stretch-default.sample => phoniebox-activate-amplifier.service-default.sample} (100%) mode change 100755 => 100644 rename misc/sampleconfigs/{phoniebox-rfid-reader.service.stretch-default.sample => phoniebox-rfid-reader.service-default.sample} (100%) mode change 100755 => 100644 rename misc/sampleconfigs/{phoniebox-startup-scripts.service.stretch-default.sample => phoniebox-startup-scripts.service-default.sample} (100%) delete mode 100755 misc/sampleconfigs/phoniebox-startup-sound.service.stretch-default.sample rename misc/sampleconfigs/{php.ini.buster-default.sample => php.ini-default.sample} (100%) mode change 100755 => 100644 rename misc/sampleconfigs/{smb.conf.buster-default.sample => smb.conf-default.sample} (98%) mode change 100755 => 100644 rename misc/sampleconfigs/{sudoers.buster-default.sample => sudoers-default.sample} (100%) mode change 100755 => 100644 diff --git a/components/smart-home-automation/MQTT-protocol/README.md b/components/smart-home-automation/MQTT-protocol/README.md index 69267656b..03c0d0696 100644 --- a/components/smart-home-automation/MQTT-protocol/README.md +++ b/components/smart-home-automation/MQTT-protocol/README.md @@ -144,7 +144,7 @@ components/smart-home-automation/MQTT-protocol/ ## Auto-Starting the daemon at bootup * The daemon is run by executing the script `daemon_mqtt_client.py` which will run in an endless loop. -* There's a sample service file (`phoniebox-mqtt-client.service.stretch-default.sample`) that can be used to register the daemon to be run at bootup. +* There's a sample service file (`phoniebox-mqtt-client.service-default.sample`) that can be used to register the daemon to be run at bootup. * It is currently not integrated into the one-line-install script so please run the following commands to do it manually. First step: copy files to destination locations: @@ -152,7 +152,7 @@ First step: copy files to destination locations: ~~~bash # First copy the daemon script and service config file to the correct directory: sudo cp /home/pi/RPi-Jukebox-RFID/components/smart-home-automation/MQTT-protocol/daemon_mqtt_client.py /home/pi/RPi-Jukebox-RFID/scripts/ -sudo cp /home/pi/RPi-Jukebox-RFID/components/smart-home-automation/MQTT-protocol/phoniebox-mqtt-client.service.stretch-default.sample /etc/systemd/system/phoniebox-mqtt-client.service +sudo cp /home/pi/RPi-Jukebox-RFID/components/smart-home-automation/MQTT-protocol/phoniebox-mqtt-client.service-default.sample /etc/systemd/system/phoniebox-mqtt-client.service # make sure the file exists touch /home/pi/RPi-Jukebox-RFID/settings/Latest_RFID ~~~ diff --git a/components/smart-home-automation/MQTT-protocol/phoniebox-mqtt-client.service.stretch-default.sample b/components/smart-home-automation/MQTT-protocol/phoniebox-mqtt-client.service-default.sample similarity index 100% rename from components/smart-home-automation/MQTT-protocol/phoniebox-mqtt-client.service.stretch-default.sample rename to components/smart-home-automation/MQTT-protocol/phoniebox-mqtt-client.service-default.sample diff --git a/misc/sampleconfigs/15-fastcgi-php.conf.buster-default.sample b/misc/sampleconfigs/15-fastcgi-php.conf-default.sample old mode 100755 new mode 100644 similarity index 100% rename from misc/sampleconfigs/15-fastcgi-php.conf.buster-default.sample rename to misc/sampleconfigs/15-fastcgi-php.conf-default.sample diff --git a/misc/sampleconfigs/deviceName.txt.stretch-default.sample b/misc/sampleconfigs/deviceName.txt.stretch-default.sample deleted file mode 100755 index 434b52bed..000000000 --- a/misc/sampleconfigs/deviceName.txt.stretch-default.sample +++ /dev/null @@ -1 +0,0 @@ -Sycreader USB Reader \ No newline at end of file diff --git a/misc/sampleconfigs/dhcpcd.conf.buster-default-noHotspot.sample b/misc/sampleconfigs/dhcpcd.conf-default-noHotspot.sample old mode 100755 new mode 100644 similarity index 100% rename from misc/sampleconfigs/dhcpcd.conf.buster-default-noHotspot.sample rename to misc/sampleconfigs/dhcpcd.conf-default-noHotspot.sample diff --git a/misc/sampleconfigs/lighttpd.conf.buster-default.sample b/misc/sampleconfigs/lighttpd.conf-default.sample old mode 100755 new mode 100644 similarity index 100% rename from misc/sampleconfigs/lighttpd.conf.buster-default.sample rename to misc/sampleconfigs/lighttpd.conf-default.sample diff --git a/misc/sampleconfigs/phoniebox-activate-amplifier.service.stretch-default.sample b/misc/sampleconfigs/phoniebox-activate-amplifier.service-default.sample old mode 100755 new mode 100644 similarity index 100% rename from misc/sampleconfigs/phoniebox-activate-amplifier.service.stretch-default.sample rename to misc/sampleconfigs/phoniebox-activate-amplifier.service-default.sample diff --git a/misc/sampleconfigs/phoniebox-rfid-reader.service.stretch-default.sample b/misc/sampleconfigs/phoniebox-rfid-reader.service-default.sample old mode 100755 new mode 100644 similarity index 100% rename from misc/sampleconfigs/phoniebox-rfid-reader.service.stretch-default.sample rename to misc/sampleconfigs/phoniebox-rfid-reader.service-default.sample diff --git a/misc/sampleconfigs/phoniebox-startup-scripts.service.stretch-default.sample b/misc/sampleconfigs/phoniebox-startup-scripts.service-default.sample similarity index 100% rename from misc/sampleconfigs/phoniebox-startup-scripts.service.stretch-default.sample rename to misc/sampleconfigs/phoniebox-startup-scripts.service-default.sample diff --git a/misc/sampleconfigs/phoniebox-startup-sound.service.stretch-default.sample b/misc/sampleconfigs/phoniebox-startup-sound.service.stretch-default.sample deleted file mode 100755 index e2f9af570..000000000 --- a/misc/sampleconfigs/phoniebox-startup-sound.service.stretch-default.sample +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Phoniebox Startup Sound -After=mpd.service - -[Service] -User=pi -Group=pi -Type=oneshot -RemainAfterExit=true -WorkingDirectory=/home/pi/RPi-Jukebox-RFID -ExecStartPre=/home/pi/RPi-Jukebox-RFID/scripts/playout_controls.sh -c=setvolumetostartup -ExecStart=/bin/sleep 2 -ExecStartPost=/usr/bin/mpg123 /home/pi/RPi-Jukebox-RFID/shared/startupsound.mp3 - -[Install] -WantedBy=multi-user.target diff --git a/misc/sampleconfigs/php.ini.buster-default.sample b/misc/sampleconfigs/php.ini-default.sample old mode 100755 new mode 100644 similarity index 100% rename from misc/sampleconfigs/php.ini.buster-default.sample rename to misc/sampleconfigs/php.ini-default.sample diff --git a/misc/sampleconfigs/smb.conf.buster-default.sample b/misc/sampleconfigs/smb.conf-default.sample old mode 100755 new mode 100644 similarity index 98% rename from misc/sampleconfigs/smb.conf.buster-default.sample rename to misc/sampleconfigs/smb.conf-default.sample index 38f4650f6..c0baa0189 --- a/misc/sampleconfigs/smb.conf.buster-default.sample +++ b/misc/sampleconfigs/smb.conf-default.sample @@ -4,7 +4,7 @@ # # This is the main Samba configuration file. You should read the # smb.conf(5) manual page in order to understand the options listed -# here. Samba has a huge number of configurable options most of which +# here. Samba has a huge number of configurable options most of which # are not shown in this example # # Some options that are often worth tuning have been included as @@ -16,8 +16,8 @@ # enough to be mentioned here # # NOTE: Whenever you modify this file you should run the command -# "testparm" to check that you have not made any basic syntactic -# errors. +# "testparm" to check that you have not made any basic syntactic +# errors. #======================= Global Settings ======================= @@ -66,7 +66,7 @@ # Server role. Defines in which mode Samba will operate. Possible # values are "standalone server", "member server", "classic primary # domain controller", "classic backup domain controller", "active -# directory domain controller". +# directory domain controller". # # Most people will want "standalone server" or "member server". # Running as "active directory domain controller" will require first @@ -101,7 +101,7 @@ # # The following settings only takes effect if 'server role = primary # classic domain controller', 'server role = backup domain controller' -# or 'domain logons' is set +# or 'domain logons' is set # # It specifies the location of the user's @@ -130,13 +130,13 @@ # password; please adapt to your needs ; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u -# This allows machine accounts to be created on the domain controller via the -# SAMR RPC pipe. +# This allows machine accounts to be created on the domain controller via the +# SAMR RPC pipe. # The following assumes a "machines" group exists on the system ; add machine script = /usr/sbin/useradd -g machines -c "%u machine account" -d /var/lib/samba -s /bin/false %u # This allows Unix groups to be created on the domain controller via the SAMR -# RPC pipe. +# RPC pipe. ; add group script = /usr/sbin/addgroup --force-badname %g ############ Misc ############ @@ -220,7 +220,7 @@ create mask=0777 directory mask=0777 public=no - + # if the audiofiles are not in 'shared', we need this [phoniebox_audiofile] comment= Pi Jukebox diff --git a/misc/sampleconfigs/sudoers.buster-default.sample b/misc/sampleconfigs/sudoers-default.sample old mode 100755 new mode 100644 similarity index 100% rename from misc/sampleconfigs/sudoers.buster-default.sample rename to misc/sampleconfigs/sudoers-default.sample diff --git a/scripts/installscripts/install-jukebox.sh b/scripts/installscripts/install-jukebox.sh index 751a2ef06..6c46dbdcb 100644 --- a/scripts/installscripts/install-jukebox.sh +++ b/scripts/installscripts/install-jukebox.sh @@ -785,7 +785,7 @@ samba_config() { echo "Configuring Samba..." # Samba configuration settings # -rw-r--r-- 1 root root 9416 Apr 30 09:02 /etc/samba/smb.conf - sudo cp "${jukebox_dir}"/misc/sampleconfigs/smb.conf.buster-default.sample ${smb_conf} + sudo cp "${jukebox_dir}"/misc/sampleconfigs/smb.conf-default.sample ${smb_conf} sudo chown root:root "${smb_conf}" sudo chmod 644 "${smb_conf}" # for $DIRaudioFolders using | as alternate regex delimiter because of the folder path slash @@ -808,7 +808,7 @@ web_server_config() { sudo chmod o+x ${HOME_DIR} # Web server configuration settings # -rw-r--r-- 1 root root 1040 Apr 30 09:19 /etc/lighttpd/lighttpd.conf - sudo cp "${jukebox_dir}"/misc/sampleconfigs/lighttpd.conf.buster-default.sample "${lighthttpd_conf}" + sudo cp "${jukebox_dir}"/misc/sampleconfigs/lighttpd.conf-default.sample "${lighthttpd_conf}" sudo chown root:root "${lighthttpd_conf}" sudo chmod 644 "${lighthttpd_conf}" # double quotes for variable expansion @@ -816,19 +816,19 @@ web_server_config() { # Web server PHP7 fastcgi conf # -rw-r--r-- 1 root root 398 Apr 30 09:35 /etc/lighttpd/conf-available/15-fastcgi-php.conf - sudo cp "${jukebox_dir}"/misc/sampleconfigs/15-fastcgi-php.conf.buster-default.sample ${fastcgi_php_conf} + sudo cp "${jukebox_dir}"/misc/sampleconfigs/15-fastcgi-php.conf-default.sample ${fastcgi_php_conf} sudo chown root:root "${fastcgi_php_conf}" sudo chmod 644 "${fastcgi_php_conf}" # settings for php.ini to support upload # -rw-r--r-- 1 root root 70999 Jun 14 13:50 /etc/php/7.3/cgi/php.ini - sudo cp "${jukebox_dir}"/misc/sampleconfigs/php.ini.buster-default.sample ${php_ini} + sudo cp "${jukebox_dir}"/misc/sampleconfigs/php.ini-default.sample ${php_ini} sudo chown root:root "${php_ini}" sudo chmod 644 "${php_ini}" # SUDO users (adding web server here) # -r--r----- 1 root root 703 Nov 17 21:08 /etc/sudoers - sudo cp "${jukebox_dir}"/misc/sampleconfigs/sudoers.buster-default.sample ${sudoers} + sudo cp "${jukebox_dir}"/misc/sampleconfigs/sudoers-default.sample ${sudoers} sudo chown root:root "${sudoers}" sudo chmod 440 "${sudoers}" } @@ -1023,7 +1023,7 @@ install_main() { sudo systemctl disable phoniebox-rotary-encoder sudo systemctl disable phoniebox-gpio-buttons.service sudo rm "${systemd_dir}"/rfid-reader.service - sudo rm "${systemd_dir}"/startup-sound.service + sudo rm "${systemd_dir}"/phoniebox-startup-sound.service sudo rm "${systemd_dir}"/gpio-buttons.service sudo rm "${systemd_dir}"/idle-watchdog.service sudo rm "${systemd_dir}"/phoniebox-rotary-encoder.service @@ -1032,14 +1032,12 @@ install_main() { # 2. install new ones - this is version > 1.1.8-beta RFID_READER_SERVICE="${systemd_dir}/phoniebox-rfid-reader.service" - sudo cp "${jukebox_dir}"/misc/sampleconfigs/phoniebox-rfid-reader.service.stretch-default.sample "${RFID_READER_SERVICE}" + sudo cp "${jukebox_dir}"/misc/sampleconfigs/phoniebox-rfid-reader.service-default.sample "${RFID_READER_SERVICE}" # Replace homedir; double quotes for variable expansion sudo sed -i "s%/home/pi%${HOME_DIR}%g" "${RFID_READER_SERVICE}" - #startup sound now part of phoniebox-startup-scripts - #sudo cp "${jukebox_dir}"/misc/sampleconfigs/phoniebox-startup-sound.service.stretch-default.sample "${systemd_dir}"/phoniebox-startup-sound.service STARTUP_SCRIPT_SERVICE="${systemd_dir}/phoniebox-startup-scripts.service" - sudo cp "${jukebox_dir}"/misc/sampleconfigs/phoniebox-startup-scripts.service.stretch-default.sample "${STARTUP_SCRIPT_SERVICE}" + sudo cp "${jukebox_dir}"/misc/sampleconfigs/phoniebox-startup-scripts.service-default.sample "${STARTUP_SCRIPT_SERVICE}" # Replace homedir; double quotes for variable expansion sudo sed -i "s%/home/pi%${HOME_DIR}%g" "${STARTUP_SCRIPT_SERVICE}" @@ -1060,8 +1058,6 @@ install_main() { # enable the services needed sudo systemctl enable phoniebox-idle-watchdog sudo systemctl enable phoniebox-rfid-reader - #startup sound is part of phoniebox-startup-scripts now - #sudo systemctl enable phoniebox-startup-sound sudo systemctl enable phoniebox-startup-scripts # copy mp3s for startup and shutdown sound to the right folder cp "${jukebox_dir}"/misc/sampleconfigs/startupsound.mp3.sample "${jukebox_dir}"/shared/startupsound.mp3 @@ -1177,7 +1173,7 @@ wifi_settings() { # DHCP configuration settings local dhcpcd_conf="/etc/dhcpcd.conf" #-rw-rw-r-- 1 root netdev 0 Apr 17 11:25 /etc/dhcpcd.conf - sudo cp "${jukebox_dir}"/misc/sampleconfigs/dhcpcd.conf.buster-default-noHotspot.sample "${dhcpcd_conf}" + sudo cp "${jukebox_dir}"/misc/sampleconfigs/dhcpcd.conf-default-noHotspot.sample "${dhcpcd_conf}" # Change IP for router and Phoniebox sudo sed -i 's/%WIFIinterface%/'"$WIFI_INTERFACE"'/' "${dhcpcd_conf}" sudo sed -i 's/%WIFIip%/'"$WIFIip"'/' "${dhcpcd_conf}" From 668da259fc1f4aaf8bd1c48df09b43ce44bbc587 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Wed, 3 Apr 2024 02:27:37 +0200 Subject: [PATCH 2/5] feat: remove buster from ci tests --- .github/workflows/test_docker_debian.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/test_docker_debian.yml b/.github/workflows/test_docker_debian.yml index 7c929ae76..c7202e705 100644 --- a/.github/workflows/test_docker_debian.yml +++ b/.github/workflows/test_docker_debian.yml @@ -69,18 +69,3 @@ jobs: # with: # debian_codename: 'bullseye' # platform: linux/arm/v6 - - run_buster_armv7: - name: 'buster armv7' - uses: ./.github/workflows/test_docker_debian_codename_sub.yml - with: - debian_codename: 'buster' - platform: linux/arm/v7 - - # # can be activate on test branches, currently failing - # run_buster_armv6: - # name: 'buster armv6' - # uses: ./.github/workflows/test_docker_debian_codename_sub.yml - # with: - # debian_codename: 'buster' - # platform: linux/arm/v6 From 09e7834d45f3ad56564081160a70165927b69535 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Wed, 3 Apr 2024 03:25:49 +0200 Subject: [PATCH 3/5] Update pythonpackage.yml --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 7b60f2c04..c38e6d1bc 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -15,7 +15,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v4 From bd9692140cafa9bf37d5080c2d05fdc7433eff79 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Wed, 3 Apr 2024 03:27:06 +0200 Subject: [PATCH 4/5] added Python 3.12 --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index c38e6d1bc..6cb871112 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -15,7 +15,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v4 From 2dea9d14f3fd0b8c4694feef030faa51c99e9f91 Mon Sep 17 00:00:00 2001 From: Alvin Schiller <103769832+AlvinSchiller@users.noreply.github.com> Date: Mon, 8 Apr 2024 19:41:37 +0000 Subject: [PATCH 5/5] fix: update CONTRIBUTING --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ac2d37c6..44b4ff13b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -91,7 +91,7 @@ If the code change results in a test failure, we will make our best effort to co ### Guidelines -* The oldest supported Raspberry Pi OS version is currently **Buster**. Therefore all Python code should work with **Python 3.7**. +* All code has to run under the stable and legacy version of Raspberry Pi OS (please check if currently even an older version is still supported). * For GPIO all code should work with **RPi.GPIO**. gpiozero is currently not intended to use. ### Additional Resources