diff -urN smeserver-zabbix-server-0.1.old/createlinks smeserver-zabbix-server-0.1/createlinks --- smeserver-zabbix-server-0.1.old/createlinks 2020-12-04 18:37:16.201582185 +0000 +++ smeserver-zabbix-server-0.1/createlinks 2020-12-07 11:21:06.077132534 +0000 @@ -30,8 +30,27 @@ # Bash header safe_symlink("/etc/e-smith/templates-default/template-begin-shell", "root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/template-begin"); -# Start and stop links -service_link_enhanced("zabbix-server", "S99", "7"); -service_link_enhanced("zabbix-server", "K10", "6"); -service_link_enhanced("zabbix-server", "K10", "0"); +# Start and stop links - sysV +#service_link_enhanced("zabbix-server", "S99", "7"); +#service_link_enhanced("zabbix-server", "K10", "6"); +#service_link_enhanced("zabbix-server", "K10", "0"); + +#Systemd start stop +# rpm update action (invoked by yum on install and update +$contrib = "smeserver-zabbix-server"; +event_actions("$contrib-update", qw( + systemd-default 10 +)); + +event_templates("$contrib-update", qw( + /etc/httpd/conf/httpd.conf + /etc/crontab + /etc/systemd/system-preset/49-koozali.preset + +)); + +event_services("$contrib-update", qw( + httpd-e-smith sigusr1 + php-fpm reload +)); diff -urN smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/smeserver-zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/smeserver-zabbix-server --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/smeserver-zabbix-server 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/smeserver-zabbix-server 2020-12-07 11:25:41.447841355 +0000 @@ -0,0 +1,3 @@ +systemctl daemon-reload +systemsctl preset-all +systemsctl restart zabbix-server diff -urN smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/zabbix-server smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/events/actions/zabbix-server 2020-12-04 18:37:16.201582185 +0000 +++ smeserver-zabbix-server-0.1/root/etc/e-smith/events/actions/zabbix-server 2020-12-07 11:15:14.182670946 +0000 @@ -1,7 +1,7 @@ #!/bin/bash # restart mysql.init -/sbin/service zabbix-server stop 1>/dev/null -/sbin/service mysql.init restart 1>/dev/null -/sbin/service zabbix-server start 1>/dev/null +/usr/bin/systemctl stop zabbix-server 1>/dev/null +/usr/bin/systemctl restart mysql.init 1>/dev/null +/usr/bin/systemctl start zabbix-server 1>/dev/null exit 0 diff -urN smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web --- smeserver-zabbix-server-0.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 2020-12-04 18:37:16.202582195 +0000 +++ smeserver-zabbix-server-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 2020-12-07 12:59:47.180308044 +0000 @@ -18,13 +18,18 @@ SSLRequireSSL on Options FollowSymLinks - AddType application/x-httpd-php .php - php_admin_value max_execution_time 600 - php_admin_value max_input_time 600 - php_admin_value memory_limit 256M - php_admin_value date.timezone $tz - php_admin_value post_max_size 32M - php_admin_value always_populate_raw_post_data -1 + + + SetHandler "proxy:unix:/var/run/php-fpm/php$version.sock|fcgi://localhost" + + + #AddType application/x-httpd-php .php + #php_admin_value max_execution_time 600 + #php_admin_value max_input_time 600 + #php_admin_value memory_limit 256M + #php_admin_value date.timezone $tz + #php_admin_value post_max_size 32M + #php_admin_value always_populate_raw_post_data -1 AllowOverride None Order allow,deny Allow from $access diff -urN smeserver-zabbix-server-0.1.old/root/usr/share/zabbix/.user.ini smeserver-zabbix-server-0.1/root/usr/share/zabbix/.user.ini --- smeserver-zabbix-server-0.1.old/root/usr/share/zabbix/.user.ini 1970-01-01 01:00:00.000000000 +0100 +++ smeserver-zabbix-server-0.1/root/usr/share/zabbix/.user.ini 2020-12-07 11:39:40.120200294 +0000 @@ -0,0 +1,6 @@ +max_execution_time=600 +max_input_time=600 +memory_limit=256M +date.timezone=$tz +post_max_size=32M +always_populate_raw_post_data=-1