From 7f86dce637316deaeb18622c4417d875a19b5ea6 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 18 Jan 2022 09:05:40 -0800 Subject: [PATCH 01/81] Automated PR: Cookstyle Changes (#199) * Cookstyle 7.30.1 Fixes Issues found and resolved with: recipes/server.rb - 88:3 refactor: Chef/RedundantCode/UseCreateIfMissing - Use the :create_if_missing action instead of not_if with a ::File.existFOO check. https://docs.chef.io/workstation/cookstyle/chef_redundantcode_usecreateifmissing - 98:3 refactor: Chef/RedundantCode/UseCreateIfMissing - Use the :create_if_missing action instead of not_if with a ::File.existFOO check. https://docs.chef.io/workstation/cookstyle/chef_redundantcode_usecreateifmissing Signed-off-by: kitchen-porter * Update CHANGELOG.md Co-authored-by: Dan Webb --- CHANGELOG.md | 3 +++ recipes/server.rb | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 442de4de..d63529d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +- resolved cookstyle error: recipes/server.rb:88:3 refactor: `Chef/RedundantCode/UseCreateIfMissing` +- resolved cookstyle error: recipes/server.rb:98:3 refactor: `Chef/RedundantCode/UseCreateIfMissing` + ## 5.3.2 - *2021-08-30* - Standardise files with files in sous-chefs/repo-management diff --git a/recipes/server.rb b/recipes/server.rb index 46114268..e89430d6 100644 --- a/recipes/server.rb +++ b/recipes/server.rb @@ -85,7 +85,7 @@ file "#{key_dir}/serial" do content '01' - not_if { ::File.exist?("#{key_dir}/serial") } + action :create_if_missing end require 'openssl' @@ -95,7 +95,7 @@ owner 'root' group node['root_group'] mode '0600' - not_if { ::File.exist?(node['openvpn']['config']['dh']) } + action :create_if_missing end bash 'openvpn-initca' do From ff4fed3cb88171cab24854a5c12391358edd4858 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 18 Jan 2022 09:05:44 -0800 Subject: [PATCH 02/81] Update changelog for 5.4.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d63529d1..e4700695 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 5.4.0 - *2022-01-18* - resolved cookstyle error: recipes/server.rb:88:3 refactor: `Chef/RedundantCode/UseCreateIfMissing` - resolved cookstyle error: recipes/server.rb:98:3 refactor: `Chef/RedundantCode/UseCreateIfMissing` From 7da2b1b1b8824f5ef0d6970cec7536d77c54080d Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 18 Jan 2022 09:05:44 -0800 Subject: [PATCH 03/81] Update metadata for 5.4.0 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 080c6949..6789ccf0 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '5.3.2' +version '5.4.0' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 100b621c9d18987985ffeb1277f9a9faabd54bdb Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 18 Jan 2022 09:05:46 -0800 Subject: [PATCH 04/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4700695..b0908bbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 5.4.0 - *2022-01-18* - resolved cookstyle error: recipes/server.rb:88:3 refactor: `Chef/RedundantCode/UseCreateIfMissing` From 5176a3548783f6e0413b9c26f214052bac39869e Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 8 Feb 2022 08:53:06 -0800 Subject: [PATCH 05/81] Automated PR: Standardising Files (#200) * Standardise files with files in sous-chefs/repo-management Signed-off-by: kitchen-porter * Remove delivery and move to calling RSpec directly via a reusable workflow Signed-off-by: Lance Albertson * Update tested platforms Signed-off-by: Lance Albertson * Enable unified_mode and require Chef >= 15.3 Standardize kitchen settings Signed-off-by: Lance Albertson * Fix various idempotency issues Signed-off-by: Lance Albertson Co-authored-by: Lance Albertson --- .delivery/project.toml | 9 ----- .github/workflows/ci.yml | 39 ++++++-------------- .overcommit.yml | 4 --- CHANGELOG.md | 9 +++++ kitchen.yml | 49 +++++++++++++------------- metadata.rb | 2 +- recipes/server.rb | 6 +++- recipes/service.rb | 4 +-- resources/conf.rb | 3 +- resources/user.rb | 8 +++-- spec/unit/recipes/server_spec.rb | 2 +- test/integration/server/server_test.rb | 14 ++++---- 12 files changed, 66 insertions(+), 83 deletions(-) delete mode 100644 .delivery/project.toml diff --git a/.delivery/project.toml b/.delivery/project.toml deleted file mode 100644 index 0d6f0ae9..00000000 --- a/.delivery/project.toml +++ /dev/null @@ -1,9 +0,0 @@ -[local_phases] -unit = "rspec spec/" -lint = 'cookstyle --display-cop-names --extra-details' -syntax = "echo skipping" -provision = "echo skipping" -deploy = "echo skipping" -smoke = "echo skipping" -functional = "echo skipping" -cleanup = "echo skipping" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd4809cf..134b5b14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,44 +8,25 @@ name: ci - main jobs: - delivery: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run Chef Delivery - uses: actionshub/chef-delivery@main - env: - CHEF_LICENSE: accept-no-persist - - yamllint: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run yaml Lint - uses: actionshub/yamllint@main - - mdl: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run Markdown Lint - uses: actionshub/markdownlint@main + lint-unit: + uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3 integration: - needs: [mdl, yamllint, delivery] + needs: lint-unit runs-on: ubuntu-latest strategy: matrix: os: + - 'almalinux-8' - 'amazonlinux-2' - 'centos-7' - - 'centos-8' - - 'debian-9' - - 'ubuntu-1604' + - 'centos-stream-8' + - 'debian-10' + - 'debian-11' + - 'fedora-latest' + - 'rockylinux-8' - 'ubuntu-1804' + - 'ubuntu-2004' suite: - 'server' - 'server-verification' diff --git a/.overcommit.yml b/.overcommit.yml index 1d27ed8d..cd8682a0 100644 --- a/.overcommit.yml +++ b/.overcommit.yml @@ -11,10 +11,6 @@ PreCommit: enabled: true required_executable: 'cookstyle' command: ["cookstyle"] - Delivery: - enabled: true - required_executable: 'delivery' - flags: ['local', 'all'] CommitMsg: HardTabs: enabled: true diff --git a/CHANGELOG.md b/CHANGELOG.md index b0908bbb..ed52fa25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +- Remove delivery and move to calling RSpec directly via a reusable workflow +- Update tested platforms +- Fix Fedora +- Standardize kitchen settings +- Enable unified_mode and require Chef >= 15.3 +- Fix various idempotency issues + - Set umask to 077 to match file permissions we expect + - Trigger various resources to run during first converge phase + ## 5.4.0 - *2022-01-18* - resolved cookstyle error: recipes/server.rb:88:3 refactor: `Chef/RedundantCode/UseCreateIfMissing` diff --git a/kitchen.yml b/kitchen.yml index 0fb973a8..089ee6e5 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -10,6 +10,10 @@ transport: provisioner: name: dokken + enforce_idempotency: true + multiple_converge: 2 + deprecations_as_errors: true + chef_log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %> chef_license: accept-no-persist verifier: @@ -18,40 +22,34 @@ verifier: # currently only support 2 last major revs of distros (at the most) platforms: - - name: amazonlinux-2 + - name: almalinux-8 driver: - image: dokken/amazonlinux-2 + image: dokken/almalinux-8 pid_one_command: /usr/lib/systemd/systemd - - name: debian-8 + - name: amazonlinux-2 driver: - image: dokken/debian-8 - pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update + image: dokken/amazonlinux-2 + pid_one_command: /usr/lib/systemd/systemd - - name: debian-9 + - name: debian-10 driver: - image: dokken/debian-9 + image: dokken/debian-10 pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - - name: debian-10 + - name: debian-11 driver: - image: dokken/debian-10 + image: dokken/debian-11 pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - name: centos-7 driver: image: dokken/centos-7 pid_one_command: /usr/lib/systemd/systemd - - name: centos-8 + - name: centos-stream-8 driver: - image: dokken/centos-8 + image: dokken/centos-stream-8 pid_one_command: /usr/lib/systemd/systemd - name: fedora-latest @@ -59,19 +57,20 @@ platforms: image: dokken/fedora-latest pid_one_command: /usr/lib/systemd/systemd - - name: ubuntu-16.04 + - name: ubuntu-18.04 driver: - image: dokken/ubuntu-16.04 + image: dokken/ubuntu-18.04 pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update - - name: ubuntu-18.04 + - name: ubuntu-20.04 driver: - image: dokken/ubuntu-18.04 + image: dokken/ubuntu-20.04 pid_one_command: /bin/systemd - intermediate_instructions: - - RUN /usr/bin/apt-get update + + - name: rockylinux-8 + driver: + image: dokken/rockylinux-8 + pid_one_command: /usr/lib/systemd/systemd suites: - name: server diff --git a/metadata.rb b/metadata.rb index 6789ccf0..f0027c36 100644 --- a/metadata.rb +++ b/metadata.rb @@ -6,7 +6,7 @@ description 'Installs and configures openvpn and includes rake tasks for managing certs.' source_url 'https://github.com/sous-chefs/openvpn' issues_url 'https://github.com/sous-chefs/openvpn/issues' -chef_version '>= 14' +chef_version '>= 15.3' supports 'arch' supports 'centos' diff --git a/recipes/server.rb b/recipes/server.rb index e89430d6..a30cd0c1 100644 --- a/recipes/server.rb +++ b/recipes/server.rb @@ -101,6 +101,7 @@ bash 'openvpn-initca' do environment('KEY_CN' => "#{node['openvpn']['key']['org']} CA") code <<-EOF + umask 077 && \ openssl req -batch -days #{node['openvpn']['key']['ca_expire']} \ -nodes -new -newkey rsa:#{key_size} -#{message_digest} -x509 \ -keyout #{node['openvpn']['signing_ca_key']} \ @@ -113,6 +114,7 @@ bash 'openvpn-server-key' do environment('KEY_CN' => 'server') code <<-EOF + umask 077 && \ openssl req -batch -days #{node['openvpn']['key']['expire']} \ -nodes -new -newkey rsa:#{key_size} -keyout #{key_dir}/server.key \ -out #{key_dir}/server.csr -extensions server \ @@ -136,7 +138,8 @@ execute 'gencrl' do environment('KEY_CN' => "#{node['openvpn']['key']['org']} CA") - command "openssl ca -config #{[node['openvpn']['fs_prefix'], '/etc/openvpn/easy-rsa/openssl.cnf'].join} " \ + command 'umask 077 && ' \ + "openssl ca -config #{[node['openvpn']['fs_prefix'], '/etc/openvpn/easy-rsa/openssl.cnf'].join} " \ '-gencrl ' \ '-crlexts crl_ext ' \ "-md #{node['openvpn']['key']['message_digest']} " \ @@ -158,6 +161,7 @@ generate end action :run + notifies :create, "remote_file[#{[node['openvpn']['fs_prefix'], '/etc/openvpn/crl.pem'].join}]" end # Make a world readable copy of the CRL diff --git a/recipes/service.rb b/recipes/service.rb index 6274af60..38d12125 100644 --- a/recipes/service.rb +++ b/recipes/service.rb @@ -36,10 +36,10 @@ service_name = 'openvpn' end when 'fedora' - link "/etc/systemd/system/multi-user.target.wants/openvpn@#{node['openvpn']['type']}.service" do + link "/etc/systemd/system/multi-user.target.wants/openvpn-#{node['openvpn']['type']}@#{node['openvpn']['type']}.service" do to '/usr/lib/systemd/system/openvpn@.service' end - service_name = "openvpn@#{node['openvpn']['type']}.service" + service_name = "openvpn-#{node['openvpn']['type']}@#{node['openvpn']['type']}.service" when 'amazon' case node['platform_version'].to_i when 2 diff --git a/resources/conf.rb b/resources/conf.rb index 1d66082c..59e0c551 100644 --- a/resources/conf.rb +++ b/resources/conf.rb @@ -21,9 +21,10 @@ property :template_source, String, default: 'server.conf.erb' property :push_routes, Array property :push_options, Array +unified_mode true action :create do - conf_location = if platform_family?('rhel') && node['platform_version'].to_i >= 8 + conf_location = if (platform_family?('rhel') && node['platform_version'].to_i >= 8) || platform_family?('fedora') "/etc/openvpn/#{new_resource.name}/#{new_resource.name}.conf" else "/etc/openvpn/#{new_resource.name}.conf" diff --git a/resources/user.rb b/resources/user.rb index baa0eaa4..f7c9e876 100644 --- a/resources/user.rb +++ b/resources/user.rb @@ -9,6 +9,8 @@ property :destination, String property :additional_vars, Hash, default: {} +unified_mode true + # TODO: this action will not recreate if the client configuration data has # changed. Requires manual intervention. @@ -24,7 +26,7 @@ bundle_full_path = ::File.expand_path(::File.join(destination_path, bundle_filename)) execute "generate-openvpn-#{new_resource.client_name}" do - command "./pkitool #{new_resource.client_name}" + command "umask 077 && ./pkitool #{new_resource.client_name}" cwd '/etc/openvpn/easy-rsa' environment( 'EASY_RSA' => '/etc/openvpn/easy-rsa', @@ -40,6 +42,8 @@ 'KEY_EMAIL' => node['openvpn']['key']['email'] ) creates cert_path unless new_resource.force + notifies :run, 'execute[gencrl]', :immediately + notifies :create, "remote_file[#{[node['openvpn']['fs_prefix'], '/etc/openvpn/crl.pem'].join}]", :immediately end cleanup_name = "cleanup-old-bundle-#{new_resource.client_name}" @@ -83,7 +87,7 @@ cwd destination_path filelist = "ca.crt #{new_resource.client_name}.crt #{new_resource.client_name}.key #{client_file_basename}.ovpn" filelist += " #{client_file_basename}.conf" if new_resource.create_bundle - command "tar zcf #{bundle_filename} #{filelist}" + command "umask 077 && tar zcf #{bundle_filename} #{filelist}" creates bundle_full_path unless new_resource.force end end diff --git a/spec/unit/recipes/server_spec.rb b/spec/unit/recipes/server_spec.rb index 776957e8..27f650db 100644 --- a/spec/unit/recipes/server_spec.rb +++ b/spec/unit/recipes/server_spec.rb @@ -39,7 +39,7 @@ it 'executes gencrl with correction parameters' do expect(chef_run).to run_execute('gencrl').with( environment: { 'KEY_CN' => 'Fort Funston CA' }, - command: 'openssl ca -config /etc/openvpn/easy-rsa/openssl.cnf ' \ + command: 'umask 077 && openssl ca -config /etc/openvpn/easy-rsa/openssl.cnf ' \ '-gencrl ' \ '-crlexts crl_ext ' \ '-md sha256 ' \ diff --git a/test/integration/server/server_test.rb b/test/integration/server/server_test.rb index 1bdae1ee..b2874a35 100644 --- a/test/integration/server/server_test.rb +++ b/test/integration/server/server_test.rb @@ -1,17 +1,15 @@ # this is done in a similar fashion to # https://github.com/xhost-cookbooks/openvpn/blob/master/recipes/service.rb -if (os[:name] == 'redhat' && os[:release] >= '7') || - (os[:name] == 'centos' && os[:release] < '8') || - (os[:name] == 'debian' && os[:release] >= '8') || - (os[:name] == 'ubuntu' && os[:release] >= '15.04') || - (os[:name] == 'amazon' && os[:release] >= '2') || - (os[:name] == 'fedora') +if (os[:family] == 'redhat' && os[:release].to_i < 8) || + (os[:name] == 'debian') || + (os[:name] == 'ubuntu') || + (os[:name] == 'amazon') describe service('openvpn@server') do it { is_expected.to be_enabled } it { is_expected.to be_running } end -elsif os[:name] == 'centos' && os[:release] >= '8' +elsif (os[:family] == 'redhat' && os[:release] >= '8') || os[:family] == 'fedora' describe service('openvpn-server@server') do it { is_expected.to be_enabled } it { is_expected.to be_running } @@ -23,7 +21,7 @@ end end -conf_location = if os[:name] == 'centos' && os[:release] >= '8' +conf_location = if (os[:family] == 'redhat' && os[:release] >= '8') || os[:family] == 'fedora' '/etc/openvpn/server/server.conf' else '/etc/openvpn/server.conf' From d410f9d3e7fe8a0b44d419fab6a526a190b5033e Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 8 Feb 2022 08:53:09 -0800 Subject: [PATCH 06/81] Update changelog for 6.0.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed52fa25..8a45562e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 6.0.0 - *2022-02-08* - Remove delivery and move to calling RSpec directly via a reusable workflow - Update tested platforms From 28f0a253a8492dfe863de36be180a52c9773cce9 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 8 Feb 2022 08:53:09 -0800 Subject: [PATCH 07/81] Update metadata for 6.0.0 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index f0027c36..53c7e0f5 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '5.4.0' +version '6.0.0' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From cff377e537c48b1b8452b0b1d3191d2270e91ae3 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 8 Feb 2022 08:53:11 -0800 Subject: [PATCH 08/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a45562e..2efaaab1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 6.0.0 - *2022-02-08* - Remove delivery and move to calling RSpec directly via a reusable workflow From fb4b07a9da689652516135a7a034d8c2652f90cf Mon Sep 17 00:00:00 2001 From: David Headrick Date: Thu, 24 Feb 2022 14:04:28 -0800 Subject: [PATCH 09/81] Add properties to user resource for certificate creation (#198) * Add properties to user resource for cert creation Signed-off-by: David Headrick * Add configurable organizational unit within openssl template Signed-off-by: David Headrick * Update Changelog Signed-off-by: David Headrick * Added tests for user resource Signed-off-by: David Headrick * Style and test fixes Signed-off-by: David Headrick * Change server_verification test to match InSpec convention Signed-off-by: David Headrick * Condence key variables to key_vars hash... ... convert bash resources to execute resources Signed-off-by: David Headrick * Replace ternaries with ORs in user resource --- CHANGELOG.md | 2 + recipes/server.rb | 72 +++++++++++++------ recipes/users.rb | 9 +++ resources/user.rb | 25 +++---- spec/unit/recipes/server_spec.rb | 12 +++- templates/openssl.cnf.erb | 16 ++--- .../integration/data_bags/users/vpn_user.json | 9 ++- .../server_verification/default_test.rb | 10 +++ 8 files changed, 110 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2efaaab1..d8a46505 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +- Add certificate properties to user resource + ## 6.0.0 - *2022-02-08* - Remove delivery and move to calling RSpec directly via a reusable workflow diff --git a/recipes/server.rb b/recipes/server.rb index a30cd0c1..0177f609 100644 --- a/recipes/server.rb +++ b/recipes/server.rb @@ -98,31 +98,47 @@ action :create_if_missing end -bash 'openvpn-initca' do - environment('KEY_CN' => "#{node['openvpn']['key']['org']} CA") - code <<-EOF - umask 077 && \ - openssl req -batch -days #{node['openvpn']['key']['ca_expire']} \ - -nodes -new -newkey rsa:#{key_size} -#{message_digest} -x509 \ - -keyout #{node['openvpn']['signing_ca_key']} \ - -out #{node['openvpn']['signing_ca_cert']} \ - -config #{key_dir}/openssl.cnf - EOF +execute 'openvpn-initca' do + environment( + 'KEY_CN' => "#{node['openvpn']['key']['org']} CA", + 'KEY_EMAIL' => "#{node['openvpn']['key']['email']}", + 'KEY_COUNTRY' => "#{node['openvpn']['key']['country']}", + 'KEY_CITY' => "#{node['openvpn']['key']['city']}", + 'KEY_PROVINCE' => "#{node['openvpn']['key']['province']}", + 'KEY_DIR' => '/etc/openvpn/keys', + 'KEY_SIZE' => "#{node['openvpn']['key']['size']}", + 'KEY_ORG' => "#{node['openvpn']['key']['org']}", + 'KEY_OU' => 'OpenVPN Server' + ) + command 'umask 077 && ' \ + "openssl req -batch -days #{node['openvpn']['key']['ca_expire']} " \ + "-nodes -new -newkey rsa:#{key_size} -#{message_digest} -x509 " \ + "-keyout #{node['openvpn']['signing_ca_key']} " \ + "-out #{node['openvpn']['signing_ca_cert']} " \ + "-config #{key_dir}/openssl.cnf" not_if { ::File.exist?(node['openvpn']['signing_ca_cert']) } end -bash 'openvpn-server-key' do - environment('KEY_CN' => 'server') - code <<-EOF - umask 077 && \ - openssl req -batch -days #{node['openvpn']['key']['expire']} \ - -nodes -new -newkey rsa:#{key_size} -keyout #{key_dir}/server.key \ - -out #{key_dir}/server.csr -extensions server \ - -config #{key_dir}/openssl.cnf && \ - openssl ca -batch -days #{node['openvpn']['key']['ca_expire']} \ - -out #{key_dir}/server.crt -in #{key_dir}/server.csr \ - -extensions server -md #{message_digest} -config #{key_dir}/openssl.cnf - EOF +execute 'openvpn-server-key' do + environment( + 'KEY_CN' => 'server', + 'KEY_EMAIL' => "#{node['openvpn']['key']['email']}", + 'KEY_COUNTRY' => "#{node['openvpn']['key']['country']}", + 'KEY_CITY' => "#{node['openvpn']['key']['city']}", + 'KEY_PROVINCE' => "#{node['openvpn']['key']['province']}", + 'KEY_DIR' => '/etc/openvpn/keys', + 'KEY_SIZE' => "#{node['openvpn']['key']['size']}", + 'KEY_ORG' => "#{node['openvpn']['key']['org']}", + 'KEY_OU' => 'OpenVPN Server' + ) + command 'umask 077 && ' \ + "openssl req -batch -days #{node['openvpn']['key']['expire']} " \ + "-nodes -new -newkey rsa:#{key_size} -keyout #{key_dir}/server.key " \ + "-out #{key_dir}/server.csr -extensions server " \ + "-config #{key_dir}/openssl.cnf && " \ + "openssl ca -batch -days #{node['openvpn']['key']['ca_expire']} " \ + "-out #{key_dir}/server.crt -in #{key_dir}/server.csr " \ + "-extensions server -md #{message_digest} -config #{key_dir}/openssl.cnf" not_if { ::File.exist?("#{key_dir}/server.crt") } end @@ -137,7 +153,17 @@ end execute 'gencrl' do - environment('KEY_CN' => "#{node['openvpn']['key']['org']} CA") + environment( + 'KEY_CN' => "#{node['openvpn']['key']['org']} CA", + 'KEY_EMAIL' => "#{node['openvpn']['key']['email']}", + 'KEY_COUNTRY' => "#{node['openvpn']['key']['country']}", + 'KEY_CITY' => "#{node['openvpn']['key']['city']}", + 'KEY_PROVINCE' => "#{node['openvpn']['key']['province']}", + 'KEY_DIR' => '/etc/openvpn/keys', + 'KEY_SIZE' => "#{node['openvpn']['key']['size']}", + 'KEY_ORG' => "#{node['openvpn']['key']['org']}", + 'KEY_OU' => 'OpenVPN Server' + ) command 'umask 077 && ' \ "openssl ca -config #{[node['openvpn']['fs_prefix'], '/etc/openvpn/easy-rsa/openssl.cnf'].join} " \ '-gencrl ' \ diff --git a/recipes/users.rb b/recipes/users.rb index cdc5ffa4..8986fcda 100644 --- a/recipes/users.rb +++ b/recipes/users.rb @@ -20,6 +20,15 @@ if node['openvpn']['use_databag'] search(node['openvpn']['user_databag'], node['openvpn']['user_query']) do |u| openvpn_user u['id'] do + key_vars({ + 'key_country' => u['key_country'], + 'key_province' => u['key_province'], + 'key_city' => u['key_city'], + 'key_email' => u['key_email'], + 'key_size' => u['key_size'], + 'key_org' => u['key_org'], + 'key_org_unit' => u['key_org_unit'], + }) create_bundle true end end diff --git a/resources/user.rb b/resources/user.rb index f7c9e876..7b5df328 100644 --- a/resources/user.rb +++ b/resources/user.rb @@ -7,6 +7,7 @@ property :create_bundle, [true, false], default: true property :force, [true, false] property :destination, String +property :key_vars, Hash, default: {} property :additional_vars, Hash, default: {} unified_mode true @@ -15,7 +16,6 @@ # changed. Requires manual intervention. action :create do - # Setup some variables key_dir = node['openvpn']['key_dir'] cert_path = ::File.join(key_dir, "#{new_resource.client_name}.crt") ca_cert_path = ::File.join(key_dir, 'ca.crt') @@ -29,17 +29,18 @@ command "umask 077 && ./pkitool #{new_resource.client_name}" cwd '/etc/openvpn/easy-rsa' environment( - 'EASY_RSA' => '/etc/openvpn/easy-rsa', - 'KEY_CONFIG' => '/etc/openvpn/easy-rsa/openssl.cnf', - 'KEY_DIR' => key_dir, - 'CA_EXPIRE' => node['openvpn']['key']['ca_expire'].to_s, - 'KEY_EXPIRE' => node['openvpn']['key']['expire'].to_s, - 'KEY_SIZE' => node['openvpn']['key']['size'].to_s, - 'KEY_COUNTRY' => node['openvpn']['key']['country'], - 'KEY_PROVINCE' => node['openvpn']['key']['province'], - 'KEY_CITY' => node['openvpn']['key']['city'], - 'KEY_ORG' => node['openvpn']['key']['org'], - 'KEY_EMAIL' => node['openvpn']['key']['email'] + 'EASY_RSA' => '/etc/openvpn/easy-rsa', + 'KEY_CONFIG' => '/etc/openvpn/easy-rsa/openssl.cnf', + 'KEY_DIR' => key_dir, + 'CA_EXPIRE' => (new_resource.key_vars['ca_expire'] || node['openvpn']['key']['ca_expire']).to_s, + 'KEY_EXPIRE' => (new_resource.key_vars['key_expire'] || node['openvpn']['key']['expire']).to_s, + 'KEY_SIZE' => (new_resource.key_vars['key_size'] || node['openvpn']['key']['size']).to_s, + 'KEY_COUNTRY' => (new_resource.key_vars['key_country'] || node['openvpn']['key']['country']), + 'KEY_PROVINCE' => (new_resource.key_vars['key_province'] || node['openvpn']['key']['province']), + 'KEY_CITY' => (new_resource.key_vars['key_city'] || node['openvpn']['key']['city']), + 'KEY_ORG' => (new_resource.key_vars['key_org'] || node['openvpn']['key']['org']), + 'KEY_EMAIL' => (new_resource.key_vars['key_email'] || node['openvpn']['key']['email']), + 'KEY_OU' => (new_resource.key_vars['key_org_unit'] || 'OpenVPN Server') ) creates cert_path unless new_resource.force notifies :run, 'execute[gencrl]', :immediately diff --git a/spec/unit/recipes/server_spec.rb b/spec/unit/recipes/server_spec.rb index 27f650db..1559ba27 100644 --- a/spec/unit/recipes/server_spec.rb +++ b/spec/unit/recipes/server_spec.rb @@ -38,7 +38,17 @@ it 'executes gencrl with correction parameters' do expect(chef_run).to run_execute('gencrl').with( - environment: { 'KEY_CN' => 'Fort Funston CA' }, + environment: { + 'KEY_CITY' => 'San Francisco', + 'KEY_CN' => 'Fort Funston CA', + 'KEY_COUNTRY' => 'US', + 'KEY_DIR' => '/etc/openvpn/keys', + 'KEY_EMAIL' => 'admin@foobar.com', + 'KEY_ORG' => 'Fort Funston', + 'KEY_OU' => 'OpenVPN Server', + 'KEY_PROVINCE' => 'CA', + 'KEY_SIZE' => '2048', + }, command: 'umask 077 && openssl ca -config /etc/openvpn/easy-rsa/openssl.cnf ' \ '-gencrl ' \ '-crlexts crl_ext ' \ diff --git a/templates/openssl.cnf.erb b/templates/openssl.cnf.erb index 52e239f6..a6cd1739 100644 --- a/templates/openssl.cnf.erb +++ b/templates/openssl.cnf.erb @@ -9,7 +9,7 @@ engines = engine_section [ ca ] default_ca = CA_default [ CA_default ] -dir = <%= node['openvpn']['key_dir'] %> +dir = $ENV::KEY_DIR certs = $dir crl_dir = $dir database = $dir/index.txt @@ -42,7 +42,7 @@ organizationalUnitName = optional commonName = supplied emailAddress = optional [ req ] -default_bits = <%= node['openvpn']['key']['size'] %> +default_bits = $ENV::KEY_SIZE default_keyfile = privkey.pem distinguished_name = req_distinguished_name attributes = req_attributes @@ -50,22 +50,22 @@ x509_extensions = v3_ca string_mask = nombstr [ req_distinguished_name ] countryName = Country Name (2 letter code) -countryName_default = <%= node['openvpn']['key']['country'] %> +countryName_default = $ENV::KEY_COUNTRY countryName_min = 2 countryName_max = 2 stateOrProvinceName = State or Province Name (full name) -stateOrProvinceName_default = <%= node['openvpn']['key']['province'] %> +stateOrProvinceName_default = $ENV::KEY_PROVINCE localityName = Locality Name (eg, city) -localityName_default = <%= node['openvpn']['key']['city'] %> +localityName_default = $ENV::KEY_CITY 0.organizationName = Organization Name (eg, company) -0.organizationName_default = <%= node['openvpn']['key']['org'] %> +0.organizationName_default = $ENV::KEY_ORG organizationalUnitName = Organizational Unit Name (eg, section) commonName = Common Name (eg, your name or your server\'s hostname) commonName_max = 64 emailAddress = Email Address -emailAddress_default = <%= node['openvpn']['key']['email'] %> +emailAddress_default = $ENV::KEY_EMAIL emailAddress_max = 40 -organizationalUnitName_default = "OpenVPN Server" +organizationalUnitName_default = $ENV::KEY_OU commonName_default = $ENV::KEY_CN [ req_attributes ] challengePassword = A challenge password diff --git a/test/integration/data_bags/users/vpn_user.json b/test/integration/data_bags/users/vpn_user.json index 280c88a9..7d01da90 100644 --- a/test/integration/data_bags/users/vpn_user.json +++ b/test/integration/data_bags/users/vpn_user.json @@ -1,3 +1,10 @@ { - "id": "vpn_user" + "id": "vpn_user", + "key_country": "CA", + "key_province": "Ontario", + "key_city": "Ottawa", + "key_org": "Test Org", + "key_org_unit": "Test Org Unit", + "key_email": "vpn_user@test.com", + "key_size": "1024" } diff --git a/test/integration/server_verification/default_test.rb b/test/integration/server_verification/default_test.rb index f33ce512..fda64509 100644 --- a/test/integration/server_verification/default_test.rb +++ b/test/integration/server_verification/default_test.rb @@ -10,3 +10,13 @@ end end end + +describe file('/etc/openvpn/keys/vpn_user.crt') do + its('content') { should match /C=CA/ } + its('content') { should match /ST=Ontario/ } + its('content') { should match /L=Ottawa/ } + its('content') { should match /O=Test Org/ } + its('content') { should match /OU=Test Org Unit/ } + its('content') { should match %r{CN=vpn_user/emailAddress=vpn_user@test.com} } + its('content') { should match /Public-Key: \(1024 bit\)/ } +end From d700b6ef85bd2e57a244bf431a23afeeff817e73 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:04:30 -0800 Subject: [PATCH 10/81] Update changelog for 6.1.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8a46505..4831c42c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 6.1.0 - *2022-02-24* - Add certificate properties to user resource From 978133faf1330ce2214ae1fe30fd4600bc3d8eef Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:04:31 -0800 Subject: [PATCH 11/81] Update metadata for 6.1.0 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 53c7e0f5..46bff900 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '6.0.0' +version '6.1.0' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From a2e827af83e00850eb6269aca48fd04758f1dc8b Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:04:33 -0800 Subject: [PATCH 12/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4831c42c..4d405ba3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 6.1.0 - *2022-02-24* - Add certificate properties to user resource From 887d85da7bde3b962548fcd25c9f3839cef2b235 Mon Sep 17 00:00:00 2001 From: David Headrick Date: Sat, 7 May 2022 02:22:01 -0700 Subject: [PATCH 13/81] Remove comp-lzo option as default (#202) Signed-off-by: David Headrick --- CHANGELOG.md | 2 ++ attributes/default.rb | 1 - templates/Rakefile.erb | 1 - templates/client-inline.conf.erb | 1 - templates/client.conf.erb | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d405ba3..27cd3a39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +- Remove comp-lzo as a default option + ## 6.1.0 - *2022-02-24* - Add certificate properties to user resource diff --git a/attributes/default.rb b/attributes/default.rb index 252a58fc..4eec575c 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -91,7 +91,6 @@ default['openvpn']['config']['up'] = [node['openvpn']['fs_prefix'], '/etc/openvpn/server.up.sh'].join default['openvpn']['config']['persist-key'] = '' default['openvpn']['config']['persist-tun'] = '' -default['openvpn']['config']['comp-lzo'] = '' default['openvpn']['config']['ca'] = node['openvpn']['signing_ca_cert'] default['openvpn']['config']['key'] = "#{node['openvpn']['key_dir']}/server.key" diff --git a/templates/Rakefile.erb b/templates/Rakefile.erb index d5ba6bb0..4b7d9374 100644 --- a/templates/Rakefile.erb +++ b/templates/Rakefile.erb @@ -56,7 +56,6 @@ persist-tun ca ca.crt cert #{usercn}.crt key #{usercn}.key -comp-lzo verb 3 <% if node['openvpn']['server_verification'] %> <%= node['openvpn']['server_verification'] %> diff --git a/templates/client-inline.conf.erb b/templates/client-inline.conf.erb index 0b7e4eb9..3be80baf 100644 --- a/templates/client-inline.conf.erb +++ b/templates/client-inline.conf.erb @@ -12,7 +12,6 @@ resolv-retry infinite nobind persist-key persist-tun -comp-lzo verb 3 <%= @ca -%> diff --git a/templates/client.conf.erb b/templates/client.conf.erb index e75eff6a..860250d2 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -15,7 +15,6 @@ persist-tun ca ca.crt cert <%= @client_cn %>.crt key <%= @client_cn %>.key -comp-lzo verb 3 <% if node['openvpn']['server_verification'] %> <%= node['openvpn']['server_verification'] %> From 53401cdc592254a21e0a61841febf20d2c851463 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 7 May 2022 02:22:04 -0700 Subject: [PATCH 14/81] Update changelog for 7.0.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27cd3a39..cc252aa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.0 - *2022-05-07* - Remove comp-lzo as a default option From d1dc612d7ef39274b561c4d1e1488cd0d93cd711 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 7 May 2022 02:22:04 -0700 Subject: [PATCH 15/81] Update metadata for 7.0.0 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 46bff900..728174ab 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '6.1.0' +version '7.0.0' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 50371969df1dbf4e972cbad9eb13d5e05d075323 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 7 May 2022 02:22:09 -0700 Subject: [PATCH 16/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc252aa3..f8229490 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.0 - *2022-05-07* - Remove comp-lzo as a default option From ed32b305540fb98d7cb5e2d3540fb2aada4c1711 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 16 May 2022 05:39:34 -0700 Subject: [PATCH 17/81] Standardise files with files in sous-chefs/repo-management (#201) Signed-off-by: kitchen-porter Co-authored-by: Dan Webb --- CHANGELOG.md | 2 ++ chefignore | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8229490..3be2bbac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +- Standardise files with files in sous-chefs/repo-management + ## 7.0.0 - *2022-05-07* - Remove comp-lzo as a default option diff --git a/chefignore b/chefignore index cc170ea7..a27b0b25 100644 --- a/chefignore +++ b/chefignore @@ -61,7 +61,7 @@ Dangerfile examples/* features/* Guardfile -kitchen.yml* +kitchen*.yml mlc_config.json Procfile Rakefile From bbe4a68ef0d81088dcf33bc92748bdb4d2ae3004 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 16 May 2022 05:39:36 -0700 Subject: [PATCH 18/81] Update changelog for 7.0.1 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3be2bbac..388e35bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.1 - *2022-05-16* - Standardise files with files in sous-chefs/repo-management From 3ec5faa5c005edfce410f85b263dbf34058e0f69 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 16 May 2022 05:39:37 -0700 Subject: [PATCH 19/81] Update metadata for 7.0.1 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 728174ab..727dda7c 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.0' +version '7.0.1' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From ae685167140973b7b98c9e4c152f3734d15925ad Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 16 May 2022 05:39:39 -0700 Subject: [PATCH 20/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 388e35bb..9a97efb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.1 - *2022-05-16* - Standardise files with files in sous-chefs/repo-management From f8fe7f7e585f05168c5a63d95c136937d6ee3c79 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 8 Dec 2022 18:17:39 -0800 Subject: [PATCH 21/81] Standardise files with files in sous-chefs/repo-management (#203) --- .github/workflows/md-links.yml | 2 +- CHANGELOG.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/md-links.yml b/.github/workflows/md-links.yml index ba887a16..13a60f3a 100644 --- a/.github/workflows/md-links.yml +++ b/.github/workflows/md-links.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: markdown-link-check uses: gaurav-nelson/github-action-markdown-link-check@v1 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a97efb8..4a7e16ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +Standardise files with files in sous-chefs/repo-management + ## 7.0.1 - *2022-05-16* - Standardise files with files in sous-chefs/repo-management From cbc32e4ae8fa2207e046b24e3aab1e8e29262a57 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 8 Dec 2022 18:17:42 -0800 Subject: [PATCH 22/81] Update changelog for 7.0.2 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a7e16ae..5d993fe2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.2 - *2022-12-09* Standardise files with files in sous-chefs/repo-management From ee06f852f8e029f38e78682ef6c09adc93f474f7 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 8 Dec 2022 18:17:43 -0800 Subject: [PATCH 23/81] Update metadata for 7.0.2 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 727dda7c..99135b4f 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.1' +version '7.0.2' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 3d4545998834c9735cbdbb1057b6bb5adcb7a653 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 8 Dec 2022 18:17:45 -0800 Subject: [PATCH 24/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d993fe2..75a0ce06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.2 - *2022-12-09* Standardise files with files in sous-chefs/repo-management From 905f5ed1a7134d3ea32258e05e3c191df41e1033 Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Tue, 14 Feb 2023 09:26:12 +0000 Subject: [PATCH 25/81] Remove CircleCI (#205) --- .circleci/config.yml | 10 ---------- .github/workflows/ci.yml | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 25 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 8af810ef..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -version: 2.1 -orbs: - kitchen: sous-chefs/kitchen@2 -workflows: - danger: - jobs: - - kitchen/danger: - name: danger - context: Danger-Minimal diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 134b5b14..939fdde6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,29 +17,29 @@ jobs: strategy: matrix: os: - - 'almalinux-8' - - 'amazonlinux-2' - - 'centos-7' - - 'centos-stream-8' - - 'debian-10' - - 'debian-11' - - 'fedora-latest' - - 'rockylinux-8' - - 'ubuntu-1804' - - 'ubuntu-2004' + - "almalinux-8" + - "amazonlinux-2" + - "centos-7" + - "centos-stream-8" + - "debian-10" + - "debian-11" + - "fedora-latest" + - "rockylinux-8" + - "ubuntu-1804" + - "ubuntu-2004" suite: - - 'server' - - 'server-verification' - - 'server-verify-no-databag' + - "server" + - "server-verification" + - "server-verify-no-databag" fail-fast: false steps: - name: Check out code uses: actions/checkout@v2 - name: Install Chef - uses: actionshub/chef-install@main + uses: actionshub/chef-install@2.0.4 - name: Dokken - uses: actionshub/test-kitchen@main + uses: actionshub/test-kitchen@2.1.0 env: CHEF_LICENSE: accept-no-persist KITCHEN_LOCAL_YAML: kitchen.dokken.yml From 67fc8e07dc522af5b4c89401b1e7e90ad472f912 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:18:37 +0000 Subject: [PATCH 26/81] Standardise files with files in sous-chefs/repo-management (#206) Signed-off-by: kitchen-porter --- CHANGELOG.md | 2 ++ renovate.json | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 renovate.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 75a0ce06..106554aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +Standardise files with files in sous-chefs/repo-management + ## 7.0.2 - *2022-12-09* Standardise files with files in sous-chefs/repo-management diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..7e7a8bad --- /dev/null +++ b/renovate.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["config:base"], + "packageRules": [{ + "groupName": "Actions", + "matchUpdateTypes": ["patch", "pin", "digest"], + "automerge": true, + "addLabels": ["Release: Patch", "Skip: Announcements"] + }, + { + "groupName": "Actions", + "matchUpdateTypes": ["major"], + "automerge": false, + "addLabels": ["Release: Patch", "Skip: Announcements"] + } + ] +} From 968b27147f3103061dfca855e1ed3482c2799a0a Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:18:41 +0000 Subject: [PATCH 27/81] Update changelog for 7.0.3 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 106554aa..251f6489 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.3 - *2023-02-15* Standardise files with files in sous-chefs/repo-management From 5f5171396ab8a9d32529a8c45a63f1dd1da3c30a Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:18:42 +0000 Subject: [PATCH 28/81] Update metadata for 7.0.3 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 99135b4f..090a755d 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.2' +version '7.0.3' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 96ee612f4434d64f45ce77dbb329e9bd047210cb Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 15 Feb 2023 15:18:47 +0000 Subject: [PATCH 29/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 251f6489..86ebcd88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.3 - *2023-02-15* Standardise files with files in sous-chefs/repo-management From cb0cedb92a43525a5496a315419f9218b1f49cad Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:36:03 +0000 Subject: [PATCH 30/81] Standardise files with files in sous-chefs/repo-management (#209) Signed-off-by: kitchen-porter --- .github/workflows/md-links.yml | 2 +- .github/workflows/stale.yml | 2 +- CHANGELOG.md | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/md-links.yml b/.github/workflows/md-links.yml index 13a60f3a..5577dd1c 100644 --- a/.github/workflows/md-links.yml +++ b/.github/workflows/md-links.yml @@ -13,7 +13,7 @@ jobs: - name: Check out code uses: actions/checkout@v3 - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1 + uses: gaurav-nelson/github-action-markdown-link-check@v1.0.13 with: use-verbose-mode: "yes" folder-path: "documentation" diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 9e2ff38e..19d86dbe 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -8,7 +8,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v3 + - uses: actions/stale@v7 with: repo-token: ${{ secrets.GITHUB_TOKEN }} close-issue-message: > diff --git a/CHANGELOG.md b/CHANGELOG.md index 86ebcd88..d83149f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +Standardise files with files in sous-chefs/repo-management + ## 7.0.3 - *2023-02-15* Standardise files with files in sous-chefs/repo-management From bb92135b8d434485f939b465e2c6f9a5b0bf177b Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:36:07 +0000 Subject: [PATCH 31/81] Update changelog for 7.0.4 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d83149f0..8a73b30f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.4 - *2023-02-16* Standardise files with files in sous-chefs/repo-management From 490cc3d572cbf7778e1db633130e0ff5d4ec5044 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:36:07 +0000 Subject: [PATCH 32/81] Update metadata for 7.0.4 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 090a755d..7df45f74 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.3' +version '7.0.4' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 81d375fca59e1a63008fca8429634030682089a4 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:36:10 +0000 Subject: [PATCH 33/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a73b30f..d74b7ff3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.4 - *2023-02-16* Standardise files with files in sous-chefs/repo-management From 885e76f9305c085dd694378eb91212403dd1196c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:46:51 +0000 Subject: [PATCH 34/81] Update actions/checkout action to v3 (#207) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 939fdde6..cdfcadaf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install Chef uses: actionshub/chef-install@2.0.4 - name: Dokken From 0b074dc4411c3f8feef32e6079082b7f2bed6754 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:46:54 +0000 Subject: [PATCH 35/81] Update changelog for 7.0.5 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d74b7ff3..fcdd8a1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.5 - *2023-02-16* ## 7.0.4 - *2023-02-16* From ff09560d6203e6445d56678181b08ecff4f6cf2c Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:46:55 +0000 Subject: [PATCH 36/81] Update metadata for 7.0.5 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 7df45f74..c4635d93 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.4' +version '7.0.5' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From f6f790fe247b400543a58ac4fee44d66345756bd Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:46:57 +0000 Subject: [PATCH 37/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcdd8a1b..ad6814dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.5 - *2023-02-16* ## 7.0.4 - *2023-02-16* From 838d07906d1107e323fa139dc77216052736e104 Mon Sep 17 00:00:00 2001 From: Dan Webb Date: Wed, 1 Mar 2023 15:08:37 +0000 Subject: [PATCH 38/81] [skip-ci] Update workflows! (#212) --- .github/workflows/ci.yml | 2 +- .github/workflows/md-links.yml | 19 ------------------- .markdownlint-cli2.yaml | 5 +++++ CHANGELOG.md | 3 +++ 4 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/md-links.yml create mode 100644 .markdownlint-cli2.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdfcadaf..d247e060 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ name: ci jobs: lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@0.0.3 + uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.1 integration: needs: lint-unit diff --git a/.github/workflows/md-links.yml b/.github/workflows/md-links.yml deleted file mode 100644 index 5577dd1c..00000000 --- a/.github/workflows/md-links.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: md-links - -"on": - pull_request: - push: - branches: [main] - -jobs: - md-links: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v3 - - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@v1.0.13 - with: - use-verbose-mode: "yes" - folder-path: "documentation" diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml new file mode 100644 index 00000000..ce8cafbf --- /dev/null +++ b/.markdownlint-cli2.yaml @@ -0,0 +1,5 @@ +config: + ul-indent: false # MD007 + line-length: false # MD013 + no-duplicate-heading/no-duplicate-header: false # MD024 + diff --git a/CHANGELOG.md b/CHANGELOG.md index ad6814dc..a2bf40ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +- Switch from mdl to markdownlint-cli2 +- Update workflows + ## 7.0.5 - *2023-02-16* ## 7.0.4 - *2023-02-16* From 22079b036f3b5ac9aaa27d99c5abbf9ca27909b3 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 1 Mar 2023 15:08:44 +0000 Subject: [PATCH 39/81] Update changelog for 7.0.6 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2bf40ff..6a643e74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.6 - *2023-03-01* - Switch from mdl to markdownlint-cli2 - Update workflows From 28a2b51bb7d794ad0080bf93bceab6d132e3e62a Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 1 Mar 2023 15:08:45 +0000 Subject: [PATCH 40/81] Update metadata for 7.0.6 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index c4635d93..afbf7292 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.5' +version '7.0.6' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 8cf81edb6d298cd09da7c8f3ad0387a6f5200d24 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 1 Mar 2023 15:08:47 +0000 Subject: [PATCH 41/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a643e74..3ad0725b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.6 - *2023-03-01* - Switch from mdl to markdownlint-cli2 From c9f6263bc93a5fa58c39218f2b151c671c11181e Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:05:21 +0000 Subject: [PATCH 42/81] Automated PR: Standardising Files This PR will standardise the files we have with out agreed spec in sous-chefs/repo-management. This repo has been identified by topic(s) of chef-cookbook --- .github/workflows/md-links.yml | 19 +++++++++++++++++++ .vscode/extensions.json | 7 ++++--- .yamllint | 2 ++ CHANGELOG.md | 2 ++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/md-links.yml diff --git a/.github/workflows/md-links.yml b/.github/workflows/md-links.yml new file mode 100644 index 00000000..208cb1a2 --- /dev/null +++ b/.github/workflows/md-links.yml @@ -0,0 +1,19 @@ +--- +name: md-links + +"on": + pull_request: + push: + branches: [main] + +jobs: + md-links: + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v3 + - name: markdown-link-check + uses: gaurav-nelson/github-action-markdown-link-check@1.0.13 + with: + use-verbose-mode: "yes" + folder-path: "documentation" diff --git a/.vscode/extensions.json b/.vscode/extensions.json index cd777250..51d0ae7a 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,8 @@ { "recommendations": [ - "chef-software.chef", - "rebornix.ruby", - "editorconfig.editorconfig" + "chef-software.chef", + "rebornix.ruby", + "editorconfig.editorconfig", + "DavidAnson.vscode-markdownlint" ] } diff --git a/.yamllint b/.yamllint index 1b5cea09..0046b237 100644 --- a/.yamllint +++ b/.yamllint @@ -11,3 +11,5 @@ rules: max-spaces-inside: 1 min-spaces-inside-empty: -1 max-spaces-inside-empty: -1 + comments: + min-spaces-from-content: 1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ad0725b..23abb30c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +Standardise files with files in sous-chefs/repo-management + ## 7.0.6 - *2023-03-01* - Switch from mdl to markdownlint-cli2 From 50615caf9b459e506904e3643d7e91bcd3ffb664 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:05:25 +0000 Subject: [PATCH 43/81] Update changelog for 7.0.7 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23abb30c..413409cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.7 - *2023-03-15* Standardise files with files in sous-chefs/repo-management From d9cbda9d23ff3004046391125d86d36664006549 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:05:26 +0000 Subject: [PATCH 44/81] Update metadata for 7.0.7 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index afbf7292..3cf05b4e 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.6' +version '7.0.7' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 90f75b8ebf77cb9181ba2fbf5695396b356f3194 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:05:29 +0000 Subject: [PATCH 45/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 413409cb..9213d28e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.7 - *2023-03-15* Standardise files with files in sous-chefs/repo-management From e6db5638727355688afd497ae8454d36515e60ac Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:11:35 +0000 Subject: [PATCH 46/81] Automated PR: Standardising Files [skip ci] This PR will standardise the files we have with out agreed spec in sous-chefs/repo-management. This repo has been identified by topic(s) of chef-cookbook --- .markdownlint-cli2.yaml | 3 +-- CHANGELOG.md | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml index ce8cafbf..0cb05b41 100644 --- a/.markdownlint-cli2.yaml +++ b/.markdownlint-cli2.yaml @@ -1,5 +1,4 @@ config: ul-indent: false # MD007 line-length: false # MD013 - no-duplicate-heading/no-duplicate-header: false # MD024 - + no-duplicate-heading: false # MD024 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9213d28e..f9ecdade 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +Standardise files with files in sous-chefs/repo-management + ## 7.0.7 - *2023-03-15* Standardise files with files in sous-chefs/repo-management From 5296605de8cbf4d24144665bc5ed6c32fdb67a96 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:11:39 +0000 Subject: [PATCH 47/81] Update changelog for 7.0.8 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9ecdade..0a20292c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.8 - *2023-03-20* Standardise files with files in sous-chefs/repo-management From 1b2366f4c36c2b0375ffa103a59e920bd7fa2873 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:11:39 +0000 Subject: [PATCH 48/81] Update metadata for 7.0.8 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 3cf05b4e..094eddae 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.7' +version '7.0.8' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 1ed1d7fe7ef26e8d589517821e6191b5a4701966 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:11:42 +0000 Subject: [PATCH 49/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a20292c..bfa6fddd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.8 - *2023-03-20* Standardise files with files in sous-chefs/repo-management From 7b99b9815042e37dc0f051331ebd92033a5875ca Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 08:18:22 +0100 Subject: [PATCH 50/81] Automated PR: Standardising Files [skip ci] This PR will standardise the files we have with out agreed spec in sous-chefs/repo-management. This repo has been identified by topic(s) of chef-cookbook --- .markdownlint-cli2.yaml | 1 + CHANGELOG.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml index 0cb05b41..6fa8e776 100644 --- a/.markdownlint-cli2.yaml +++ b/.markdownlint-cli2.yaml @@ -2,3 +2,4 @@ config: ul-indent: false # MD007 line-length: false # MD013 no-duplicate-heading: false # MD024 + reference-links-images: false # MD052 diff --git a/CHANGELOG.md b/CHANGELOG.md index bfa6fddd..9f992fee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +Standardise files with files in sous-chefs/repo-management + ## 7.0.8 - *2023-03-20* Standardise files with files in sous-chefs/repo-management From d33fc8fa65f8c3d516d1a07b2c0b724893f63dce Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 08:18:25 +0100 Subject: [PATCH 51/81] Update changelog for 7.0.9 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f992fee..1c100b4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.9 - *2023-04-01* Standardise files with files in sous-chefs/repo-management From a5a59eda37b44ba15fa7045395b6e0baa4362c8c Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 08:18:26 +0100 Subject: [PATCH 52/81] Update metadata for 7.0.9 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 094eddae..63b3d1c7 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.8' +version '7.0.9' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 66251b350375e7b1cebe0eb65f81e6e7e33c5e2d Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 08:18:28 +0100 Subject: [PATCH 53/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c100b4d..9dcbd95a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.9 - *2023-04-01* Standardise files with files in sous-chefs/repo-management From f167334cdf195b7a61e20f965b3cfc30bca523b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 20:44:20 +0800 Subject: [PATCH 54/81] Update actions/stale action to v8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/stale](https://togithub.com/actions/stale) | action | major | `v7` -> `v8` | --- ### Release Notes
actions/stale ### [`v8`](https://togithub.com/actions/stale/compare/v7...v8) [Compare Source](https://togithub.com/actions/stale/compare/v7...v8)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/sous-chefs/openvpn). --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 19d86dbe..4bb59c62 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -8,7 +8,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v7 + - uses: actions/stale@v8 with: repo-token: ${{ secrets.GITHUB_TOKEN }} close-issue-message: > From cdcf746fafdad2c8e0868ca1e22618212c382b36 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 13:44:23 +0100 Subject: [PATCH 55/81] Update changelog for 7.0.10 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dcbd95a..330e161c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.10 - *2023-04-01* ## 7.0.9 - *2023-04-01* From dacb222c455f9e1aa67b5a3e4445ec5ad358ce2b Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 13:44:24 +0100 Subject: [PATCH 56/81] Update metadata for 7.0.10 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 63b3d1c7..1d169612 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.9' +version '7.0.10' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From fa8904cb04394654d995be9231a415da673fd706 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 13:44:26 +0100 Subject: [PATCH 57/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 330e161c..98949922 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.10 - *2023-04-01* ## 7.0.9 - *2023-04-01* From 76a5867904601051b0749d77e883450526da78ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 20:51:45 +0800 Subject: [PATCH 58/81] Update gaurav-nelson/github-action-markdown-link-check action to v1.0.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip ci] [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [gaurav-nelson/github-action-markdown-link-check](https://togithub.com/gaurav-nelson/github-action-markdown-link-check) | action | patch | `1.0.13` -> `1.0.15` | --- ### Release Notes
gaurav-nelson/github-action-markdown-link-check ### [`v1.0.15`](https://togithub.com/gaurav-nelson/github-action-markdown-link-check/releases/tag/1.0.15) [Compare Source](https://togithub.com/gaurav-nelson/github-action-markdown-link-check/compare/1.0.14...1.0.15) ##### Changes - [https://github.com/gaurav-nelson/github-action-markdown-link-check/pull/168](https://togithub.com/gaurav-nelson/github-action-markdown-link-check/pull/168) - Respect folder-path when check-modified-files-only == yes: Thank you [@​exoego](https://togithub.com/exoego) Thank you [@​mgrojo](https://togithub.com/mgrojo) [@​qaristote](https://togithub.com/qaristote) [@​RezaRahemtola](https://togithub.com/RezaRahemtola) for minor typo fixes. ### [`v1.0.14`](https://togithub.com/gaurav-nelson/github-action-markdown-link-check/releases/tag/1.0.14) [Compare Source](https://togithub.com/gaurav-nelson/github-action-markdown-link-check/compare/1.0.13...1.0.14) ### Important ‼️ This version is in beta. Use `1.0.13` or `v1` which are the stable versions. *** ##### Changes - [https://github.com/gaurav-nelson/github-action-markdown-link-check/pull/116](https://togithub.com/gaurav-nelson/github-action-markdown-link-check/pull/116) - Changed the base image to more stage Node image `node:lts-alpine` - [https://github.com/gaurav-nelson/github-action-markdown-link-check/pull/126](https://togithub.com/gaurav-nelson/github-action-markdown-link-check/pull/126) - Use markdown-link-check version 3.9.3 - [https://github.com/gaurav-nelson/github-action-markdown-link-check/pull/148](https://togithub.com/gaurav-nelson/github-action-markdown-link-check/pull/148) - Fully disable the Git ownership check - [https://github.com/gaurav-nelson/github-action-markdown-link-check/pull/144](https://togithub.com/gaurav-nelson/github-action-markdown-link-check/pull/144) - Update markdown-lint-check to v3.10.2 Thank you [@​thanethomson](https://togithub.com/thanethomson) [@​edumco](https://togithub.com/edumco) [@​Pandapip1](https://togithub.com/Pandapip1) [@​creachadair](https://togithub.com/creachadair) [@​bogdandrutu](https://togithub.com/bogdandrutu)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/sous-chefs/openvpn). --- .github/workflows/md-links.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/md-links.yml b/.github/workflows/md-links.yml index 208cb1a2..e5c1e7a2 100644 --- a/.github/workflows/md-links.yml +++ b/.github/workflows/md-links.yml @@ -13,7 +13,7 @@ jobs: - name: Check out code uses: actions/checkout@v3 - name: markdown-link-check - uses: gaurav-nelson/github-action-markdown-link-check@1.0.13 + uses: gaurav-nelson/github-action-markdown-link-check@1.0.15 with: use-verbose-mode: "yes" folder-path: "documentation" From 714ba021543019f637e2611f2bea93b57069ce40 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 13:51:48 +0100 Subject: [PATCH 59/81] Update changelog for 7.0.11 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98949922..1192da42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.11 - *2023-04-01* ## 7.0.10 - *2023-04-01* From 63cf65841c3ac6c246ed6361664be1c2f5fd0d36 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 13:51:48 +0100 Subject: [PATCH 60/81] Update metadata for 7.0.11 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 1d169612..59f6705f 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.10' +version '7.0.11' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From a98be8bf0edb2b2c2bef2b61338ec7d7cd458cc5 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Sat, 1 Apr 2023 13:51:50 +0100 Subject: [PATCH 61/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1192da42..69bcb74c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.11 - *2023-04-01* ## 7.0.10 - *2023-04-01* From 22eae26e139e729bbe517b515bb43db502a994fe Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Fri, 7 Apr 2023 06:00:43 +0100 Subject: [PATCH 62/81] Automated PR: Standardising Files [skip ci] This PR will standardise the files we have with out agreed spec in sous-chefs/repo-management. This repo has been identified by topic(s) of chef-cookbook --- .overcommit.yml | 14 ++++-- CHANGELOG.md | 2 + kitchen.dokken.yml | 113 +++++++++++++++++++++++++++++++++++++++++++++ kitchen.exec.yml | 7 +++ kitchen.global.yml | 38 +++++++++++++++ 5 files changed, 171 insertions(+), 3 deletions(-) create mode 100644 kitchen.dokken.yml create mode 100644 kitchen.exec.yml create mode 100644 kitchen.global.yml diff --git a/.overcommit.yml b/.overcommit.yml index cd8682a0..0e89a3c1 100644 --- a/.overcommit.yml +++ b/.overcommit.yml @@ -4,13 +4,21 @@ PreCommit: enabled: true YamlLint: enabled: true - Rspec: + required_executable: "yamllint" + ChefSpec: enabled: true - required_executable: 'rspec' + required_executable: "chef" + command: ["chef", "exec", "rspec"] Cookstyle: enabled: true - required_executable: 'cookstyle' + required_executable: "cookstyle" command: ["cookstyle"] + MarkdownLint: + enabled: false + required_executable: "npx" + command: ["npx", "markdownlint-cli2", "'**/*.md'"] + include: ["**/*.md"] + CommitMsg: HardTabs: enabled: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 69bcb74c..f2df1c7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the openvpn cookbook. ## Unreleased +Standardise files with files in sous-chefs/repo-management + ## 7.0.11 - *2023-04-01* ## 7.0.10 - *2023-04-01* diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml new file mode 100644 index 00000000..47eff95d --- /dev/null +++ b/kitchen.dokken.yml @@ -0,0 +1,113 @@ +driver: + name: dokken + privileged: true + chef_version: <%= ENV['CHEF_VERSION'] || 'current' %> + +transport: { name: dokken } +provisioner: { name: dokken } + +platforms: + - name: almalinux-8 + driver: + image: dokken/almalinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: almalinux-9 + driver: + image: dokken/almalinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: amazonlinux-2023 + driver: + image: dokken/amazonlinux-2023 + pid_one_command: /usr/lib/systemd/systemd + + - name: centos-7 + driver: + image: dokken/centos-7 + pid_one_command: /usr/lib/systemd/systemd + + - name: centos-stream-8 + driver: + image: dokken/centos-stream-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: centos-stream-9 + driver: + image: dokken/centos-stream-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: debian-9 + driver: + image: dokken/debian-9 + pid_one_command: /bin/systemd + + - name: debian-10 + driver: + image: dokken/debian-10 + pid_one_command: /bin/systemd + + - name: debian-11 + driver: + image: dokken/debian-11 + pid_one_command: /bin/systemd + + - name: debian-12 + driver: + image: dokken/debian-12 + pid_one_command: /bin/systemd + + - name: fedora-latest + driver: + image: dokken/fedora-latest + pid_one_command: /usr/lib/systemd/systemd + + - name: opensuse-leap-15 + driver: + image: dokken/opensuse-leap-15 + pid_one_command: /usr/lib/systemd/systemd + + - name: oraclelinux-7 + driver: + image: dokken/oraclelinux-7 + pid_one_command: /usr/lib/systemd/systemd + + - name: oraclelinux-8 + driver: + image: dokken/oraclelinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: oraclelinux-9 + driver: + image: dokken/oraclelinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: rockylinux-8 + driver: + image: dokken/rockylinux-8 + pid_one_command: /usr/lib/systemd/systemd + + - name: rockylinux-9 + driver: + image: dokken/rockylinux-9 + pid_one_command: /usr/lib/systemd/systemd + + - name: ubuntu-18.04 + driver: + image: dokken/ubuntu-18.04 + pid_one_command: /bin/systemd + + - name: ubuntu-20.04 + driver: + image: dokken/ubuntu-20.04 + pid_one_command: /bin/systemd + + - name: ubuntu-22.04 + driver: + image: dokken/ubuntu-22.04 + pid_one_command: /bin/systemd + + - name: ubuntu-23.04 + driver: + image: dokken/ubuntu-23.04 + pid_one_command: /bin/systemd diff --git a/kitchen.exec.yml b/kitchen.exec.yml new file mode 100644 index 00000000..ba7b2a96 --- /dev/null +++ b/kitchen.exec.yml @@ -0,0 +1,7 @@ +--- +driver: { name: exec } +transport: { name: exec } + +platforms: + - name: macos-latest + - name: windows-latest diff --git a/kitchen.global.yml b/kitchen.global.yml new file mode 100644 index 00000000..a382fcd0 --- /dev/null +++ b/kitchen.global.yml @@ -0,0 +1,38 @@ +--- +provisioner: + name: chef_infra + product_name: chef + product_version: <%= ENV['CHEF_VERSION'] || 'latest' %> + channel: stable + install_strategy: once + chef_license: accept + enforce_idempotency: <%= ENV['ENFORCE_IDEMPOTENCY'] || true %> + multiple_converge: <%= ENV['MULTIPLE_CONVERGE'] || 2 %> + deprecations_as_errors: true + log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %> + +verifier: + name: inspec + +platforms: + - name: almalinux-8 + - name: almalinux-9 + - name: amazonlinux-2023 + - name: centos-7 + - name: centos-stream-8 + - name: centos-stream-9 + - name: debian-9 + - name: debian-10 + - name: debian-11 + - name: debian-12 + - name: fedora-latest + - name: opensuse-leap-15 + - name: oraclelinux-7 + - name: oraclelinux-8 + - name: oraclelinux-9 + - name: rockylinux-8 + - name: rockylinux-9 + - name: ubuntu-18.04 + - name: ubuntu-20.04 + - name: ubuntu-22.04 + - name: ubuntu-23.04 From 06b5b0db214dbcdc4322e77ce09cba9aa0cefaf3 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Fri, 7 Apr 2023 06:00:47 +0100 Subject: [PATCH 63/81] Update changelog for 7.0.12 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2df1c7e..948e5a92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.12 - *2023-04-07* Standardise files with files in sous-chefs/repo-management From 702d08e36110c113315edceae1777c30aa536fbe Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Fri, 7 Apr 2023 06:00:47 +0100 Subject: [PATCH 64/81] Update metadata for 7.0.12 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 59f6705f..c15296c9 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.11' +version '7.0.12' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 788a4ec684a18e94aa4eb574c92339718aa00928 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Fri, 7 Apr 2023 06:00:50 +0100 Subject: [PATCH 65/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 948e5a92..eef36e6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.12 - *2023-04-07* Standardise files with files in sous-chefs/repo-management From 4c867768729ccba8b12c326830a775a68e0ecd7d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Apr 2023 12:42:24 +0100 Subject: [PATCH 66/81] Update sous-chefs/.github action to v2.0.2 (#220) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d247e060..32b24803 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ name: ci jobs: lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.1 + uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.2 integration: needs: lint-unit From 72886cfc0a7e357612f31cd0c1c42002768ffb05 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 17 Apr 2023 12:42:28 +0100 Subject: [PATCH 67/81] Update changelog for 7.0.13 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef36e6c..ca422d36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.13 - *2023-04-17* ## 7.0.12 - *2023-04-07* From 3833be2acf79d01b99ce1fdd8f65034426f61aa1 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 17 Apr 2023 12:42:28 +0100 Subject: [PATCH 68/81] Update metadata for 7.0.13 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index c15296c9..d3372f9a 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.12' +version '7.0.13' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From f1b79349ac9fcc43f0dea81152741a2642cdcde4 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 17 Apr 2023 12:42:31 +0100 Subject: [PATCH 69/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca422d36..ac690d70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.13 - *2023-04-17* ## 7.0.12 - *2023-04-07* From 96594f5d6353e5525952315f0c79839a24729623 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 13:47:04 +0100 Subject: [PATCH 70/81] Update sous-chefs/.github action to v2.0.4 (#221) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32b24803..1afbae7d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ name: ci jobs: lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.2 + uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.4 integration: needs: lint-unit From 6b592d964c9878d1b81af63b6ed0673b54c3e9de Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 16 May 2023 13:47:10 +0100 Subject: [PATCH 71/81] Update changelog for 7.0.14 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac690d70..ca297273 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.14 - *2023-05-16* ## 7.0.13 - *2023-04-17* From 6271acbe9352efb75d0870a63f5fa3b139061470 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 16 May 2023 13:47:10 +0100 Subject: [PATCH 72/81] Update metadata for 7.0.14 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index d3372f9a..3d08514b 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.13' +version '7.0.14' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From aa4761a0a4089cb7d205e9590634d9eb1ba492a8 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Tue, 16 May 2023 13:47:15 +0100 Subject: [PATCH 73/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca297273..13b306d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.14 - *2023-05-16* ## 7.0.13 - *2023-04-17* From 26b85152b35084c8825623ef49a7e4bd6043af2d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:27:22 +0100 Subject: [PATCH 74/81] Update sous-chefs/.github action to v2.0.6 (#222) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1afbae7d..e1eff151 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ name: ci jobs: lint-unit: - uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.4 + uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.6 integration: needs: lint-unit From aafae97f5e57101890aec527471fc825df53171f Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:27:25 +0100 Subject: [PATCH 75/81] Update changelog for 7.0.15 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13b306d0..9d532470 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.15 - *2023-09-11* ## 7.0.14 - *2023-05-16* From f477b39580f23a76be6c2cbaa04410db47ba25a8 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:27:25 +0100 Subject: [PATCH 76/81] Update metadata for 7.0.15 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index 3d08514b..c0d770f9 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.14' +version '7.0.15' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 5aec8a3de9e27d635e8bd50ff7fd9a82a1a08b88 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:27:28 +0100 Subject: [PATCH 77/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d532470..657c5eea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.15 - *2023-09-11* ## 7.0.14 - *2023-05-16* From e82ab3f52e443c916aa3d5298e59616df1895d6c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 22:47:15 +0800 Subject: [PATCH 78/81] Update actions/checkout action to v4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/checkout](https://togithub.com/actions/checkout) | action | major | `v3` -> `v4` | --- ### Release Notes
actions/checkout (actions/checkout) ### [`v4`](https://togithub.com/actions/checkout/blob/HEAD/CHANGELOG.md#v400) [Compare Source](https://togithub.com/actions/checkout/compare/v3...v4) - [Support fetching without the --progress option](https://togithub.com/actions/checkout/pull/1067) - [Update to node20](https://togithub.com/actions/checkout/pull/1436)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/sous-chefs/openvpn). --- .github/workflows/ci.yml | 2 +- .github/workflows/md-links.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1eff151..a3b6452e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install Chef uses: actionshub/chef-install@2.0.4 - name: Dokken diff --git a/.github/workflows/md-links.yml b/.github/workflows/md-links.yml index e5c1e7a2..fb763149 100644 --- a/.github/workflows/md-links.yml +++ b/.github/workflows/md-links.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: markdown-link-check uses: gaurav-nelson/github-action-markdown-link-check@1.0.15 with: From 1017a86d6f85bfde930d3495ac5231d32b83cad4 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Fri, 29 Sep 2023 15:47:19 +0100 Subject: [PATCH 79/81] Update changelog for 7.0.16 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 657c5eea..f268e10c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This file is used to list changes made in each version of the openvpn cookbook. -## Unreleased +## 7.0.16 - *2023-09-29* ## 7.0.15 - *2023-09-11* From a743d7735c20dd15723ed9400df4804200973291 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Fri, 29 Sep 2023 15:47:19 +0100 Subject: [PATCH 80/81] Update metadata for 7.0.16 --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index c0d770f9..ee5d2505 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,5 +1,5 @@ name 'openvpn' -version '7.0.15' +version '7.0.16' maintainer 'Sous Chefs' maintainer_email 'help@sous-chefs.org' license 'Apache-2.0' From 379436e691cad548bf9404566f63e2894902b912 Mon Sep 17 00:00:00 2001 From: Sous Chefs Bot <33356041+kitchen-porter@users.noreply.github.com> Date: Fri, 29 Sep 2023 15:47:22 +0100 Subject: [PATCH 81/81] Set Changelog to ## Unreleased --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f268e10c..49abf0f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ This file is used to list changes made in each version of the openvpn cookbook. +## Unreleased + ## 7.0.16 - *2023-09-29* ## 7.0.15 - *2023-09-11*