opendev
/
puppet-openstackid
Code Issues Proposed changes

Update Configuration for Precise 

added conditional logic to support fastcgi apache 2.2 mod on Precise

Change-Id: Ice7a2f9d802fe4fa65589456eb376bafe85ba448
This commit is contained in:
Sebastian Marcet 2016-03-30 15:44:35 -03:00
parent a1c7cc4ed7
commit 6cb41de782
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/init.pp
View File

@ -241,7 +241,14 @@ class openstackid (
class { '::apache::mod::ssl': } class { '::apache::mod::ssl': }
class { '::apache::mod::rewrite': } class { '::apache::mod::rewrite': }
class { '::apache::mod::proxy': } class { '::apache::mod::proxy': }
::apache::mod { 'proxy_fcgi': }
if ($::lsbdistcodename == 'precise') {
class { '::apache::mod::fastcgi': }
class { '::apache::mod::actions': }
}
else {
::apache::mod { 'proxy_fcgi': }
}
if $ssl_cert_file_contents != '' { if $ssl_cert_file_contents != '' {
file { $ssl_cert_file: file { $ssl_cert_file:

19
templates/vhost.erb
View File

@ -42,9 +42,22 @@
Allow from all Allow from all
</Directory> </Directory>
<FilesMatch \.php$> <IfModule mod_proxy_fcgi.c>
SetHandler "proxy:fcgi://127.0.0.1:9000" <FilesMatch \.php$>
</FilesMatch> SetHandler "proxy:fcgi://127.0.0.1:9000"
</FilesMatch>
</IfModule>
<IfModule mod_fastcgi.c>
AddHandler php5-fcgi .php
Action php5-fcgi /php5-fcgi
Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
<Directory /usr/lib/cgi-bin>
Options ExecCGI FollowSymLinks
SetHandler fastcgi-script
Require all granted
</Directory>
</IfModule>
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>