diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/frontend.pp b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/frontend.pp index 6f75e71..534901c 100644 --- a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/frontend.pp +++ b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/frontend.pp @@ -106,9 +106,9 @@ class plugin_zabbix::frontend { ensure => 'absent', } - # Create Zabbix TCP pool using 127.0.0.1, port 9000, upstream defaults + # Create Zabbix TCP pool using 127.0.0.1, port 9003 (default) phpfpm::pool { 'zabbix': - listen => '127.0.0.1:9000', + listen => sprintf('127.0.0.1:%s', $plugin_zabbix::params::zabbix_ports['fcgi']), require => Package[$plugin_zabbix::params::php_fpm_pkg], notify => Service[$plugin_zabbix::params::php_fpm_service], php_value => { diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp index b7519fa..d625e40 100644 --- a/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp +++ b/deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp @@ -30,6 +30,7 @@ class plugin_zabbix::params { server => '10051', agent => '10049', backend_agent => '10050', + fcgi => '9003', } case $::operatingsystem { diff --git a/deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_apache.conf.erb b/deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_apache.conf.erb index 42cf751..2c25ebd 100644 --- a/deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_apache.conf.erb +++ b/deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_apache.conf.erb @@ -9,7 +9,7 @@ AddHandler fastcgi-php5-fpm .php php phar Action fastcgi-php5-fpm /fastcgi-php5-fpm virtual Alias /fastcgi-php5-fpm <%= scope.lookupvar('plugin_zabbix::params::zabbix_document_root') %>/fastcgi-php5-fpm - FastCgiExternalServer <%= scope.lookupvar('plugin_zabbix::params::zabbix_document_root') %>/fastcgi-php5-fpm -host 127.0.0.1:9000 -idle-timeout 900 -pass-header Authorization -pass-header Range + FastCgiExternalServer <%= scope.lookupvar('plugin_zabbix::params::zabbix_document_root') %>/fastcgi-php5-fpm -host 127.0.0.1:<%= scope.lookupvar('plugin_zabbix::params::zabbix_ports')['fcgi'] %> -idle-timeout 900 -pass-header Authorization -pass-header Range ">