Update Configuration for Precise
added conditional logic to support fastcgi apache 2.2 mod on Precise Change-Id: Ice7a2f9d802fe4fa65589456eb376bafe85ba448
This commit is contained in:
parent
a1c7cc4ed7
commit
6cb41de782
@ -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': }
|
||||||
|
|
||||||
|
if ($::lsbdistcodename == 'precise') {
|
||||||
|
class { '::apache::mod::fastcgi': }
|
||||||
|
class { '::apache::mod::actions': }
|
||||||
|
}
|
||||||
|
else {
|
||||||
::apache::mod { 'proxy_fcgi': }
|
::apache::mod { 'proxy_fcgi': }
|
||||||
|
}
|
||||||
|
|
||||||
if $ssl_cert_file_contents != '' {
|
if $ssl_cert_file_contents != '' {
|
||||||
file { $ssl_cert_file:
|
file { $ssl_cert_file:
|
||||||
|
@ -42,9 +42,22 @@
|
|||||||
Allow from all
|
Allow from all
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
|
<IfModule mod_proxy_fcgi.c>
|
||||||
<FilesMatch \.php$>
|
<FilesMatch \.php$>
|
||||||
SetHandler "proxy:fcgi://127.0.0.1:9000"
|
SetHandler "proxy:fcgi://127.0.0.1:9000"
|
||||||
</FilesMatch>
|
</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>
|
||||||
|
Loading…
Reference in New Issue
Block a user