Merge pull request #4992 from AllskyTeam/4990-add-trixie-support

4990 add trixie support

Author: Alex-developer

html/cgi-bin/format.py

@@ -1,10 +1,12 @@
-import cgi
+#import cgi
 import os
+import sys
 import json
 import re
 import time
 import locale
 from datetime import datetime, timedelta, date
+import urllib.parse
 
 class ALLSKYFORMAT:
 
@@ -25,13 +27,24 @@ def __init__(self):
         except:
             pass
 
-        formData = cgi.FieldStorage()
-
-        self._config = formData["config"].value
-        self._fields = formData["fields"].value
+        #formData = cgi.FieldStorage()
+        formData = self._get_params()
+                
+        self._config = formData.get("config", [None])[0]
+        self._fields  = formData.get("fields", [None])[0]
+        
         self._jsonConfig = json.loads(self._config)
         self._jsonFields = json.loads(self._fields)
         self._getAllSkyVariables()
+        
+    def _get_params(self):
+        if os.environ.get("REQUEST_METHOD", "") == "POST":
+            length = int(os.environ.get("CONTENT_LENGTH", "0"))
+            data = sys.stdin.read(length)
+        else:
+            data = os.environ.get("QUERY_STRING", "")
+        return urllib.parse.parse_qs(data)
+
 
     def _getAllSkyVariables(self):
         # Can't use ALLSKY_TMP since it's not defined

install.sh

@@ -13,18 +13,6 @@ source "${ALLSKY_SCRIPTS}/functions.sh"					|| exit "${EXIT_ERROR_STOP}"
 #shellcheck source-path=scripts
 source "${ALLSKY_SCRIPTS}/installUpgradeFunctions.sh"	|| exit "${EXIT_ERROR_STOP}"
 
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX TODO: temporary Trixie check
-if [[ ${PI_OS} == "trixie" ]]; then
-	echo -e "\n\n================================\n"
-	echo "Allsky does not yet work with the new Trixie operating system."
-	echo "Please use Bookworm instead."
-	echo "We will announce in the Allsky GitHub Discussions page when Trixie support is available."
-	echo -e "\nCheck back in a week or so."
-	echo -e "\n================================"
-	exit 0
-fi
-# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
 # Default may be 700 (HOME) or 750 (ALLSKY_HOME) so web server can't read it
 chmod 755 "${HOME}" "${ALLSKY_HOME}"					|| exit "${EXIT_ERROR_STOP}"
 cd "${ALLSKY_HOME}"  									|| exit "${EXIT_ERROR_STOP}"
@@ -1047,7 +1035,7 @@ install_webserver_et_al()
 		display_msg --log progress "Installing the web server."
 		TMP="${ALLSKY_LOGS}/lighttpd.install.log"
 		run_aptGet \
-			lighttpd  php-cgi  php-gd  hostapd  dnsmasq  avahi-daemon  hwinfo tree i2c-tools \
+			lighttpd  php-fpm  php-gd  hostapd  dnsmasq  avahi-daemon  hwinfo tree i2c-tools \
 			> "${TMP}" 2>&1
 		check_success $? "lighttpd installation failed" "${TMP}" "${DEBUG}" \
 			|| exit_with_image 1 "${STATUS_ERROR}" "lighttpd installation failed"
@@ -1057,7 +1045,7 @@ install_webserver_et_al()
 	create_lighttpd_log_file
 
 	# Ignore output since it may already be enabled.
-	sudo lighty-enable-mod fastcgi-php > /dev/null 2>&1
+	sudo lighty-enable-mod fastcgi-php-fpm > /dev/null 2>&1
 
 	TMP="${ALLSKY_LOGS}/lighttpd.start.log"
 	sudo systemctl start lighttpd > "${TMP}" 2>&1
@@ -3340,7 +3328,7 @@ install_Python()
 
 	NUM_TO_INSTALL=$( wc -l < "${REQUIREMENTS_FILE}" )
 
-	if [[ ${PI_OS} == "bookworm" ]]; then
+	if [[ ${PI_OS} == "bookworm" || ${PI_OS} == "trixie" ]]; then
 		PKGs="python3-full libgfortran5 libopenblas0-pthread"
 		display_msg --logonly progress "Installing ${PKGs}."
 		TMP="${ALLSKY_LOGS}/python3-full.log"

scripts/functions.sh

@@ -1364,7 +1364,7 @@ function activate_python_venv()
 
 	local ACTIVATE="${ALLSKY_PYTHON_VENV}/bin/activate"
 
-	if [[ ${PI_OS} == "bookworm" && -s ${ACTIVATE} ]]; then
+	if [[ ( ${PI_OS} == "bookworm" || ${PI_OS} == "trixie" ) && -s ${ACTIVATE} ]]; then
 		#shellcheck disable=SC1090,SC1091
 		source "${ACTIVATE}" || exit 1
 		PYTHON_VENV_ACTIVATED="true"