Merge pull request #591 from typhonius/mod_actions

Added in mod_actions to the repo so it may be used.

Author: igalic

README.md

@@ -413,6 +413,7 @@ Used to enable arbitrary Apache HTTPD modules for which there is no specific `ap
 
 There are many `apache::mod::[name]` classes within this module that can be declared using `include`:
 
+* `actions`
 * `alias`
 * `auth_basic`
 * `auth_kerb`

manifests/default_mods.pp

@@ -21,12 +21,12 @@
         include ::apache::mod::reqtimeout
       }
       'redhat': {
+        include ::apache::mod::actions
         include ::apache::mod::cache
         include ::apache::mod::mime
         include ::apache::mod::mime_magic
         include ::apache::mod::vhost_alias
         include ::apache::mod::rewrite
-        ::apache::mod { 'actions': }
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_anon': }
         ::apache::mod { 'authn_dbm': }
@@ -55,6 +55,7 @@
         }
       }
       'freebsd': {
+        include ::apache::mod::actions
         include ::apache::mod::cache
         include ::apache::mod::disk_cache
         include ::apache::mod::headers
@@ -65,7 +66,6 @@
         include ::apache::mod::userdir
         include ::apache::mod::vhost_alias
 
-        ::apache::mod { 'actions': }
         ::apache::mod { 'asis': }
         ::apache::mod { 'auth_digest': }
         ::apache::mod { 'authn_alias': }

manifests/mod/actions.pp

@@ -0,0 +1,3 @@
+class apache::mod::actions {
+  apache::mod { 'actions': }
+}

manifests/vhost.pp

@@ -169,6 +169,7 @@
     $wsgi_script_aliases         = undef,
     $custom_fragment             = undef,
     $itk                         = undef,
+    $action                      = undef,
     $fastcgi_server              = undef,
     $fastcgi_socket              = undef,
     $fastcgi_dir                 = undef,

spec/acceptance/vhost_spec.rb

@@ -682,6 +682,25 @@ class { 'apache': service_ensure => stopped, }
     end
   end
 
+  describe 'actions' do
+    it 'applies cleanly' do
+      pp = <<-EOS
+        class { 'apache': }
+        host { 'test.server': ip => '127.0.0.1' }
+        apache::vhost { 'test.server':
+          docroot          => '/tmp',
+	  action => 'php-fastcgi',
+        }
+      EOS
+      apply_manifest(pp, :catch_failures => true)
+    end
+
+    describe file("#{$vhost_dir}/25-test.server.conf") do
+      it { should be_file }
+      it { should contain 'Action php-fastcgi /cgi-bin virtual' }
+    end
+  end
+
   describe 'suphp' do
     it 'applies cleanly' do
       pp = <<-EOS

spec/defines/vhost_spec.rb

@@ -269,7 +269,7 @@
           :attr  => 'scriptalias',
           :value => '/usr/scripts',
           :match => [
-            /^  ScriptAlias \/cgi-bin\/ "\/usr\/scripts"$/,
+            /^  ScriptAlias \/cgi-bin "\/usr\/scripts"$/,
           ],
         },
         {
@@ -1179,6 +1179,17 @@
         end
       end
 
+      describe 'when action is specified specified' do
+        let :params do default_params.merge({
+          :action => 'php-fastcgi',
+        }) end
+        it 'should set Action' do
+          should contain_file("25-#{title}.conf").with_content(
+            /^  Action php-fastcgi \/cgi-bin virtual$/
+          )
+        end
+      end
+
       describe 'when suphp_engine is on and suphp_configpath is specified' do
         let :params do default_params.merge({
           :suphp_engine     => 'on',

templates/vhost.conf.erb

@@ -44,6 +44,7 @@
 <% elsif @access_log -%>
   CustomLog "<%= @access_log_destination %>" <%= @_access_log_format %>
 <% end -%>
+<%= scope.function_template(['apache/vhost/_action.erb']) -%>
 <%= scope.function_template(['apache/vhost/_block.erb']) -%>
 <%= scope.function_template(['apache/vhost/_error_document.erb']) -%>
 <%= scope.function_template(['apache/vhost/_proxy.erb']) -%>

templates/vhost/_action.erb

@@ -0,0 +1,4 @@
+<% if @action -%>
+
+  Action <%= @action %> /cgi-bin virtual
+<% end -%>

templates/vhost/_scriptalias.erb

@@ -10,7 +10,7 @@
   ## Script alias directives
 <%# Combine scriptalais and scriptaliases into a single data structure -%>
 <%# for backward compatibility and ease of implementation -%>
-<%- aliases << { 'alias' => '/cgi-bin/', 'path' => @scriptalias } if @scriptalias -%>
+<%- aliases << { 'alias' => '/cgi-bin', 'path' => @scriptalias } if @scriptalias -%>
 <%- aliases.flatten.compact! -%>
 <%- aliases.each do |salias| -%>
   <%- if salias["path"] != '' -%>