From 2974e636424ba21eb481b011ce6f70fd8e2c8731 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 10 Apr 2023 22:13:15 -0400 Subject: linhes-system: lighttpd and php updates for zabbix --- linhes/linhes-system/PKGBUILD | 6 +++--- linhes/linhes-system/lh_lighttpd.conf | 24 ++++++++++++++++++++---- linhes/linhes-system/lh_php.ini | 27 +++++++++++++++++++++++---- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/linhes/linhes-system/PKGBUILD b/linhes/linhes-system/PKGBUILD index f43d453..5d8aab1 100755 --- a/linhes/linhes-system/PKGBUILD +++ b/linhes/linhes-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-system pkgver=9.0.0 -pkgrel=59 +pkgrel=61 arch=('x86_64') #install=$pkgname.install pkgdesc="Everything that makes LinHES a system" @@ -75,8 +75,8 @@ sha256sums=('525bfe29b63d3ec5a17a32fa29745e24070020490c3f5b6dd6b03250348fb324' '1c2870087ebef43ffb69d422b6a8bfd687e0f3a955c4f186f8f6b8bb0de96557' 'efc2a04b67ea76661157e154228d4b58ae2e1b652f8ce41bc001a5a863d13573' '7f5b366075fa61fadfcdbab2837f0c58f3a8004a59fc8948fec1647d2573ffaa' - '806e42821252c148701c130cc82aebed4f9f678f3f89987638231e4015d51e84' - 'd4e37e72854edcba76b5464617bea3826e0495f9788340aa318d5f3cf29e87a2' + '023cba18580819018413608ec055d5ff8166b69525c32aa728ad1ecd7cf00aca' + 'dae799f09a076e0f573ea516bc357f56f2fd3aa8e35ec0cf54b6b62282960ee0' 'a9d0a94ff442453f0bec0b2e8afd591cf17b2845b6ae45ff300530114efd30af' 'cf884bad5caab9d5901b88b0ef41e3a39ea0b7a4614b8d14707d79941c899cbf' '3ed91fb5a7894f82fb4895e06d2e3f1df3ac4f82e46c970d4a85aaa4edc24cf1' diff --git a/linhes/linhes-system/lh_lighttpd.conf b/linhes/linhes-system/lh_lighttpd.conf index 90375b8..71709a2 100644 --- a/linhes/linhes-system/lh_lighttpd.conf +++ b/linhes/linhes-system/lh_lighttpd.conf @@ -83,6 +83,7 @@ mimetype.assign = ( ".jpg" => "image/jpeg", ".jpeg" => "image/jpeg", ".png" => "image/png", +".svg" => "image/svg+xml", ".xbm" => "image/x-xbitmap", ".xpm" => "image/x-xpixmap", ".xwd" => "image/x-xwindowdump", @@ -219,8 +220,11 @@ server.groupname = "http" #### fastcgi module ## read fastcgi.txt for more info ## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini -fastcgi.server = ( - ".php" => (( +$HTTP["url"] =~ "^/mythweb/" { + server.document-root = "/data/srv/httpd/mythweb" + alias.url += ( "/mythweb" => "/data/srv/httpd/mythweb/") + fastcgi.server = ( + "/mythweb/mythweb.php" => (( "bin-path" => "/usr/bin/php-cgi", "socket" => "/var/run/lighttpd/mythtv-php-fcgi.socket", "broken-scriptfilename" => "enable", @@ -239,6 +243,20 @@ fastcgi.server = ( "db_login" => "mythtv", "db_password" => "mythtv" ) +} + +$HTTP["url"] =~ "^/zabbix/" { + server.document-root = "/data/srv/httpd/zabbix" + alias.url += ( "/zabbix" => "/data/srv/httpd/zabbix/") + fastcgi.server = ( + ".php" => (( + "bin-path" => "/usr/bin/php-cgi", + "socket" => "/var/run/lighttpd/zabbix-php-fcgi.socket", + "broken-scriptfilename" => "enable", + )) + ) +} + #### CGI module cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "/usr/bin/perl", @@ -269,8 +287,6 @@ $HTTP["url"] =~ "^/cgi-bin" { ## the above is same as: #var.a=1 -alias.url += ( "/mythweb" => "/data/srv/httpd/mythweb/") - url.rewrite-once = ( "^/{1,2}mythweb/(css|data|images|js|themes|skins|[a-z_]+\.(php|pl)).*" => "$0", "^/{1,2}mythweb/(pl(/.*)?)$" => "/mythweb/mythweb.pl/$1", diff --git a/linhes/linhes-system/lh_php.ini b/linhes/linhes-system/lh_php.ini index 521f2f3..bea2eae 100644 --- a/linhes/linhes-system/lh_php.ini +++ b/linhes/linhes-system/lh_php.ini @@ -11,6 +11,26 @@ ; How many GET/POST/COOKIE input variables may be accepted max_input_vars = 6000 +; Maximum execution time of each script, in seconds +; https://php.net/max-execution-time +; Note: This directive is hardcoded to 0 for the CLI SAPI +max_execution_time = 300 + +; idea to limit this time on productions servers in order to eliminate unexpectedly +; long running scripts. +; Note: This directive is hardcoded to -1 for the CLI SAPI +; Default Value: -1 (Unlimited) +; Development Value: 60 (60 seconds) +; Production Value: 60 (60 seconds) +; https://php.net/max-input-time +max_input_time = 300 + +; Maximum size of POST data that PHP will accept. +; Its value may be 0 to disable the limit. It is ignored if POST data reading +; is disabled through enable_post_data_reading. +; https://php.net/post-max-size +post_max_size = 16M + ; This directive determines whether or not PHP will recognize code between ; tags as PHP source which should be processed as such. It is ; generally recommended that should be used and that this feature @@ -33,13 +53,12 @@ short_open_tag = On ; http://php.net/cgi.fix-pathinfo cgi.fix_pathinfo=1 +extension=bcmath.so extension=ftp.so extension=gd.so extension=gettext.so -extension=mcrypt.so -extension=mysql.so extension=mysqli.so -extension=openssl.so +;extension=openssl.so extension=pdo_mysql.so extension=sockets.so -extension=zip.so +;extension=zip.so -- cgit v0.12