Merge branch 'voxpupuli:master' into access_log_in_redirect_location

voxpupuli · Jun 27, 2023 · 82e024c · 82e024c
2 parents a9838b9 + 99c8849
commit 82e024c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,20 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
-## [v4.4.0](https://github.com/voxpupuli/puppet-nginx/tree/v4.4.0) (2023-04-03)
+## [v5.0.0](https://github.com/voxpupuli/puppet-nginx/tree/v5.0.0) (2023-06-26)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-nginx/compare/v4.4.0...v5.0.0)
+
+**Breaking changes:**
+
+- Drop Puppet 6 support [\#1549](https://github.com/voxpupuli/puppet-nginx/pull/1549) ([bastelfreak](https://github.com/bastelfreak))
+
+**Implemented enhancements:**
+
+- puppetlabs/stdlib: Allow 9.x & puppetlabs/concat: Allow 8.x & 9.x [\#1558](https://github.com/voxpupuli/puppet-nginx/pull/1558) ([bastelfreak](https://github.com/bastelfreak))
+- Add puppet 8 support [\#1557](https://github.com/voxpupuli/puppet-nginx/pull/1557) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v4.4.0](https://github.com/voxpupuli/puppet-nginx/tree/v4.4.0) (2023-04-11)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-nginx/compare/v4.3.0...v4.4.0)
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-nginx",
-  "version": "4.4.1-rc0",
+  "version": "5.0.1-rc0",
   "author": "Vox Pupuli",
   "summary": "Puppet NGINX management module",
   "license": "MIT",

diff --git a/spec/defines/resource_server_spec.rb b/spec/defines/resource_server_spec.rb
@@ -89,14 +89,6 @@
               \s+access_log\s+/var/log/nginx/www.rspec.example.com.access.log;\n
               \s+error_log\s+/var/log/nginx/www.rspec.example.com.error.log;\n}x
             },
-            {
-              title: 'should contain access and error logs directives inside the www rewrite',
-              attr: 'rewrite_non_www_to_www',
-              value: true,
-              match: %r{\s+return\s+301\s+http://rspec\.example\.com\$request_uri;\n
-                \s+access_log\s+/var/log/nginx/rspec.example.com.access.log;\n
-              \s+error_log\s+/var/log/nginx/rspec.example.com.error.log;\n}x
-            },
             {
               title: 'should not contain www to non-www rewrite',
               attr: 'rewrite_www_to_non_www',
@@ -434,6 +426,14 @@
             let(:title) { 'rspec.example.com' }
 
             [
+              {
+                title: 'should contain access and error logs directives inside the non-www rewrite',
+                attr: 'rewrite_non_www_to_www',
+                value: true,
+                match: %r{\s+return\s+301\s+http://www.rspec\.example\.com\$request_uri;\n
+                \s+access_log\s+/var/log/nginx/rspec.example.com.access.log;\n
+                \s+error_log\s+/var/log/nginx/rspec.example.com.error.log;\n}x
+              },
               {
                 title: 'should not contain non-www to www rewrite',
                 attr: 'rewrite_non_www_to_www',
@@ -493,6 +493,14 @@
             let(:title) { 'rspec.example.com' }
 
             [
+              {
+                title: 'should contain access and error logs directives inside the non-www rewrite',
+                attr: 'rewrite_non_www_to_www',
+                value: true,
+                match: %r{\s+return\s+301\s+https://www.rspec\.example\.com\$request_uri;\n
+                \s+access_log\s+/var/log/nginx/ssl-rspec.example.com.access.log;\n
+                \s+error_log\s+/var/log/nginx/ssl-rspec.example.com.error.log;\n}x
+              },
               {
                 title: 'should not contain non-www to www rewrite',
                 attr: 'rewrite_non_www_to_www',