Skip to content

Commit

Permalink
WIP improvements for nginx
Browse files Browse the repository at this point in the history
  • Loading branch information
markan committed Nov 3, 2017
1 parent 6a068ce commit 285bda2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ services:
- oc_erchef
- oc_bifrost
- bookshelf
- elasticsearch
- postgresql
links:
- oc_erchef
Expand Down
1 change: 1 addition & 0 deletions src/nginx/habitat/default.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ client_max_body_size = "250m"
server_name = "chef-server"

# Port used for SSL traffic
port = 80
ssl_port = 443

# # SSL protocols and ciphers
Expand Down
2 changes: 2 additions & 0 deletions src/nginx/habitat/hooks/run
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/bash
exec 2>&1

echo "Starting Chef Server"

exec hab pkg exec core/openresty openresty \
-c "{{pkg.svc_config_path}}/nginx.conf" \
-p "{{pkg.svc_var_path}}"
10 changes: 5 additions & 5 deletions src/nginx/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ pkg_deps=(
core/libossp-uuid
core/openresty
)
# pkg_build_deps=(
# $HAB_ORIGIN/visibility-web
# $HAB_ORIGIN/workflow-web
# )
pkg_expose=(443 80)
pkg_exposes=(443 80)
pkg_exports=(
[port] = port
[ssl-port] = port
)
pkg_svc_user="root"
pkg_svc_group="$pkg_svc_user"
pkg_binds_optional=(
Expand Down

0 comments on commit 285bda2

Please sign in to comment.