Showing
5 changed files
with
16 additions
and
7 deletions
| @@ -24,6 +24,12 @@ Ubuntu 14.04 | @@ -24,6 +24,12 @@ Ubuntu 14.04 | ||
| 24 | <td><tt>''</tt></td> | 24 | <td><tt>''</tt></td> |
| 25 | </tr> | 25 | </tr> |
| 26 | <tr> | 26 | <tr> |
| 27 | + <td><tt>['cfe-nginx-php-fpm']['php-fpm']['exts']</tt></td> | ||
| 28 | + <td>Array</td> | ||
| 29 | + <td>PHP extension packages to be installed. Without the "php5-" or "php-" prefix.</td> | ||
| 30 | + <td><tt>['mysqlnd', 'cli', 'curl']</tt></td> | ||
| 31 | + </tr> | ||
| 32 | + <tr> | ||
| 27 | <td><tt>['cfe-nginx-php-fpm']['openssl']['dh_modulus']</tt></td> | 33 | <td><tt>['cfe-nginx-php-fpm']['openssl']['dh_modulus']</tt></td> |
| 28 | <td>Integer</td> | 34 | <td>Integer</td> |
| 29 | <td>Used if at least one virtual site uses TLS.</td> | 35 | <td>Used if at least one virtual site uses TLS.</td> |
| @@ -26,6 +26,9 @@ default['cfe-nginx-php-fpm']['postfix']['email_domain'] = 'example.com' | @@ -26,6 +26,9 @@ default['cfe-nginx-php-fpm']['postfix']['email_domain'] = 'example.com' | ||
| 26 | # If your php-fpm pool is not named 'www', then delete | 26 | # If your php-fpm pool is not named 'www', then delete |
| 27 | # the default one ('www'), which is automatically installed by php-fpm | 27 | # the default one ('www'), which is automatically installed by php-fpm |
| 28 | default['cfe-nginx-php-fpm']['php-fpm']['delete_pool_www'] = true | 28 | default['cfe-nginx-php-fpm']['php-fpm']['delete_pool_www'] = true |
| 29 | +default['cfe-nginx-php-fpm']['php-fpm']['exts'] = [ | ||
| 30 | + 'mysqlnd', 'cli', 'curl' | ||
| 31 | +] | ||
| 29 | 32 | ||
| 30 | default['cfe-nginx-php-fpm']['openssl']['dh_modulus'] = 4096 | 33 | default['cfe-nginx-php-fpm']['openssl']['dh_modulus'] = 4096 |
| 31 | 34 |
| @@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com' | @@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com' | ||
| 4 | license 'Apache License' | 4 | license 'Apache License' |
| 5 | description 'Simplifies setup of Nginx+PHP-FPM in Chromedia.' | 5 | description 'Simplifies setup of Nginx+PHP-FPM in Chromedia.' |
| 6 | long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) | 6 | long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) |
| 7 | -version '0.3.5' | 7 | +version '0.3.6' |
| 8 | 8 | ||
| 9 | { | 9 | { |
| 10 | 'openssl' => '4.4.0', | 10 | 'openssl' => '4.4.0', |
| @@ -83,9 +83,5 @@ if node['cfe-nginx-php-fpm']['php-fpm']['delete_pool_www'] | @@ -83,9 +83,5 @@ if node['cfe-nginx-php-fpm']['php-fpm']['delete_pool_www'] | ||
| 83 | end | 83 | end |
| 84 | end | 84 | end |
| 85 | 85 | ||
| 86 | -# Some default PHP extensions | ||
| 87 | -php_ext 'mysql' | ||
| 88 | -php_ext 'cli' | ||
| 89 | -php_ext 'curl' do | ||
| 90 | - action :upgrade | ||
| 91 | -end | 86 | +# Install PHP extensions |
| 87 | +node['cfe-nginx-php-fpm']['php-fpm']['exts'].each { |ext| php_ext ext } |