Wallabag: Update PHP extensions (#6251)

* Fix PHP extensions * Refine PHP settings
SynoCommunity · Oct 7, 2024 · 258c0d6 · 258c0d6
1 parent 60e44b6
commit 258c0d6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/spk/wallabag/Makefile b/spk/wallabag/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = wallabag
 SPK_VERS = 2.6.9
-SPK_REV = 4
+SPK_REV = 5
 SPK_ICON = src/wallabag.png
 
 DEPENDS  = cross/$(SPK_NAME)

diff --git a/spk/wallabag/src/conf/resource b/spk/wallabag/src/conf/resource
@@ -64,9 +64,15 @@
                         "iconv",
                         "imagick",
                         "intl",
-                        "pdo_mysql"
+                        "openssl",
+                        "pdo_mysql",
+                        "zlib"
                     ],
                     "group": "http",
+                    "php_settings": {
+                        "error_log": "/var/services/web_packages/wallabag/php_errors.log",
+                        "pdo_mysql.default_socket": "/run/mysqld/mysqld10.sock"
+                    },    
                     "profile_desc": "PHP Profile for wallabag",
                     "profile_name": "wallabag Profile",
                     "user": "sc-wallabag"

diff --git a/spk/wallabag/src/service-setup.sh b/spk/wallabag/src/service-setup.sh
@@ -33,9 +33,9 @@ exec_php ()
     else
         PHP_SETTINGS=""
     fi
-    # Fix for mysqli default socket on DSM 6
+    # Fix for pdo_mysql default socket on DSM 6
     if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then
-        PHP_SETTINGS="${PHP_SETTINGS} -d mysqli.default_socket=/run/mysqld/mysqld10.sock"
+        PHP_SETTINGS="${PHP_SETTINGS} -d pdo_mysql.default_socket=/run/mysqld/mysqld10.sock"
     fi
     COMMAND="${PHP} ${PHP_SETTINGS} $*"
     if [ ${SYNOPKG_DSM_VERSION_MAJOR} -lt 7 ]; then

diff --git a/spk/wallabag/src/web/wallabag.json b/spk/wallabag/src/web/wallabag.json
@@ -12,7 +12,9 @@
         "iconv",
         "imagick",
         "intl",
-        "pdo_mysql"
+        "openssl",
+        "pdo_mysql",
+        "zlib"
     ],
     "fpm_settings": {
         "max_children": 20,
@@ -23,7 +25,8 @@
     },
     "open_basedir": "",
     "php_settings": {
-        "mysqli.default_socket": "/run/mysqld/mysqld10.sock"
+        "error_log": "/var/services/web/wallabag/php_errors.log",
+        "pdo_mysql.default_socket": "/run/mysqld/mysqld10.sock"
     },
     "profile_desc": "PHP Profile for wallabag",
     "profile_name": "wallabag Profile"