Upgrade apache module to 0.10.0 and mysql module to 2.1.0.

Author: brucem

CHANGELOG

@@ -32,3 +32,7 @@
 2013-10-20 release 0.2.0
 - Update mysql module to 2.0.0
 - Update ezpublish::database_server parameters to match mysql::server
+2013-12-08 release 0.3.0
+- Upgrade apache module to 0.10.0 
+- Upgrade mysql module to 2.1.0
+- Update ezpublish::vhost to match apache::vhost

Modulefile

@@ -1,11 +1,11 @@
 name 'brucem-ezpublish'
-version '0.2.0'
+version '0.3.0'
 source 'git://github.com/brucem/puppet-ezpublish.git'
 author 'Bruce Morrison'
 license 'Apache 2.0'
 summary 'eZ Publish Module'
 description 'eZ Publish Module'
 project_page 'http://github.com/brucem/puppet-ezpublish'
-dependency 'puppetlabs/mysql',  '2.0.0'
-dependency 'puppetlabs/apache', '0.9.0'
+dependency 'puppetlabs/mysql',  '2.1.0'
+dependency 'puppetlabs/apache', '0.10.0'
 dependency 'example42/php', '2.0.11'

Puppetfile

@@ -1,5 +1,5 @@
 forge 'http://forge.puppetlabs.com'
 
-mod 'puppetlabs/mysql', '2.0.0'
-mod 'puppetlabs/apache', '0.9.0'
+mod 'puppetlabs/mysql', '2.1.0'
+mod 'puppetlabs/apache', '0.10.0'
 mod 'example42/php', '2.0.11'

manifests/default.pp

@@ -13,7 +13,7 @@
 
   require ezpublish
 
-  ezpublish::vhost{ 'default':
+  ezpublish::vhost{ 'ez_default':
     ensure            => present,
     install_dir       => $install_dir,
     port              => 80,

manifests/vhost.pp

@@ -51,14 +51,25 @@
   $ssl_crl_path                = $apache::default_ssl_crl_path,
   $ssl_crl                     = $apache::default_ssl_crl,
   $ssl_certs_dir               = $apache::params::ssl_certs_dir,
+  $ssl_protocol                = undef,
+  $ssl_cipher                  = undef,
+  $ssl_honorcipherorder        = undef,
+  $ssl_verify_client           = undef,
+  $ssl_verify_depth            = undef,
+  $ssl_options                 = undef,
+  $ssl_proxyengine             = false,
   $priority                    = undef,
   $default_vhost               = false,
   $servername                  = $name,
   $serveraliases               = [],
   $options                     = ['FollowSymLinks'],
+  $index_options               = [],
+  $index_order_default         = [],
   $override                    = ['None'],
+  $directoryindex              = '',
   $vhost_name                  = '*',
   $logroot                     = $apache::logroot,
+  $log_level                   = undef,
   $access_log                  = true,
   $access_log_file             = undef,
   $access_log_pipe             = undef,
@@ -70,10 +81,12 @@
   $error_log_file              = undef,
   $error_log_pipe              = undef,
   $error_log_syslog            = undef,
+  $error_documents             = [],
+  $fallbackresource            = undef,
   $scriptalias                 = undef,
+  $scriptaliases               = [],
   $proxy_dest                  = undef,
   $proxy_pass                  = undef,
-  $sslproxyengine              = false,
   $suphp_addhandler            = $apache::params::suphp_addhandler,
   $suphp_engine                = $apache::params::suphp_engine,
   $suphp_configpath            = $apache::params::suphp_configpath,
@@ -95,8 +108,11 @@
   $wsgi_script_aliases         = undef,
   $custom_fragment             = undef,
   $itk                         = undef,
+  $fastcgi_server              = undef,
+  $fastcgi_socket              = undef,
+  $fastcgi_dir                 = undef,
+  $additional_includes         = [],
   $ezp_major_version           = $ezpublish::params::default_ezp_major_version,
-  $ensure                      = 'present'
 )
 {
 
@@ -138,12 +154,22 @@
     ssl_crl_path                => $ssl_crl_path,
     ssl_crl                     => $ssl_crl,
     ssl_certs_dir               => $ssl_certs_dir,
+    ssl_protocol                => $ssl_protocol,
+    ssl_cipher                  => $ssl_cipher,
+    ssl_honorcipherorder        => $ssl_honorcipherorder,
+    ssl_verify_client           => $ssl_verify_client,
+    ssl_verify_depth            => $ssl_verify_depth,
+    ssl_options                 => $ssl_options,
+    ssl_proxyengine             => $ssl_proxyengine,
     priority                    => $priority,
     default_vhost               => $default_vhost,
     servername                  => $servername,
     serveraliases               => $serveraliases,
     options                     => $options,
+    index_options               => $index_options,
+    index_order_default         => $index_order_default,
     override                    => $override,
+    directoryindex              => $directoryindex,
     vhost_name                  => $vhost_name,
     logroot                     => $logroot,
     access_log                  => $access_log,
@@ -157,10 +183,12 @@
     error_log_file              => $error_log_file,
     error_log_pipe              => $error_log_pipe,
     error_log_syslog            => $error_log_syslog,
+    error_documents             => $error_documents,
+    fallbackresource            => $fallbackresource,
     scriptalias                 => $scriptalias,
+    scriptaliases               => $scriptaliases,
     proxy_dest                  => $proxy_dest,
     proxy_pass                  => $proxy_pass,
-    sslproxyengine              => $sslproxyengine,
     suphp_addhandler            => $suphp_addhandler,
     suphp_engine                => $suphp_engine,
     suphp_configpath            => $suphp_configpath,
@@ -180,5 +208,10 @@
     wsgi_process_group          => $wsgi_process_group,
     wsgi_script_aliases         => $wsgi_script_aliases,
     custom_fragment             => $ez_custom_fragment,
+    itk                         => $itk,
+    fastcgi_server              => $fastcgi_server,
+    fastcgi_socket              => $fastcgi_socket,
+    fastcgi_dir                 => $fastcgi_dir,
+    additional_includes         => $additional_includes,
   }
 }

spec/classes/ezpublish_database_server_spec.rb

@@ -8,6 +8,6 @@
                 :concat_basedir         => '/dne',
            }
        end
-       it { should include_class("mysql::server") }
+       it { should contain_class("mysql::server") }
    end
 end

spec/classes/ezpublish_default_spec.rb

@@ -8,7 +8,7 @@
                 :concat_basedir         => '/dne',
             }
         end
-        it { should include_class("ezpublish") }
-        it { should contain_ezpublish__vhost("default") }
+        it { should contain_class("ezpublish") }
+        it { should contain_ezpublish__vhost("ez_default") }
     end
 end

spec/classes/ezpublish_spec.rb

@@ -8,9 +8,9 @@
                 :concat_basedir         => '/dne',
            }
        end
-       it { should include_class("apache") }
-       it { should include_class("mysql::client") }
-       it { should include_class("php") }
+       it { should contain_class("apache") }
+       it { should contain_class("mysql::client") }
+       it { should contain_class("php") }
 
        ['mysql', 'gd', 'mcrypt', 'imagick', 'curl', 'xsl', 'intl'].each do |phpmodulename|
          it { should contain_php__module(phpmodulename) }

spec/classes/ezpublish_standalone_spec.rb

@@ -8,8 +8,8 @@
                 :concat_basedir         => '/dne',
            }
        end
-       it { should include_class("ezpublish") }
-       it { should include_class("ezpublish::database_server") }
+       it { should contain_class("ezpublish") }
+       it { should contain_class("ezpublish::database_server") }
 
    end
 end