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.

Sign up for GitHub

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

Release 1.2.1 #18

Merged
merged 3 commits into from
Nov 14, 2024
Merged

Release 1.2.1 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42b410b
add user in relevant action blocks
nilsver Nov 14, 2024
685c06c
Merge pull request #17 from redBorder/bugfix/19354_all_conf_files_to_…
rgomezborder Nov 14, 2024
f62f9f8
Bump version
rgomezborder Nov 14, 2024
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
cookbook-nginx CHANGELOG
===============

## 1.2.1

- nilsver
- [42b410b] add user in relevant action blocks

## 1.2.0

- Miguel Negrón
Expand Down
2 changes: 1 addition & 1 deletion resources/metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
maintainer_email '[email protected]'
license 'AGPL-3.0'
description 'Installs/Configures cookbook-nginx'
version '1.2.0'
version '1.2.1'
8 changes: 6 additions & 2 deletions resources/providers/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@

action :add_http2k do
begin
user = new_resource.user
http2k_hosts = new_resource.http2k_hosts
http2k_port = new_resource.http2k_port

Expand All @@ -102,8 +103,8 @@

template '/etc/nginx/conf.d/http2k.conf' do
source 'http2k.conf.erb'
owner 'nginx'
group 'nginx'
owner user
group user
mode '0644'
cookbook 'nginx'
variables(http2k_hosts: http2k_hosts, http2k_port: http2k_port)
Expand All @@ -118,6 +119,7 @@

action :add_s3 do # Only for configure solo
begin
user = new_resource.user
s3_port = new_resource.s3_port
s3_hosts = new_resource.s3_hosts

Expand All @@ -144,6 +146,7 @@

action :add_erchef do
begin
user = new_resource.user
erchef_hosts = new_resource.erchef_hosts
erchef_port = new_resource.erchef_port

Expand All @@ -170,6 +173,7 @@

action :add_aioutliers do
begin
user = new_resource.user
aioutliers_hosts = new_resource.aioutliers_hosts
aioutliers_port = new_resource.aioutliers_port

Expand Down
Loading