Skip to content

Commit

Permalink
Merge pull request #11 from axl89/new-os
Browse files Browse the repository at this point in the history
Maintenance: OS addition and remove deprecated ones
  • Loading branch information
axl89 authored Oct 29, 2022
2 parents ac3ab5a + a0d8001 commit 54390d6
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ orbs:
jobs:
cookstyle:
docker:
- image: chef/chefdk:4.9.17
- image: chef/chef:current
steps:
- checkout
- run: chef env --chef-license accept-silent
- run: chef exec cookstyle .
foodcritic:
docker:
- image: chef/chefdk:4.9.17
- image: chef/chef:current
steps:
- checkout
- run: chef env --chef-license accept-silent
Expand Down
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
<a name="unreleased"></a>
## [Unreleased]

<a name="v3.0.0"></a>
## [v3.0.0] - 2022-10-29

### Added
- Support for CentOS stream 8, Ubuntu 22.04,
OpenSUSE Leap 15.3 and 15.4.

### Removed
- Support for CentOS 7, 8, Ubuntu 16.04,
OpenSUSE Leap < 15.3

### Changed
- ovh/the-bastion version upgraded to 3.08.00 (was 3.07.00).

<a name="v2.0.2"></a>
## [v2.0.2] - 2021-12-31

Expand Down Expand Up @@ -134,7 +148,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Removed Chef Workflow files


[Unreleased]: https://github.com/axl89/ovh_the_bastion/compare/v2.0.2...main
[Unreleased]: https://github.com/axl89/ovh_the_bastion/compare/v3.0.0...main
[v3.0.0]: https://github.com/axl89/ovh_the_bastion/compare/v2.0.2...v3.0.0
[v2.0.2]: https://github.com/axl89/ovh_the_bastion/compare/v2.0.1...v2.0.2
[v2.0.1]: https://github.com/axl89/ovh_the_bastion/compare/v2.0.0...v2.0.1
[v2.0.0]: https://github.com/axl89/ovh_the_bastion/compare/v1.1.0...v2.0.0
Expand Down
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Basic attributes
default['ovh_the_bastion']['version'] = 'v3.07.00'
default['ovh_the_bastion']['version'] = 'v3.08.00'
default['ovh_the_bastion']['path'] = '/opt/bastion'

# See /opt/bastion/bin/admin/install --help
Expand Down
27 changes: 11 additions & 16 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ verifier:
deprecations_as_errors: true

platforms:
- name: centos-stream-8
driver:
image: dokken/centos-stream-8
- name: amazonlinux-2
driver:
image: dokken/amazonlinux-2
Expand All @@ -28,30 +31,22 @@ platforms:
- name: debian-10
driver:
image: dokken/debian-10
- name: debian-9
driver:
image: dokken/debian-9
- name: centos-8
driver:
image: dokken/centos-8
pid_one_command: /usr/lib/systemd/systemd
- name: centos-7
driver:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd
- name: ubuntu-16.04
driver:
image: dokken/ubuntu-16.04
- name: ubuntu-18.04
driver:
image: dokken/ubuntu-18.04
- name: ubuntu-20.04
driver:
image: dokken/ubuntu-20.04
- name: opensuse-leap-15
- name: ubuntu-22.04
driver:
image: dokken/opensuse-leap-15
image: dokken/ubuntu-22.04
- name: opensuse-leap-15.3
driver:
image: dokken/opensuse-leap-15.3
pid_one_command: /usr/lib/systemd/systemd
- name: opensuse-leap-15.4
driver:
image: dokken/opensuse-leap-15.4
suites:
- name: default
run_list:
Expand Down
10 changes: 5 additions & 5 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
maintainer_email '[email protected]'
license 'GPL-3.0'
description 'Installs and configures ovh/the-bastion software'
version '2.0.2'
version '3.0.0'
chef_version '>= 15.3'

supports 'debian', '>= 9.0'
supports 'centos', '>= 7.0'
supports 'debian', '>= 10.0'
supports 'centos', '>= 8.0'
supports 'redhat', '>= 7.0'
supports 'ubuntu', '>= 16.04'
supports 'opensuseleap', '>= 15.2'
supports 'ubuntu', '>= 18.04'
supports 'opensuseleap', '>= 15.3'

# The `issues_url` points to the location where issues for this cookbook are
# tracked. A `View Issues` link will be displayed on this cookbook's page when
Expand Down
18 changes: 17 additions & 1 deletion recipes/install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,31 @@

include_recipe 'yum-epel' if platform?('amazon')

execute 'enable powertools' do
live_stream true
command 'dnf config-manager --set-enabled powertools -y'
action :nothing
only_if { platform?('centos', 'rocky') }
end

apt_update 'all platforms' do
action :nothing
only_if { platform_family?('debian') }
end

# Base packages requires
packages = %w(git curl)

# Add specific requires packages for CentOS and Rocky OS
if platform?('centos')
packages.append('epel-release')
end

## Install git, curl
package %w(git curl) do
package packages do
action :install
notifies :update, 'apt_update[all platforms]', :before
notifies :run, 'execute[enable powertools]', :before
end

## Download the bastion
Expand Down

0 comments on commit 54390d6

Please sign in to comment.