Merge remote-tracking branch 'puppetlabs/1.0.x'

CHANGELOG.md

@@ -1,14 +1,51 @@
+## 2014-03-04 Supported Release 1.0.1
+###Summary
+
+This is a supported release.  This release removes a testing symlink that can
+cause trouble on systems where /var is on a seperate filesystem from the
+modulepath.
+
+####Features
+####Bugfixes
+####Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
+## 2014-03-04 Supported Release 1.0.0
+###Summary
+
+This is a supported release. This release introduces Apache 2.4 support for
+Debian and RHEL based osfamilies.
+
+####Features
+
+- Add apache24 support
+- Add rewrite_base functionality to rewrites
+- Updated README documentation
+- Add WSGIApplicationGroup and WSGIImportScript directives
+
+####Bugfixes
+
+- Replace mutating hashes with merge() for Puppet 3.5
+- Fix WSGI import_script and mod_ssl issues on Lucid
+
+####Known Bugs
+* By default, the version of Apache that ships with Ubuntu 10.04 does not work with `wsgi_import_script`.
+* SLES is unsupported.
+
+---
+
 ## 2014-01-31 Release 0.11.0
 ### Summary:
 
 This release adds preliminary support for Windows compatibility and multiple rewrite support.
 
-### Backwards-incompatible Changes:
+#### Backwards-incompatible Changes:
 
 - The rewrite_rule parameter is deprecated in favor of the new rewrite parameter
   and will be removed in a future release.
 
-### Features:
+#### Features:
 
 - add Match directive
 - quote paths for windows compatibility
@@ -25,7 +62,7 @@ This release adds preliminary support for Windows compatibility and multiple rew
 - Convert spec tests to beaker.
 - Support php_admin_(flag|value)s
 
-### Bugfixes:
+#### Bugfixes:
 
 - directories are either a Hash or an Array of Hashes
 - Configure Passenger in separate .conf file on RH so PassengerRoot isn't lost
@@ -40,7 +77,7 @@ This release adds preliminary support for Windows compatibility and multiple rew
 
 This release adds FreeBSD osfamily support and various other improvements to some mods.
 
-### Features:
+#### Features:
 
 - Add suPHP_UserGroup directive to directory context
 - Add support for ScriptAliasMatch directives
@@ -68,7 +105,7 @@ This release adds FreeBSD osfamily support and various other improvements to som
 - Add documentation about $ip
 - Add ability to pass ip (instead of wildcard) in default vhost files
 
-### Bugfixes:
+#### Bugfixes:
 
 - Don't listen on port or set NameVirtualHost for non-existent vhost
 - only apply Directory defaults when provider is a directory
@@ -80,15 +117,15 @@ This release adds more parameters to the base apache class and apache defined
 resource to make the module more flexible. It also adds or enhances SuPHP,
 WSGI, and Passenger mod support, and support for the ITK mpm module.
 
-### Backwards-incompatible Changes:
+#### Backwards-incompatible Changes:
 - Remove many default mods that are not normally needed.
 - Remove `rewrite_base` `apache::vhost` parameter; did not work anyway.
 - Specify dependencies on stdlib >=2.4.0 (this was already the case, but
 making explicit)
 - Deprecate `a2mod` in favor of the `apache::mod::*` classes and `apache::mod`
 defined resource.
 
-### Features:
+#### Features:
 - `apache` class
   - Add `httpd_dir` parameter to change the location of the configuration
   files.
@@ -123,7 +160,7 @@ dependency chaining of `Class['apache'] -> <resource> ~>
 Class['apache::service']`
 - Added `apache::mod::proxy_balancer` class for `apache::balancer`
 
-### Bugfixes:
+#### Bugfixes:
 - Change dependency to puppetlabs-concat
 - Fix ruby 1.9 bug for `a2mod`
 - Change servername to be `$::hostname` if there is no `$::fqdn`
@@ -133,31 +170,31 @@ Class['apache::service']`
 array.
 
 ## 2013-07-26 Release 0.8.1
-### Bugfixes:
+#### Bugfixes:
 - Update `apache::mpm_module` detection for worker/prefork
 - Update `apache::mod::cgi` and `apache::mod::cgid` detection for
 worker/prefork
 
 ## 2013-07-16 Release 0.8.0
-### Features:
+#### Features:
 - Add `servername` parameter to `apache` class
 - Add `proxy_set` parameter to `apache::balancer` define
 
-### Bugfixes:
+#### Bugfixes:
 - Fix ordering for multiple `apache::balancer` clusters
 - Fix symlinking for sites-available on Debian-based OSs
 - Fix dependency ordering for recursive confdir management
 - Fix `apache::mod::*` to notify the service on config change
 - Documentation updates
 
 ## 2013-07-09 Release 0.7.0
-### Changes:
+#### Changes:
 - Essentially rewrite the module -- too many to list
 - `apache::vhost` has many abilities -- see README.md for details
 - `apache::mod::*` classes provide httpd mod-loading capabilities
 - `apache` base class is much more configurable
 
-### Bugfixes:
+#### Bugfixes:
 - Many. And many more to come
 
 ## 2013-03-2 Release 0.6.0
@@ -166,44 +203,44 @@ worker/prefork
 - make purging of vhost dir configurable
 
 ## 2012-08-24 Release 0.4.0
-### Changes:
+#### Changes:
 - `include apache` is now required when using `apache::mod::*`
 
-### Bugfixes:
+#### Bugfixes:
 - Fix syntax for validate_re
 - Fix formatting in vhost template
 - Fix spec tests such that they pass
 
-    2012-05-08 Puppet Labs <[email protected]> - 0.0.4
-    e62e362 Fix broken tests for ssl, vhost, vhost::*
-    42c6363 Changes to match style guide and pass puppet-lint without error
-    42bc8ba changed name => path for file resources in order to name namevar by it's name
-    72e13de One end too much
-    0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
-    273f94d fix tests
-    a35ede5 (#13860) Make a2enmod/a2dismo commands optional
-    98d774e (#13860) Autorequire Package['httpd']
-    05fcec5 (#13073) Add missing puppet spec tests
-    541afda (#6899) Remove virtual a2mod definition
-    976cb69 (#13072) Move mod python and wsgi package names to params
-    323915a (#13060) Add .gitignore to repo
-    fdf40af (#13060) Remove pkg directory from source tree
-    fd90015 Add LICENSE file and update the ModuleFile
-    d3d0d23 Re-enable local php class
-    d7516c7 Make management of firewalls configurable for vhosts
-    60f83ba Explicitly lookup scope of apache_name in templates.
-    f4d287f (#12581) Add explicit ordering for vdir directory
-    88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
-    a776a8b (#11071) Fix to work with latest firewall module
-    2b79e8b (#11070) Add support for Scientific Linux
-    405b3e9 Fix for a2mod
-    57b9048 Commit apache::vhost::redirect Manifest
-    8862d01 Commit apache::vhost::proxy Manifest
-    d5c1fd0 Commit apache::mod::wsgi Manifest
-    a825ac7 Commit apache::mod::python Manifest
-    b77062f Commit Templates
-    9a51b4a Vhost File Declarations
-    6cf7312 Defaults for Parameters
-    6a5b11a Ensure installed
-    f672e46 a2mod fix
-    8a56ee9 add pthon support to apache
+##2012-05-08 Puppet Labs <[email protected]> - 0.0.4
+* e62e362 Fix broken tests for ssl, vhost, vhost::*
+* 42c6363 Changes to match style guide and pass puppet-lint without error
+* 42bc8ba changed name => path for file resources in order to name namevar by it's name
+* 72e13de One end too much
+* 0739641 style guide fixes: 'true' <> true, $operatingsystem needs to be $::operatingsystem, etc.
+* 273f94d fix tests
+* a35ede5 (#13860) Make a2enmod/a2dismo commands optional
+* 98d774e (#13860) Autorequire Package['httpd']
+* 05fcec5 (#13073) Add missing puppet spec tests
+* 541afda (#6899) Remove virtual a2mod definition
+* 976cb69 (#13072) Move mod python and wsgi package names to params
+* 323915a (#13060) Add .gitignore to repo
+* fdf40af (#13060) Remove pkg directory from source tree
+* fd90015 Add LICENSE file and update the ModuleFile
+* d3d0d23 Re-enable local php class
+* d7516c7 Make management of firewalls configurable for vhosts
+* 60f83ba Explicitly lookup scope of apache_name in templates.
+* f4d287f (#12581) Add explicit ordering for vdir directory
+* 88a2ac6 (#11706) puppetlabs-apache depends on puppetlabs-firewall
+* a776a8b (#11071) Fix to work with latest firewall module
+* 2b79e8b (#11070) Add support for Scientific Linux
+* 405b3e9 Fix for a2mod
+* 57b9048 Commit apache::vhost::redirect Manifest
+* 8862d01 Commit apache::vhost::proxy Manifest
+* d5c1fd0 Commit apache::mod::wsgi Manifest
+* a825ac7 Commit apache::mod::python Manifest
+* b77062f Commit Templates
+* 9a51b4a Vhost File Declarations
+* 6cf7312 Defaults for Parameters
+* 6a5b11a Ensure installed
+* f672e46 a2mod fix
+* 8a56ee9 add pthon support to apache

Modulefile

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

README.md

@@ -1719,6 +1719,12 @@ The Apache module relies heavily on templates to enable the `vhost` and `apache:
 
 ##Limitations
 
+###Ubuntu 10.04
+
+The `apache::vhost::WSGIImportScript` parameter creates a statement inside the VirtualHost which is unsupported on older versions of Apache, causing this to fail.  This will be remedied in a future refactoring.
+
+###General
+
 This module is CI tested on Centos 5 & 6, Ubuntu 12.04, Debian 7, and RHEL 5 & 6 platforms against both the OSS and Enterprise version of Puppet. 
 
 The module contains support for other distributions and operating systems, such as FreeBSD and Amazon Linux, but is not formally tested on those and regressions may occur.

metadata.json

@@ -0,0 +1,58 @@
+{
+    "name": "puppetlabs-apache",
+    "version": "1.0.1",
+    "source": "https://github.com/puppetlabs/puppetlabs-apache",
+    "author": "Puppet Labs",
+    "license": "Apache-2.0",
+    "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
+    "summary": "Puppet module for Apache",
+    "operatingsystem_support": [
+      {
+        "operatingsystem": "RedHat",
+        "operatingsystemrelease": [
+          "5",
+          "6"
+        ]
+      },
+      {
+        "operatingsystem": "CentOS",
+        "operatingsystemrelease": [
+          "5",
+          "6"
+        ]
+      },
+      {
+        "operatingsystem": "OracleLinux",
+        "operatingsystemrelease": [
+          "5",
+          "6"
+        ]
+      },
+      {
+        "operatingsystem": "Scientific",
+        "operatingsystemrelease": [
+          "5",
+          "6"
+        ]
+      },
+      {
+        "operatingsystem": "Debian",
+        "operatingsystemrelease": [
+          "6",
+          "7"
+        ]
+      },
+      {
+        "operatingsystem": "Ubuntu",
+        "operatingsystemrelease": [
+          "10.04",
+          "12.04"
+        ]
+      }
+    ],
+    "requirements": [
+      { "name": "pe", "version_requirement": "3.2.x" },
+      { "name": "puppet", "version_requirement": "3.x" }
+    ],
+    "dependencies": []
+}

spec/acceptance/default_mods_spec.rb

@@ -7,8 +7,6 @@
   servicename = 'apache2'
 when 'FreeBSD'
   servicename = 'apache22'
-else
-  raise "Unconfigured OS for apache service on #{fact('osfamily')}"
 end
 
 describe 'apache::default_mods class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do

spec/acceptance/nodesets/default.yml

@@ -0,0 +1,11 @@
+HOSTS:
+  centos-64-x64:
+    roles:
+      - master
+    platform: el-6-x86_64
+    box : centos-64-x64-vbox4210-nocm
+    box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
+    hypervisor : vagrant
+CONFIG:
+  log_level: debug
+  type: git

spec/acceptance/version.rb

@@ -51,5 +51,7 @@
   $error_log        = 'http-error.log'
 
   $apache_version = 2.2
+else
+  $apache_version = 0
 end
 

spec/acceptance/vhost_spec.rb

@@ -899,7 +899,7 @@ class { 'apache::mod::wsgi': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    it 'import_script applies cleanly', :unless => fact('lsbcodename') == 'lucid' do
+    it 'import_script applies cleanly', :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
       pp = <<-EOS
         class { 'apache': }
         class { 'apache::mod::wsgi': }
@@ -918,7 +918,7 @@ class { 'apache::mod::wsgi': }
       apply_manifest(pp, :catch_failures => true)
     end
 
-    describe file("#{$vhost_dir}/25-test.server.conf") do
+    describe file("#{$vhost_dir}/25-test.server.conf"), :unless => (fact('lsbdistcodename') == 'lucid' or UNSUPPORTED_PLATFORMS.include?(fact('osfamily'))) do
       it { should be_file }
       it { should contain 'WSGIApplicationGroup %{GLOBAL}' }
       it { should contain 'WSGIDaemonProcess wsgi processes=2' }

spec/spec_helper_acceptance.rb

@@ -1,15 +1,18 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 
-hosts.each do |host|
-  if host['platform'] =~ /debian/
-    on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
-  end
-  if host.is_pe?
-    install_pe
-  else
-    install_puppet
-    on host, "mkdir -p #{host['distmoduledir']}"
+
+unless ENV['RS_PROVISION'] == 'no'
+  hosts.each do |host|
+    if host['platform'] =~ /debian/
+      on host, 'echo \'export PATH=/var/lib/gems/1.8/bin/:${PATH}\' >> ~/.bashrc'
+    end
+    if host.is_pe?
+      install_pe
+    else
+      install_puppet
+      on host, "mkdir -p #{host['distmoduledir']}"
+    end
   end
 end