x/fuel-plugin-external-zabbix
Code Issues Proposed changes

Fix port conflict between php-fpm and radosgw

Browse Source 
Closes-Bug: #1570830

Change-Id: I24c258ef853a11e47b2093275844988851f1f867
This commit is contained in:
Olivier Bourdon 2016-04-15 14:19:03 +02:00
parent eb5522c315
commit 1bb70eaed0
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment_scripts/puppet/modules/plugin_zabbix/manifests/frontend.pp
View File

@ -106,9 +106,9 @@ class plugin_zabbix::frontend {
ensure => 'absent', 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': 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], require => Package[$plugin_zabbix::params::php_fpm_pkg],
notify => Service[$plugin_zabbix::params::php_fpm_service], notify => Service[$plugin_zabbix::params::php_fpm_service],
php_value => { php_value => {

1
deployment_scripts/puppet/modules/plugin_zabbix/manifests/params.pp
View File

@ -30,6 +30,7 @@ class plugin_zabbix::params {
server => '10051', server => '10051',
agent => '10049', agent => '10049',
backend_agent => '10050', backend_agent => '10050',
fcgi => '9003',
} }
case $::operatingsystem { case $::operatingsystem {

2
deployment_scripts/puppet/modules/plugin_zabbix/templates/zabbix_apache.conf.erb
View File

@ -9,7 +9,7 @@
AddHandler fastcgi-php5-fpm .php php phar AddHandler fastcgi-php5-fpm .php php phar
Action fastcgi-php5-fpm /fastcgi-php5-fpm virtual Action fastcgi-php5-fpm /fastcgi-php5-fpm virtual
Alias /fastcgi-php5-fpm <%= scope.lookupvar('plugin_zabbix::params::zabbix_document_root') %>/fastcgi-php5-fpm 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
</IfModule> </IfModule>
<Directory "<%= scope.lookupvar('plugin_zabbix::params::zabbix_document_root') %>"> <Directory "<%= scope.lookupvar('plugin_zabbix::params::zabbix_document_root') %>">