Release 2.0.0

.fixtures.yml

@@ -1,16 +1,18 @@
 fixtures:
+  repositories:
+    provision: 'https://github.com/puppetlabs/provision.git'
   forge_modules:
     concat:
       repo: "puppetlabs/concat"
-      ref: "5.3.0"
+      ref: "8.0.1"
     mysql:
       repo: "puppetlabs/mysql"
-      ref: "8.1.0"
+      ref: "14.0.0"
     stdlib:
       repo: "puppetlabs/stdlib"
-      ref: "5.2.0"
+      ref: "9.0.0"
     archive:
       repo: "puppet/archive"
-      ref: "0.5.1"
+      ref: "6.1.2"
   symlinks:
     wordpress: "#{source_dir}"

CHANGELOG → CHANGELOG.md

@@ -1,3 +1,21 @@
+2023-05-30 Release 2.0.0
+Changed:
+- Depends on the `puppet/archive` module now
+- `wp_proxy_host` and `wp_proxy_port` are for https-only download proxies now
+
+Features:
+- Updated linting/validation with modern tooling
+- Added Apache license file
+- Added parameters:
+  - `wp_config_owner`
+  - `wp_config_group`
+  - `wp_config_mode`
+  - `manage_wp_content`
+  - `wp_content_owner`
+  - `wp_content_group`
+  - `wp_content_recurse`
+  - `wp_site_url`
+
 2014-10-15 Release 1.0.0
 Features
 - Multiple instances ability via wordpress::instance

Gemfile

@@ -1,62 +1,59 @@
-source ENV["GEM_SOURCE"] || "https://rubygems.org"
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 def location_for(place_or_version, fake_version = nil)
   git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
-  file_url_regex = %r{\Afile://(?<path>.*)}
+  file_url_regex = %r{\Afile:\/\/(?<path>.*)}
 
   if place_or_version && (git_url = place_or_version.match(git_url_regex))
-    [fake_version, {git: git_url[:url], branch: git_url[:branch], require: false}].compact
+    [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
   elsif place_or_version && (file_url = place_or_version.match(file_url_regex))
-    [">= 0", {path: File.expand_path(file_url[:path]), require: false}]
+    ['>= 0', { path: File.expand_path(file_url[:path]), require: false }]
   else
-    [place_or_version, {require: false}]
+    [place_or_version, { require: false }]
   end
 end
 
 group :development do
-  gem "json", "= 2.1.0", require: false if Gem::Requirement.create([">= 2.5.0", "< 2.7.0"]).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", "= 2.3.0", require: false if Gem::Requirement.create([">= 2.7.0", "< 3.0.0"]).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", "= 2.5.1", require: false if Gem::Requirement.create([">= 3.0.0", "< 3.0.5"]).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", "= 2.6.1", require: false if Gem::Requirement.create([">= 3.1.0", "< 3.1.3"]).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "json", "= 2.6.3", require: false if Gem::Requirement.create([">= 3.2.0", "< 4.0.0"]).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "voxpupuli-puppet-lint-plugins", "~> 4.0", require: false
-  gem "facterdb", "~> 1.18", require: false
-  gem "metadata-json-lint", ">= 2.0.2", "< 4.0.0", require: false
-  gem "puppetlabs_spec_helper", "~> 5.0", require: false
-  gem "rspec-puppet-facts", "~> 2.0", require: false
-  gem "codecov", "~> 0.2", require: false
-  gem "dependency_checker", "~> 0.2", require: false
-  gem "parallel_tests", "= 3.12.1", require: false
-  gem "pry", "~> 0.10", require: false
-  gem "simplecov-console", "~> 0.5", require: false
-  gem "puppet-debugger", "~> 1.0", require: false
-  gem "rubocop", "= 1.6.1", require: false
-  gem "rubocop-performance", "= 1.9.1", require: false
-  gem "rubocop-rspec", "= 2.0.1", require: false
-  gem "rb-readline", "= 0.5.5", require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "json", '= 2.1.0',                           require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                           require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                           require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.1',                           require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.3',                           require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "voxpupuli-puppet-lint-plugins", '~> 4.0',   require: false
+  gem "facterdb", '~> 1.18',                       require: false
+  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
+  gem "puppetlabs_spec_helper", '~> 5.0',          require: false
+  gem "rspec-puppet-facts", '~> 2.0',              require: false
+  gem "codecov", '~> 0.2',                         require: false
+  gem "dependency_checker", '~> 0.2',              require: false
+  gem "parallel_tests", '= 3.12.1',                require: false
+  gem "pry", '~> 0.10',                            require: false
+  gem "simplecov-console", '~> 0.5',               require: false
+  gem "puppet-debugger", '~> 1.0',                 require: false
+  gem "rubocop", '= 1.48.1',                       require: false
+  gem "rubocop-performance", '= 1.16.0',           require: false
+  gem "rubocop-rspec", '= 2.19.0',                 require: false
+  gem "rb-readline", '= 0.5.5',                    require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator", '= 1.15.2',    require: false
 end
-# TODO acceptance tests need to be changed from beaker to litmus
 group :system_tests do
-  gem "beaker", *location_for(ENV["BEAKER_VERSION"] || "~> 3.13")
-  gem "beaker-abs", *location_for(ENV["BEAKER_ABS_VERSION"] || "~> 0.1")
-  gem "beaker-pe", require: false
-  gem "beaker-hostgenerator"
-  gem "beaker-rspec"
+  gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
+  gem "serverspec", '~> 2.41',    require: false
 end
 
-puppet_version = ENV["PUPPET_GEM_VERSION"]
-facter_version = ENV["FACTER_GEM_VERSION"]
-hiera_version = ENV["HIERA_GEM_VERSION"]
+puppet_version = ENV['PUPPET_GEM_VERSION']
+facter_version = ENV['FACTER_GEM_VERSION']
+hiera_version = ENV['HIERA_GEM_VERSION']
 
 gems = {}
 
-gems["puppet"] = location_for(puppet_version)
+gems['puppet'] = location_for(puppet_version)
 
 # If facter or hiera versions have been specified via the environment
 # variables
 
-gems["facter"] = location_for(facter_version) if facter_version
-gems["hiera"] = location_for(hiera_version) if hiera_version
+gems['facter'] = location_for(facter_version) if facter_version
+gems['hiera'] = location_for(hiera_version) if hiera_version
 
 gems.each do |gem_name, gem_params|
   gem gem_name, *gem_params
@@ -65,7 +62,7 @@ end
 # Evaluate Gemfile.local and ~/.gemfile if they exist
 extra_gemfiles = [
   "#{__FILE__}.local",
-  File.join(Dir.home, ".gemfile")
+  File.join(Dir.home, '.gemfile'),
 ]
 
 extra_gemfiles.each do |gemfile|

manifests/instance/app.pp

@@ -154,25 +154,23 @@
   }
 
   if $wp_proxy_host and !empty($wp_proxy_host) {
-    $exec_environment = [
-      "http_proxy=http://${wp_proxy_host}:${wp_proxy_port}",
-      "https_proxy=http://${wp_proxy_host}:${wp_proxy_port}",
-    ]
+    $proxy_server = "https://${wp_proxy_host}:${wp_proxy_port}"
+    $proxy_type = 'https'
   } else {
-    $exec_environment = []
+    $proxy_server = undef
+    $proxy_type = 'none'
   }
 
   ## Resource defaults
   File {
-    owner  => $wp_owner,
-    group  => $wp_group,
-    mode   => '0644',
+    owner => $wp_owner,
+    group => $wp_group,
+    mode  => '0644',
   }
   Exec {
-    path        => ['/bin','/sbin','/usr/bin','/usr/sbin'],
-    cwd         => $install_dir,
-    environment => $exec_environment,
-    logoutput   => 'on_failure',
+    path      => ['/bin','/sbin','/usr/bin','/usr/sbin'],
+    cwd       => $install_dir,
+    logoutput => 'on_failure',
   }
 
   ## Installation directory
@@ -202,6 +200,8 @@
     extract_path    => $install_dir,
     extract_command => 'tar xzf %s --strip-components=1',
     cleanup         => true,
+    proxy_server    => $proxy_server,
+    proxy_type      => $proxy_type,
     require         => File[$install_dir],
   }
   -> exec { "Change ownership of ${install_dir}":

metadata.json

@@ -8,19 +8,19 @@
   "dependencies": [
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 1.0.0 < 6.0.0"
+      "version_requirement": ">= 1.0.0 < 9.0.0"
     },
     {
       "name": "puppetlabs/mysql",
-      "version_requirement": ">= 2.1.0 < 9.0.0"
+      "version_requirement": ">= 2.1.0 < 14.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 2.3.1 < 6.0.0"
+      "version_requirement": ">= 2.3.1 < 10.0.0"
     },
     {
       "name": "puppet/archive",
-      "version_requirement": "< 1.0.0"
+      "version_requirement": ">= 1.0.0 < 7.0.0"
     }
   ],
   "operatingsystem_support": [

pdk.yaml

@@ -0,0 +1,2 @@
+---
+ignore: []

provision.yaml

@@ -0,0 +1,5 @@
+---
+default:
+  provisioner: docker
+  images:
+  - litmusimage/centos:7