Merge pull request #481 from igalic/php_admin

Support php_admin_(flag|value)s
puppetlabs · Dec 13, 2013 · 498d36e · 498d36e
2 parents aa6d93a + c02259f
commit 498d36e
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -780,6 +780,10 @@ This directive must be used with `suphp_engine => on` in the vhost declaration.
     }
 ```
 
+######`php_admin_value` and `php_admin_flag`
+
+Allows per-vhost (and per-directory) setting [`php_admin_value`s or `php_admin_flag`s](http://php.net/manual/en/configuration.changes.php). These flags or values cannot be overwritten by a user, or an application.
+
 ######`custom_fragment`
 
 Pass a string of custom configuration directives to be placed at the end of the

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -141,6 +141,8 @@
     $suphp_addhandler            = $apache::params::suphp_addhandler,
     $suphp_engine                = $apache::params::suphp_engine,
     $suphp_configpath            = $apache::params::suphp_configpath,
+    $php_admin_flags             = [],
+    $php_admin_values            = [],
     $no_proxy_uris               = [],
     $redirect_source             = '/',
     $redirect_dest               = undef,
@@ -426,6 +428,8 @@
   #   - $block
   # directories fragment:
   #   - $passenger_enabled
+  #   - $php_admin_flags
+  #   - $php_admin_values
   #   - $directories (a list of key-value hashes is expected)
   # fastcgi fragment:
   #   - $fastcgi_server

diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
@@ -536,6 +536,42 @@
           :value => 'on',
           :match => [/^  suPHP_Engine on$/],
         },
+        {
+          :title => 'should accept a php_admin_flags',
+          :attr  => 'php_admin_flags',
+          :value => { 'php_engine' => 'on' },
+          :match => [/^  php_admin_flag php_engine on$/],
+        },
+        {
+          :title => 'should accept php_admin_values',
+          :attr  => 'php_admin_values',
+          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
+          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
+        },
+        {
+          :title => 'should accept php_admin_flags in directories',
+          :attr  => 'directories',
+          :value => {
+						'path'            => '/srv/www',
+						'php_admin_flags' => { 'php_engine' => 'on' }
+					},
+          :match => [/^    php_admin_flag php_engine on$/],
+        },
+        {
+          :title => 'should accept php_admin_values',
+          :attr  => 'php_admin_values',
+          :value => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' },
+          :match => [/^  php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
+        },
+        {
+          :title => 'should accept php_admin_values in directories',
+          :attr  => 'directories',
+          :value => {
+            'path'             => '/srv/www',
+            'php_admin_values' => { 'open_basedir' => '/srv/web/www.com/:/usr/share/pear/' }
+          },
+          :match => [/^    php_admin_value open_basedir \/srv\/web\/www.com\/:\/usr\/share\/pear\/$/],
+        },
         {
           :title => 'should accept a wsgi script alias',
           :attr  => 'wsgi_script_aliases',

diff --git a/templates/vhost.conf.erb b/templates/vhost.conf.erb
@@ -53,6 +53,7 @@
 <%= scope.function_template(['apache/vhost/_setenv.erb']) -%>
 <%= scope.function_template(['apache/vhost/_ssl.erb']) -%>
 <%= scope.function_template(['apache/vhost/_suphp.erb']) -%>
+<%= scope.function_template(['apache/vhost/_php_admin.erb']) -%>
 <%= scope.function_template(['apache/vhost/_requestheader.erb']) -%>
 <%= scope.function_template(['apache/vhost/_wsgi.erb']) -%>
 <%= scope.function_template(['apache/vhost/_custom_fragment.erb']) -%>

diff --git a/templates/vhost/_directories.erb b/templates/vhost/_directories.erb
@@ -53,6 +53,17 @@
     <%- if directory['passenger_enabled'] and directory['passenger_enabled'] != '' -%>
     PassengerEnabled <%= directory['passenger_enabled'] %>
     <%- end -%>
+    <%- if directory['php_admin_flags'] and ! directory['php_admin_flags'].empty? -%>
+      <%- directory['php_admin_flags'].each do |flag,value| -%>
+      <%- value = if value =~ /true|yes|on|1/i then 'on' else 'off' end -%>
+    php_admin_flag <%= "#{flag} #{value}" %>
+      <%- end -%>
+    <%- end -%>
+    <%- if directory['php_admin_values'] and ! directory['php_admin_values'].empty? -%>
+      <%- directory['php_admin_values'].each do |key,value| -%>
+    php_admin_value <%= "#{key} #{value}" %>
+      <%- end -%>
+    <%- end -%>
     <%- if directory['directoryindex'] and directory['directoryindex'] != '' -%>
     DirectoryIndex <%= directory['directoryindex'] %>
     <%- end -%>

diff --git a/templates/vhost/_php_admin.erb b/templates/vhost/_php_admin.erb
@@ -0,0 +1,12 @@
+<% if @php_admin_values and not @php_admin_values.empty? -%>
+<% @php_admin_values.each do |key,value| -%>
+  php_admin_value <%= key %> <%= value %>
+<% end -%>
+<% end -%>
+<% if @php_admin_flags and not @php_admin_flags.empty? -%>
+<% @php_admin_flags.each do |key,flag| -%>
+<%# normalize flag -%>
+<% if flag =~ /true|yes|on|1/i then flag = 'on' else flag = 'off' end -%>
+  php_admin_flag <%= key %> <%= flag %>
+<% end -%>
+<% end -%>