Merge pull request #715 from hunner/php-allow-custom-ext

Add specs for #689
xbezdick · May 2, 2014 · ca03c51 · ca03c51
2 parents 82e3de9 + 8fb2dfd
commit ca03c51
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
@@ -2,10 +2,12 @@
   $package_name   = undef,
   $package_ensure = 'present',
   $path           = undef,
+  $extensions     = ['.php'],
 ) {
   if ! defined(Class['apache::mod::prefork']) {
     fail('apache::mod::php requires apache::mod::prefork; please enable mpm_module => \'prefork\' on Class[\'apache\']')
   }
+  validate_array($extensions)
   ::apache::mod { 'php5':
     package        => $package_name,
     package_ensure => $package_ensure,
@@ -16,6 +18,7 @@
   include ::apache::mod::dir
   Class['::apache::mod::mime'] -> Class['::apache::mod::dir'] -> Class['::apache::mod::php']
 
+  # Template uses $extensions
   file { 'php5.conf':
     ensure  => file,
     path    => "${::apache::mod_dir}/php5.conf",

diff --git a/spec/acceptance/mod_php_spec.rb b/spec/acceptance/mod_php_spec.rb
@@ -53,21 +53,23 @@ class { 'apache::mod::php': }
     end
   end
 
-  context "custom php admin_flag and php_admin_value" do
+  context "custom extensions, php_admin_flag, and php_admin_value" do
     it 'succeeds in puppeting php' do
       pp= <<-EOS
         class { 'apache':
           mpm_module => 'prefork',
         }
-        class { 'apache::mod::php': }
+        class { 'apache::mod::php':
+          extensions => ['.php','.php5'],
+        }
         apache::vhost { 'php.example.com':
           port             => '80',
           docroot          => '/var/www/php',
           php_admin_values => { 'open_basedir' => '/var/www/php/:/usr/share/pear/', },
           php_admin_flags  => { 'engine' => 'on', },
         }
         host { 'php.example.com': ip => '127.0.0.1', }
-        file { '/var/www/php/index.php':
+        file { '/var/www/php/index.php5':
           ensure  => file,
           content => "<?php phpinfo(); ?>\\n",
         }

diff --git a/spec/classes/mod/php_spec.rb b/spec/classes/mod/php_spec.rb
@@ -64,6 +64,14 @@
         :content => "LoadModule php5_module alternative-path\n"
       ) }
     end
+    context "with alternative extensions" do let :pre_condition do
+        'class { "apache": }'
+      end
+      let :params do
+        { :extensions => ['.php','.php5']}
+      end
+      it { should contain_file("php5.conf").with_content =~ /AddHandler php5-script .php .php5\n/ }
+    end
     context "with specific version" do
       let :pre_condition do
         'class { "apache": }'

diff --git a/templates/mod/php5.conf.erb b/templates/mod/php5.conf.erb
@@ -14,7 +14,7 @@
 #
 # Cause the PHP interpreter to handle files with a .php extension.
 #
-AddHandler php5-script .php
+AddHandler php5-script <%= @extensions.flatten.compact.join(' ') %>
 AddType text/html .php
 
 #