Skip to content

Commit

Permalink
Remove unused lock_dir method (#164)
Browse files Browse the repository at this point in the history
This conflicts with a method with the same name in the apache2 cookbook which
has been causing some idempotency issues when used together. It seems this
method is no longer being used so it's safe to remove.

In addition, update test CI platforms.

Signed-off-by: Lance Albertson <[email protected]>
  • Loading branch information
ramereth authored Jul 25, 2024
1 parent 473c23b commit 9400331
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 32 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@ jobs:
strategy:
matrix:
os:
- "debian-9"
- "debian-10"
- "amazonlinux-2"
- "centos-7"
- "centos-8"
- "centos-stream-8"
- "ubuntu-1804"
- "almalinux-8"
- "almalinux-9"
- "amazonlinux-2023"
- "debian-11"
- "debian-12"
- "rockylinux-8"
- "rockylinux-9"
- "ubuntu-2004"
- "ubuntu-2204"
- "ubuntu-2404"
suite:
- "default"
- "instance"
Expand Down
20 changes: 9 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

Standardise files with files in sous-chefs/repo-management

Standardise files with files in sous-chefs/repo-management

Standardise files with files in sous-chefs/repo-management
- Remove unused `lock_dir` method
- Standardise files with files in sous-chefs/repo-management
- Update test CI platforms

## 7.0.25 - *2024-05-02*

Expand Down Expand Up @@ -297,16 +295,16 @@ Standardise files with files in sous-chefs/repo-management

## [1.6.0] - 2013-10-04

- [COOK-3682](https://tickets.chef.io/browse/COOK-3682) - Set user when using Debian packages
- [COOK-3336](https://tickets.chef.io/browse/COOK-3336) - Add an option to specify the logfile (fix)
- [COOK-3682]: Set user when using Debian packages
- [COOK-3336]: Add an option to specify the logfile (fix)

## [1.5.0] - 2013-08-28

- [COOK-3336](https://tickets.chef.io/browse/COOK-3336) - Option to specify logfile
- [COOK-2790](https://tickets.chef.io/browse/COOK-2790) - Support for defining max object size
- [COOK-3336]: Option to specify logfile
- [COOK-2790]: Support for defining max object size

- [COOK-3299](https://tickets.chef.io/browse/COOK-3299) - Document that `memcached` is exposed by default
- [COOK-2990](https://tickets.chef.io/browse/COOK-2990) - Include `listen`, `maxconn`, and `user` in the runit service
- [COOK-3299]: Document that `memcached` is exposed by default
- [COOK-2990]: Include `listen`, `maxconn`, and `user` in the runit service

## [1.4.0] - 2013-05-23

Expand Down
16 changes: 9 additions & 7 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ verifier:
name: inspec

platforms:
- name: debian-9
- name: debian-10
- name: amazonlinux-2
- name: centos-7
- name: centos-8
- name: centos-stream-8
- name: ubuntu-18.04
- name: almalinux-8
- name: almalinux-9
- name: amazonlinux-2023
- name: debian-11
- name: debian-12
- name: rockylinux-8
- name: rockylinux-9
- name: ubuntu-20.04
- name: ubuntu-22.04
- name: ubuntu-24.04

suites:
- name: default
Expand Down
7 changes: 0 additions & 7 deletions libraries/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@ def binary_path
)
end

def lock_dir
value_for_platform_family(
%w(rhel fedora suse amazon) => '/var/lock/subsys',
'default' => '/var/lock'
)
end

# if the instance name is memcached don't spit out memcached_memcached
def memcached_instance_name
new_resource.instance_name == 'memcached' ? 'memcached' : "memcached_#{new_resource.instance_name}"
Expand Down

0 comments on commit 9400331

Please sign in to comment.