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

Jump to bottom

Modify nginx_jdomain repo #4769

Merged
merged 2 commits into from
Mar 5, 2021
Merged

Modify nginx_jdomain repo #4769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccb978e
use wdaike version of ngx_upstream_jdomain
kalroy Feb 17, 2021
146eb94
Following plan file best practices
kalroy Feb 25, 2021
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
2 changes: 1 addition & 1 deletion components/automate-es-gateway/habitat/config/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
daemon off;
pid {{ pkg.svc_var_path }}/pid;
worker_processes {{ cfg.ngx.main.worker_processes }};
error_log {{ cfg.ngx.main.error_log }} {{ cfg.logger.level }};
error_log {{ cfg.ngx.main.error_log }} {{ cfg.log.level }};
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not related to the PR but found a bug with the config related to nginx log path


events {
worker_connections {{cfg.ngx.events.worker_connections}};
Expand Down
6 changes: 3 additions & 3 deletions components/automate-es-gateway/habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ pkg_license=("Chef-MLSA")
pkg_upstream_url="https://www.chef.io/automate"


jdomain_version="1.1.5"
jdomain_version="master"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't find any tag/version associated in the Repo to refer so going along with master.

jdomain_filename="ngx_upstream_jdomain-${jdomain_version}.tar.gz"
jdomain_source="https://github.com/nicholaschiasson/ngx_upstream_jdomain/archive/${jdomain_version}.tar.gz"
jdomain_shasum=e7346dac41d473ea02995b7626bd0660115538c2c784dfe683e235c58dbc2c2c
jdomain_source="https://github.com/wdaike/ngx_upstream_jdomain/archive/${jdomain_version}.tar.gz"
jdomain_shasum=3e7bedcddedf26d82da214d299e4cbee7605ac85a04ff3415c6b85de4f5a4ed5

nginx_version="1.19.2"
pkg_source="https://nginx.org/download/nginx-${nginx_version}.tar.gz"
Expand Down