Merge pull request #805 from mhaskel/1.1.x-merge

1.1.x merge
xbezdick · Jul 29, 2014 · 7fd9a90 · 7fd9a90
2 parents 90163b1 + d11a795
commit 7fd9a90
Show file tree

Hide file tree

Showing 10 changed files with 276 additions and 206 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,44 @@
+##2014-07-15 - Supported Release 1.1.1
+###Summary
+
+This release merely updates metadata.json so the module can be uninstalled and
+upgraded via the puppet module command.
+
+## 2014-04-14 Supported Release 1.1.0
+
+###Summary
+
+This release primarily focuses on extending the httpd 2.4 support, tested
+through adding RHEL7 and Ubuntu 14.04 support.  It also includes Passenger 
+4 support, as well as several new modules and important bugfixes.
+
+####Features
+
+- Add support for RHEL7 and Ubuntu 14.04
+- More complete apache24 support
+- Passenger 4 support
+- Add support for max_keepalive_requests and log_formats parameters
+- Add mod_pagespeed support
+- Add mod_speling support
+- Added several parameters for mod_passenger
+- Added ssl_cipher parameter to apache::mod::ssl
+- Improved examples in documentation
+- Added docroot_mode, action, and suexec_user_group parameters to apache::vhost
+- Add support for custom extensions for mod_php
+- Improve proxy_html support for Debian
+
+####Bugfixes
+
+- Remove NameVirtualHost directive for apache >= 2.4
+- Order proxy_set option so it doesn't change between runs
+- Fix inverted SSL compression
+- Fix missing ensure on concat::fragment resources
+- Fix bad dependencies in apache::mod and apache::mod::mime
+
+####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.1
 ###Summary
 

diff --git a/Modulefile b/Modulefile
diff --git a/metadata.json b/metadata.json
@@ -1,65 +1,80 @@
 {
-    "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",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "CentOS",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "OracleLinux",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "Scientific",
-        "operatingsystemrelease": [
-          "5",
-          "6",
-          "7"
-
-        ]
-      },
-      {
-        "operatingsystem": "Debian",
-        "operatingsystemrelease": [
-          "6",
-          "7"
-        ]
-      },
-      {
-        "operatingsystem": "Ubuntu",
-        "operatingsystemrelease": [
-          "10.04",
-          "12.04",
-          "14.04"
-        ]
-      }
-    ],
-    "requirements": [
-      { "name": "puppet", "version_requirement": "3.x" }
-    ],
-    "dependencies": []
+  "name": "puppetlabs-apache",
+  "version": "1.1.1",
+  "author": "puppetlabs",
+  "summary": "Puppet module for Apache",
+  "license": "Apache 2.0",
+  "source": "git://github.com/puppetlabs/puppetlabs-apache.git",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-apache",
+  "issues_url": "https://github.com/puppetlabs/puppetlabs-apache/issues",
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Scientific",
+      "operatingsystemrelease": [
+        "5",
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Debian",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "Ubuntu",
+      "operatingsystemrelease": [
+        "10.04",
+        "12.04",
+        "14.04"
+      ]
+    }
+  ],
+  "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.2.0 < 3.4.0"
+    },
+    {
+      "name": "puppet",
+      "version_requirement": "3.x"
+    }
+  ],
+  "description": "Module for Apache configuration",
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 2.4.0"
+    },
+    {
+      "name": "puppetlabs/concat",
+      "version_requirement": ">= 1.0.0"
+    }
+  ]
 }
diff --git a/spec/acceptance/apache_parameters_spec.rb b/spec/acceptance/apache_parameters_spec.rb
@@ -343,8 +343,8 @@ class { 'apache':
         pp = <<-EOS
           if $::osfamily == 'RedHat' and $::selinux == 'true' {
             $semanage_package = $::operatingsystemmajrelease ? {
-              '5'       => 'policycoreutils',
-              'default' => 'policycoreutils-python',
+              '5'     => 'policycoreutils',
+              default => 'policycoreutils-python',
             }
 
             package { $semanage_package: ensure => installed }

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -40,21 +40,24 @@ class { 'apache': }
       pp = <<-EOS
       if $::osfamily == 'RedHat' and $::selinux == 'true' {
         $semanage_package = $::operatingsystemmajrelease ? {
-          '5'       => 'policycoreutils',
-          'default' => 'policycoreutils-python',
+          '5'     => 'policycoreutils',
+          default => 'policycoreutils-python',
         }
 
         package { $semanage_package: ensure => installed }
         exec { 'set_apache_defaults':
-          command => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          require => Package[$semanage_package],
+          command     => 'semanage fcontext -a -t httpd_sys_content_t "/apache_spec(/.*)?"',
+          path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          subscribe   => Package[$semanage_package],
+          refreshonly => true,
         }
         exec { 'restorecon_apache':
-          command => 'restorecon -Rv /apache_spec',
-          path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-          before  => Service['httpd'],
-          require => Class['apache'],
+          command     => 'restorecon -Rv /apache_spec',
+          path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
+          before      => Service['httpd'],
+          require     => Class['apache'],
+          subscribe   => Exec['set_apache_defaults'],
+          refreshonly => true,
         }
       }
       file { '/apache_spec': ensure => directory, }

diff --git a/spec/acceptance/mod_mime_spec.rb b/spec/acceptance/mod_mime_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'apache::mod::mime class' do
+describe 'apache::mod::mime class', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
   case fact('osfamily')
   when 'Debian'
     mod_dir      = '/etc/apache2/mods-available'

diff --git a/spec/acceptance/mod_pagespeed_spec.rb b/spec/acceptance/mod_pagespeed_spec.rb
@@ -33,7 +33,7 @@ class { 'apt': }
           } 
         } elsif $::osfamily == 'RedHat' {
          yumrepo { 'mod-pagespeed':
-          baseurl  => 'http://dl.google.com/linux/mod-pagespeed/rpm/stable/x86_64',
+          baseurl  => "http://dl.google.com/linux/mod-pagespeed/rpm/stable/$::architecture",
             enabled  => 1,
             gpgcheck => 1,
             gpgkey   => 'https://dl-ssl.google.com/linux/linux_signing_key.pub',