Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Linting #217

Merged
merged 5 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,21 @@ name: ci
jobs:
lint-unit:
uses: sous-chefs/.github/.github/workflows/[email protected]
permissions:
actions: write
checks: write
pull-requests: write
statuses: write
issues: write

integration:
needs: lint-unit
needs: "lint-unit"
runs-on: ubuntu-latest
strategy:
matrix:
os:
- "almalinux-8"
- "amazonlinux-2"
- "amazonlinux-2023"
- "centos-7"
- "centos-stream-8"
- "debian-10"
Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/md-links.yml

This file was deleted.

6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,17 @@ Locking yum dependency to '< 3'

### Bug

- **[COOK-3317](https://tickets.chef.io/browse/COOK-3317)** - Fix and make `server.up.sh` useful and customizable
- [COOK-3317] - Fix and make `server.up.sh` useful and customizable

### New Feature

- **[COOK-3315](https://tickets.chef.io/browse/COOK-3315)** - Remove hardcoded variables in configuration file
- [COOK-3315] - Remove hardcoded variables in configuration file

## v1.1.2

### Improvement

- **[COOK-2820](https://tickets.chef.io/browse/COOK-2820)** - Update metadata.rb for all attributes and recipes
- [COOK-2820] - Update metadata.rb for all attributes and recipes

## v1.1.0

Expand Down
47 changes: 0 additions & 47 deletions Dangerfile

This file was deleted.

70 changes: 11 additions & 59 deletions kitchen.yml
Original file line number Diff line number Diff line change
@@ -1,78 +1,29 @@
---
driver:
name: dokken
privileged: true # because Docker and SystemD/Upstart
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>

transport:
name: dokken
require_chef_omnibus: <%= ENV['CHEF_VERSION'] || 'latest' %>
name: vagrant

provisioner:
name: dokken
name: chef_infra
enforce_idempotency: true
multiple_converge: 2
deprecations_as_errors: true
chef_log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %>
chef_license: accept-no-persist
enforce_idempotency: true
multiple_converge: 2

verifier:
name: inspec
deprecations_as_errors: true

# currently only support 2 last major revs of distros (at the most)
platforms:
- name: almalinux-8
driver:
image: dokken/almalinux-8
pid_one_command: /usr/lib/systemd/systemd

- name: amazonlinux-2
driver:
image: dokken/amazonlinux-2
pid_one_command: /usr/lib/systemd/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: 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: debian-10
- name: debian-10
- name: freebsd-12
- name: fedora-latest
driver:
image: dokken/fedora-latest
pid_one_command: /usr/lib/systemd/systemd

- name: opensuse-leap-15
- 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: rockylinux-8
driver:
image: dokken/rockylinux-8
pid_one_command: /usr/lib/systemd/systemd

suites:
- name: server
Expand All @@ -83,22 +34,23 @@ suites:
config:
verb: 1
mute: 10
route:
- '192.168.4.0 255.255.255.0'
route: ["192.168.4.0 255.255.255.0"]
push_routes:
- 192.168.10.0 255.255.255.0
- 10.12.10.0 255.255.255.0
push_options:
dhcp-option:
- 'DOMAIN local'
- 'DOMAIN-SEARCH local'
- "DOMAIN local"
- "DOMAIN-SEARCH local"

- name: server_verification
run_list:
- recipe[openvpn::server]
- recipe[openvpn::users]
attributes:
openvpn:
server_verification: "remote-cert-tls server"

- name: server_verify_no_databag
run_list:
- recipe[openvpn::server]
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name 'openvpn'
version '7.0.17'
maintainer 'Sous Chefs'
maintainer_email '[email protected]'
license 'Apache-2.0'
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'
version '7.0.17'
chef_version '>= 15.3'

supports 'arch'
Expand Down