Master sync

Puppetfile

@@ -1,5 +1,5 @@
 mod 'apache',
-  :commit => '7dde9fc31e68a8acb2bd313fbcbc92ae33e0c440',
+  :commit => 'cc61615850f7cfb70f1d85e5674045e1bf68a39d',
   :git => 'https://github.com/puppetlabs/puppetlabs-apache.git'
 
 mod 'aviator',
@@ -15,27 +15,27 @@ mod 'certmonger',
   :git => 'https://github.com/rcritten/puppet-certmonger.git'
 
 mod 'cinder',
-  :commit => '9b0ff06b6a46d32f29d3cd4b8d0f08fa029551e7',
+  :commit => '77e1c466564dbe33606696ecc9f5507d8811d48b',
   :git => 'https://github.com/stackforge/puppet-cinder.git'
 
 mod 'common',
   :commit => '165e2adc3ab559597f461e6eae3eb004967070f9',
   :git => 'https://github.com/purpleidea/puppet-common.git'
 
 mod 'concat',
-  :commit => 'c4a14b40451effa90542c6aa4ccbb599274e8e94',
+  :commit => '52d0f1d6809c9f1d8453f9e3ca10d792e67acc89',
   :git => 'https://github.com/puppetlabs/puppetlabs-concat.git'
 
 mod 'firewall',
-  :commit => '7ac535981bc43a1821e8c047e7834bbcee8c5a40',
+  :commit => 'eaa2fac5152c7712b1676de5d30a7c8d6307ab4d',
   :git => 'https://github.com/puppetlabs/puppetlabs-firewall.git'
 
 mod 'galera',
   :commit => '92463ad0567c066796b7fac4a1466e6a60621f6c',
   :git => 'https://github.com/redhat-openstack/puppet-galera.git'
 
 mod 'glance',
-  :commit => '0eed538b35d636f38bec93bf9d3cefa6803efae8',
+  :commit => '101ca5b088f3aec5d70c567f29dfdfa5609524ab',
   :git => 'https://github.com/stackforge/puppet-glance.git'
 
 mod 'gluster',
@@ -47,35 +47,35 @@ mod 'gnocchi',
   :git => 'https://github.com/stackforge/puppet-gnocchi.git'
 
 mod 'haproxy',
-  :commit => 'e06cc633e23dcacb272af1106924b8ba6b28a256',
+  :commit => '8790b5e9f45982da8e57cbfccc25506eed0ecbf4',
   :git => 'https://github.com/puppetlabs/puppetlabs-haproxy.git'
 
 mod 'heat',
-  :commit => '8c09567b62040245ae196d36ac8f2c94b3a9b6c9',
+  :commit => '6c2de4990c9f732a972783e85aaaec22ea98b1a1',
   :git => 'https://github.com/stackforge/puppet-heat.git'
 
 mod 'horizon',
   :commit => 'acafead234e11ce104f35cc89700c756045f2445',
   :git => 'https://github.com/stackforge/puppet-horizon.git'
 
 mod 'inifile',
-  :commit => '606de6971d019fa9557d0866e90942a3d6e06a97',
+  :commit => '57c68ba9ec6b5c255e89b28f91e56b2bfab50202',
   :git => 'https://github.com/puppetlabs/puppetlabs-inifile.git'
 
 mod 'ipa',
   :commit => '4e634b31633bc956341e20980233107a6d5dc1f9',
   :git => 'https://github.com/xbezdick/puppet-ipa-1.git'
 
 mod 'ironic',
-  :commit => '1b44b7d826813a4628683754091774d945223ac2',
+  :commit => 'f1ca7eb98a959c6de8365913b3bd0624b85fc1e7',
   :git => 'https://github.com/stackforge/puppet-ironic.git'
 
 mod 'keystone',
-  :commit => '2fcfc94b424c19d28e79bfd9d2c4f61cf5e23f3a',
+  :commit => '501f1f44b1e23fa2daff84e85106b942841c0199',
   :git => 'https://github.com/stackforge/puppet-keystone.git'
 
 mod 'manila',
-  :commit => '3d8d00d613cb4335d992319a72bd328517f73fd8',
+  :commit => '96e95f5c06fe504c0f1b92cca1a00bb9df20bea0',
   :git => 'https://github.com/stackforge/puppet-manila.git'
 
 mod 'memcached',
@@ -91,11 +91,11 @@ mod 'module-data',
   :git => 'https://github.com/ripienaar/puppet-module-data.git'
 
 mod 'mongodb',
-  :commit => '1ae7406589e3abf6f65a337005217ca0e0323840',
+  :commit => 'b41a706f7c1f3f01b84391972ecd6e135d113ab7',
   :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
 
 mod 'mysql',
-  :commit => 'd8b7a9011ec27c45cd7b30e61f56fe197edb0c25',
+  :commit => '85a5d8be6ff165942e4ee66667db9c5e8a5800a9',
   :git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'
 
 mod 'n1k_vsm',
@@ -107,19 +107,19 @@ mod 'nagios',
   :git => 'https://github.com/gildub/puppet-nagios-openstack.git'
 
 mod 'neutron',
-  :commit => 'ac06cb7c9685b361e1bfe1e0740f02e656d3ee75',
+  :commit => '5ee1d6aa3d0e00ed80f4340862d839f42d549a80',
   :git => 'https://github.com/stackforge/puppet-neutron.git'
 
 mod 'nova',
-  :commit => 'd1a2f9606d29b429414bd56b87ac8fcc3fb696cf',
+  :commit => 'a0d934b6e2adc24b32508d3c33722733ab23e8c8',
   :git => 'https://github.com/stackforge/puppet-nova.git'
 
 mod 'nssdb',
   :commit => '2e163a21fb80d828afede2d4be6214f1171c4887',
   :git => 'https://github.com/rcritten/puppet-nssdb.git'
 
 mod 'ntp',
-  :commit => 'c1eef64924a51a5fb7281a4ccd0f098f0effd270',
+  :commit => '286acbacdb9aaa3f1255d7486078730e380195f4',
   :git => 'https://github.com/puppetlabs/puppetlabs-ntp'
 
 mod 'openstack_extras',
@@ -143,7 +143,7 @@ mod 'qpid',
   :git => 'https://github.com/dprince/puppet-qpid'
 
 mod 'rabbitmq',
-  :commit => 'c9a4951e032ca76b00559ef5441515b96b2be23c',
+  :commit => '91c767e2ac2ee62162ad79ea392c3c9ca77074c3',
   :git => 'https://github.com/puppetlabs/puppetlabs-rabbitmq.git'
 
 mod 'redis',
@@ -155,7 +155,7 @@ mod 'remote',
   :git => 'https://github.com/paramite/puppet-remote.git'
 
 mod 'rsync',
-  :commit => '67a3475e141d672caa5fe552d8cf59cd0bd0137e',
+  :commit => '72e8543c630ae7a7290717d2cb229703542495e5',
   :git => 'https://github.com/puppetlabs/puppetlabs-rsync.git'
 
 mod 'sahara',
@@ -171,11 +171,11 @@ mod 'staging',
   :git => 'https://github.com/nanliu/puppet-staging.git'
 
 mod 'stdlib',
-  :commit => '4dab70b305c4ab1c8c36356efa4bd205678c7c49',
+  :commit => '2762bb6c930a3547aaef339fd8f649af349385c2',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
 
 mod 'swift',
-  :commit => '15aa71f0015532fbe39b9f399c5bd000ca9b52c7',
+  :commit => '96ad9dd2237d9d9165025fd76e3c4b7f348ea2f1',
   :git => 'https://github.com/stackforge/puppet-swift.git'
 
 mod 'sysctl',
@@ -195,11 +195,11 @@ mod 'tripleo',
   :git => 'https://github.com/stackforge/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => 'feee104f7f150948f77f357c5708e87a080595c1',
+  :commit => 'b38fef5f763768981b9d74bafedcc63ff51d93e2',
   :git => 'https://github.com/stackforge/puppet-trove'
 
 mod 'vcsrepo',
-  :commit => '9a955b8746f373a1a3e47ebf67d4186b98e0094f',
+  :commit => '74e415866ef2d39ed1568dd43b6e8596590dedaf',
   :git => 'https://github.com/puppetlabs/puppetlabs-vcsrepo.git'
 
 mod 'vlan',

apache/.sync.yml

@@ -1,10 +1,10 @@
 ---
 .travis.yml:
   extras:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 Rakefile:
   extra_disabled_lint_checks:
   - 'disable_only_variable_string'

apache/.travis.yml

@@ -1,21 +1,28 @@
 ---
+sudo: false
 language: ruby
 bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
   - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.4.0"
+  - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
+  - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.4.0"
+  - rvm: 2.1.5
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 notifications:
   email: false

apache/Gemfile

@@ -1,18 +1,34 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
+def location_for(place, fake_version = nil)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
 group :development, :unit_tests do
-  gem 'rake',                    :require => false
   gem 'rspec-core', '3.1.7',     :require => false
-  gem 'rspec-puppet', '~> 1.0',  :require => false
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
   gem 'json',                    :require => false
 end
 
+beaker_version = ENV['BEAKER_VERSION']
+beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
 group :system_tests do
-  gem 'beaker-rspec',  :require => false
+  if beaker_version
+    gem 'beaker', *location_for(beaker_version)
+  end
+  if beaker_rspec_version
+    gem 'beaker-rspec', *location_for(beaker_rspec_version)
+  else
+    gem 'beaker-rspec',  :require => false
+  end
   gem 'serverspec',    :require => false
 end
 

apache/README.md

@@ -16,11 +16,13 @@
         * [Classes: apache::mod::*](#classes-apachemodname)
         * [Class: apache::mod::alias](#class-apachemodalias)
         * [Class: apache::mod::event](#class-apachemodevent)
+        * [Class: apache::mod::geoip](#class-apachemodgeoip)
         * [Class: apache::mod::info](#class-apachemodinfo)
         * [Class: apache::mod::pagespeed](#class-apachemodpagespeed)
         * [Class: apache::mod::php](#class-apachemodphp)
         * [Class: apache::mod::ssl](#class-apachemodssl)
         * [Class: apache::mod::status](#class-apachemodstatus)
+        * [Class: apache::mod::expires](#class-apachemodexpires)
         * [Class: apache::mod::wsgi](#class-apachemodwsgi)
         * [Class: apache::mod::fcgid](#class-apachemodfcgid)
         * [Class: apache::mod::negotiation](#class-apachemodnegotiation)
@@ -572,6 +574,7 @@ There are many `apache::mod::[name]` classes within this module that can be decl
 * `proxy_http`
 * `python`
 * `reqtimeout`
+* `remoteip`*
 * `rewrite`
 * `rpaf`*
 * `setenvif`
@@ -624,6 +627,25 @@ Installs and manages mod_auth_cas. The parameters `cas_login_url` and `cas_valid
 
 Full documentation on mod_auth_cas is available from [JASIG](https://github.com/Jasig/mod_auth_cas).
 
+####Class: `apache::mod::geoip`
+
+Installs and manages mod_geoip.
+
+Full documentation on mod_geoip is available from [MaxMind](http://dev.maxmind.com/geoip/legacy/mod_geoip2/).
+
+These are the default settings:
+
+```puppet
+  class {'apache::mod::geoip':
+    $enable  => false,
+    $db_file => '/usr/share/GeoIP/GeoIP.dat',
+    $flag    => 'Standard',
+    $output  => 'All',
+  }
+```
+
+The parameter `db_file` can be a single directory or a hash of directories.
+
 ####Class: `apache::mod::info`
 
 Installs and manages mod_info which provides a comprehensive overview of the server configuration.
@@ -798,6 +820,32 @@ Installs Apache mod_status and uses the status.conf.erb template. These are the
   }
 ```
 
+####Class: `apache::mod::expires`
+
+Installs Apache mod_expires and uses the expires.conf.erb template. These are the defaults:
+
+```puppet
+    class { 'apache::mod::expires':
+      expires_active  = true,
+      expires_default = undef,
+      expires_by_type = undef,
+){
+
+
+  }
+```
+
+`expires_by_type` is an array of Hashes, describing a set of types and their expire times:
+
+```puppet
+  class { 'apache::mod::expires':
+    expires_by_type = [
+      { 'text/json' => 'access plus 1 month' },
+      { 'text/html' => 'access plus 1 year' },
+    ]
+  }
+```
+
 ####Class: `apache::mod::wsgi`
 
 Enables Python support in the WSGI module. To use, simply `include 'apache::mod::wsgi'`.
@@ -1829,6 +1877,22 @@ An array of hashes used to override the [ErrorDocument](https://httpd.apache.org
     }
 ```
 
+######`geoip_enable`
+
+Sets the [GeoIPEnable](http://dev.maxmind.com/geoip/legacy/mod_geoip2/#Configuration) directive.
+Note that you must declare `class {'apache::mod::geoip': }` before using this directive.
+
+```puppet
+    apache::vhost { 'first.example.com':
+      docroot     => '/var/www/first',
+      directories => [
+        { path         => '/var/www/first',
+          geoip_enable => true,
+        },
+      ],
+    }
+```
+
 ######`headers`
 
 Adds lines for [Header](http://httpd.apache.org/docs/current/mod/mod_headers.html#header) directives.

apache/manifests/dev.pp

@@ -4,8 +4,10 @@
   }
   include ::apache::params
   $packages = $::apache::params::dev_packages
-  package { $packages:
-    ensure  => present,
-    require => Package['httpd'],
+  if $packages { # FreeBSD doesn't have dev packages to install
+    package { $packages:
+      ensure  => present,
+      require => Package['httpd'],
+    }
   }
 }

apache/manifests/mod/expires.pp

@@ -1,3 +1,20 @@
-class apache::mod::expires {
+class apache::mod::expires (
+  $expires_active  = true,
+  $expires_default = undef,
+  $expires_by_type = undef,
+) {
   ::apache::mod { 'expires': }
+
+  # Template uses
+  # $expries_active
+  # $expries_default
+  # $expries_by_type
+  file { 'expires.conf':
+    ensure  => file,
+    path    => "${::apache::mod_dir}/expires.conf",
+    content => template('apache/mod/expires.conf.erb'),
+    require => Exec["mkdir ${::apache::mod_dir}"],
+    before  => File[$::apache::mod_dir],
+    notify  => Class['apache::service'],
+  }
 }