CHANGELOG

@@ -1,3 +1,12 @@
+2012-08-24 Release 0.4.0
+Changes:
+- `include apache` is now required when using apache::mod::*
+
+Bugfixes:
+- Fix syntax for validate_re
+- Fix formatting in vhost template
+- Fix spec tests such that they pass
+
 2012-05-08 Puppet Labs <info@puppetlabs.com> - 0.0.4
 e62e362 Fix broken tests for ssl, vhost, vhost::*
 42c6363 Changes to match style guide and pass puppet-lint without error

Modulefile

@@ -1,5 +1,5 @@
 name 'puppetlabs-apache'
-version '0.3.0'
+version '0.4.0'
 source 'git://github.com/puppetlabs/puppetlabs-apache.git'
 author 'puppetlabs'
 license 'Apache 2.0'

manifests/mod.pp

@@ -1,28 +1,31 @@
 define apache::mod (
   $package = undef
 ) {
-  $module = $name
-  include apache
+  $mod = $name
+  include apache::params
+  #include apache #This creates duplicate resources in rspec-puppet
   $mod_packages = $apache::params::mod_packages
+  $mod_package = $mod_packages[$mod] # 2.6 compatibility hack
   if $package {
     $package_REAL = $package
-  } elsif $mod_packages[$module] {
-    $package_REAL = $mod_packages[$module]
+  } elsif "$mod_package" {
+    $package_REAL = $mod_package
   }
   $mod_libs = $apache::params::mod_libs
-  if $mod_libs {
-    $lib = $mod_libs[$module]
+  $mod_lib = $mod_libs[$mod] # 2.6 compatibility hack
+  if "${mod_lib}" {
+    $lib = $mod_lib
   }
 
   if $package_REAL {
     package { $package_REAL:
       ensure  => present,
       require => Package['httpd'],
-      before  => A2mod[$module],
+      before  => A2mod[$mod],
     }
   }
 
-  a2mod { $module:
+  a2mod { $mod:
     ensure  => present,
     lib     => $lib,
     require => Package['httpd'],

manifests/mod/python.pp

@@ -1,14 +1,6 @@
 class apache::mod::python {
-  include apache
-
-  package { 'mod_python_package':
-    ensure  => installed,
-    name    => $apache::params::mod_python_package,
-    require => Package['httpd'];
-  }
-
-  a2mod { 'python': ensure => present; }
-
+  #include apache
+  apache::mod { 'python': }
 }
 
 

manifests/params.pp

@@ -77,17 +77,8 @@
       'python' => 'libapache2-mod-python',
       'wsgi'   => 'libapache2-mod-wsgi',
     }
+    $mod_libs              = {}
   } else {
-    $user                  = 'www-data'
-    $group                 = 'www-data'
-    $apache_name           = 'apache2'
-    $php_package           = 'libapache2-mod-php5'
-    $mod_python_package    = 'libapache2-mod-python'
-    $mod_wsgi_package      = 'libapache2-mod-wsgi'
-    $mod_auth_kerb_package = 'libapache2-mod-auth-kerb'
-    $ssl_package           = 'apache-ssl'
-    $apache_dev            = 'apache-dev'
-    $vdir                  = '/etc/apache2/sites-enabled/'
-    $proxy_modules         = ['proxy', 'proxy_http']
+    fail("Class['apache::params']: Unsupported operatingsystem: $operatingsystem")
   }
 }

manifests/vhost.pp

@@ -57,7 +57,7 @@
     $ensure             = 'present'
   ) {
 
-  validate_re($ensure, [ '^present$', '^absent$' ],
+  validate_re($ensure, '^(present|absent)$',
   "${ensure} is not supported for ensure.
   Allowed values are 'present' and 'absent'.")
 

spec/classes/apache_spec.rb

@@ -1,24 +1,46 @@
 require 'spec_helper'
 
 describe 'apache', :type => :class do
-
-  it { should include_class("apache::params") }
-
-  it { should contain_package("httpd") }
-
-  it { should contain_service("httpd").with(
-    'ensure'    => 'running',
-    'enable'    => 'true',
-    'subscribe' => 'Package[httpd]'
-    )
-  }
-
-  it { should contain_file("httpd_vdir").with(
-    'ensure'  => 'directory',
-    'recurse' => 'true',
-    'purge'   => 'true',
-    'notify'  => 'Service[httpd]',
-    'require' => 'Package[httpd]'
-    )
-  }
+  context "On a Debian OS" do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_package("httpd") }
+    it { should contain_service("httpd").with(
+      'ensure'    => 'running',
+      'enable'    => 'true',
+      'subscribe' => 'Package[httpd]'
+      )
+    }
+    it { should contain_file("httpd_vdir").with(
+      'ensure'  => 'directory',
+      'recurse' => 'true',
+      'purge'   => 'true',
+      'notify'  => 'Service[httpd]',
+      'require' => 'Package[httpd]'
+      )
+    }
+  end
+  context "On a RedHat OS" do
+    let :facts do
+      { :osfamily => 'RedHat' }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_package("httpd") }
+    it { should contain_service("httpd").with(
+      'ensure'    => 'running',
+      'enable'    => 'true',
+      'subscribe' => 'Package[httpd]'
+      )
+    }
+    it { should contain_file("httpd_vdir").with(
+      'ensure'  => 'directory',
+      'recurse' => 'true',
+      'purge'   => 'true',
+      'notify'  => 'Service[httpd]',
+      'require' => 'Package[httpd]'
+      )
+    }
+  end
 end

spec/classes/dev_spec.rb

@@ -1,8 +1,24 @@
 require 'spec_helper'
 
 describe 'apache::dev', :type => :class do
-
-  it { should include_class("apache::params") }
-  it { should contain_package("apache_dev_package") }
-
+  context "On a Debian OS" do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+    it {
+      should include_class("apache::params")
+      should contain_package("libaprutil1-dev")
+      should contain_package("libapr1-dev")
+      should contain_package("apache2-prefork-dev")
+    }
+  end
+  context "On a RedHat OS" do
+    let :facts do
+      { :osfamily => 'RedHat' }
+    end
+    it {
+      should include_class("apache::params")
+      should contain_package("httpd-devel")
+    }
+  end
 end

spec/classes/mod/auth_kerb_spec.rb

@@ -1,17 +1,18 @@
 require 'spec_helper'
 
 describe 'apache::mod::auth_kerb', :type => :class do
-
-  it { should include_class("apache") }
-
-  it { should contain_package("mod_auth_kerb_package").with(
-   'require' => 'Package[httpd]'
-    )
-  }
-
-  it { should contain_a2mod("auth_kerb").with(
-   'ensure'  => 'present'
-    )
-  }
-
+  context "On a Debian OS" do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+    it { should include_class("apache") }
+    it { should contain_package("mod_auth_kerb_package").with(
+     'require' => 'Package[httpd]'
+      )
+    }
+    it { should contain_a2mod("auth_kerb").with(
+     'ensure'  => 'present'
+      )
+    }
+  end
 end

spec/classes/mod/python_spec.rb

@@ -1,18 +1,25 @@
 require 'spec_helper'
 
 describe 'apache::mod::python', :type => :class do
-
-  it { should include_class("apache") }
-
-  it { should contain_package("mod_python_package").with(
-   'ensure'  => 'installed',
-   'require' => 'Package[httpd]'
-    )
-  }
-
-  it { should contain_a2mod("python").with(
-   'ensure'  => 'present'
-    )
-  }
-
+  context "On a Debian OS" do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_package("libapache2-mod-python").with(
+     'ensure'  => 'present',
+     'require' => 'Package[httpd]'
+    ) }
+    it { should contain_a2mod("python") }
+  end
+  context "On a RedHat OS" do
+    let :facts do
+      { :osfamily => 'RedHat' }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_package("mod_python") }
+    it { should contain_a2mod("python").with(
+      'ensure' => 'present'
+    ) }
+  end
 end

spec/classes/mod/ssl_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'apache::mod::ssl', :type => :class do
+  describe 'when running on an unsupported OS' do
+    let(:facts) { {:operatingsystem => 'MagicUnicorn', :osfamily => 'Magic'} }
+    it { expect { should raise_error(Puppet::Error, "Unsupported operatingsystem:") } }
+  end
+
+  describe 'when running on redhat' do
+    let(:facts) { {:operatingsystem => 'redhat', :osfamily => 'redhat'} }
+    it { should include_class('apache::params') }
+    it { should contain_package('mod_ssl') }
+    it { should contain_a2mod('ssl') }
+  end
+
+  describe 'when running on debian' do
+    let(:facts) { {:operatingsystem => 'debian', :osfamily => 'debian'} }
+    it { should include_class('apache::params') }
+    it { should_not contain_package('libapache2-mod-ssl') }
+    it { should contain_a2mod('ssl') }
+  end
+end

spec/classes/mod/wsgi_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
 describe 'apache::mod::wsgi', :type => :class do
-
-  it { should include_class("apache") }
-
-  it { should contain_package("mod_wsgi_package").with(
-   'require' => 'Package[httpd]'
-    )
-  }
-
-  it { should contain_a2mod("wsgi").with(
-   'ensure'  => 'present'
-    )
-  }
-
+  context "On a Debian OS" do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+    it { should include_class("apache") }
+    it { should contain_package("mod_wsgi_package").with(
+     'require' => 'Package[httpd]'
+    ) }
+    it { should contain_a2mod("wsgi").with(
+     'ensure'  => 'present'
+      )
+    }
+  end
 end

spec/classes/params_spec.rb

@@ -1,13 +1,17 @@
 require 'spec_helper'
 
 describe 'apache::params', :type => :class do
+  context "On a Debian OS" do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+    it { should contain_apache__params }
 
-  it { should contain_apache__params }
-
-  # There are 4 resources in this class currently
-  # there should not be any more resources because it is a params class
-  # The resources are class[apache::params], class[main], class[settings], stage[main]
-  it "Should not contain any resources" do
-    subject.resources.size.should == 4
+    # There are 4 resources in this class currently
+    # there should not be any more resources because it is a params class
+    # The resources are class[apache::params], class[main], class[settings], stage[main]
+    it "Should not contain any resources" do
+      subject.resources.size.should == 4
+    end
   end
 end

spec/classes/php_spec.rb

@@ -1,8 +1,25 @@
 require 'spec_helper'
 
 describe 'apache::php', :type => :class do
+  context "On a Debian OS" do
+    let :facts do
+      { :osfamily => 'Debian' }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod("php5") }
+    it { should contain_package("libapache2-mod-php5") }
+  end
 
-  it { should include_class("apache::params") }
-  it { should contain_package("apache_php_package") }
+  context "On a RedHat OS" do
+    let :facts do
+      { :osfamily => 'RedHat' }
+    end
+    it { should include_class("apache::params") }
+    it { should contain_apache__mod("php5") }
+    it { should contain_package("php") }
+  end
 
+  context "On undefined OS" do
+    it { expect { should raise_error(Puppet::Error) } }
+  end
 end