Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

Consolidate the nginx-* into a single nginx-consul container #1347

Merged
merged 8 commits into from
Apr 28, 2016

Conversation

ChrisAubuchon
Copy link
Contributor

@ChrisAubuchon ChrisAubuchon commented Apr 13, 2016

  • Installs cleanly on a fresh build of most recent master branch
  • Upgrades cleanly from the most recent release
  • Updates documentation relevant to the changes

The nginx configuration variables do_consul_ssl, do_marathon_auth, etc
are written to consul and the nginx templates are configured via consul-template

The nginx configuration variables `do_consul_ssl`, `do_marathon_auth`, etc
are written to consul and the nginx templates are configured via consul-template
@ChrisAubuchon
Copy link
Contributor Author

Do not merge until the ciscocloud docker containers are updated. This PR currently uses my nginx-consul docker container.

--env-file=/etc/default/nginx-consul.env \
{{ consul_nginx_image }}:{{ consul_nginx_image_tag }}

ExecStop=/usr/bin/docker kill nginx-consul

ExecReload=/usr/bin/docker kill -HUP nginx-consul
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is -HUP used here? (just wondering, not a problem with your code)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

HUP is caught by the launch.sh script. When the HUP is caught, the consul-template configurations are generated and consul-template is reloaded. It could be any signal I suppose but HUP is generally used for reloading configuration.

@langston-barrett
Copy link
Contributor

This looks awesome!!

@andreimc
Copy link
Contributor

👍 :)

@ryane ryane added this to the 1.1 milestone Apr 22, 2016
@ryane ryane mentioned this pull request Apr 28, 2016
@ryane
Copy link
Contributor

ryane commented Apr 28, 2016

Success on a new build and an upgrade from 1.03. It is necessary to run this before upgrading:

ansible-playbook -e @security.yml playbooks/upgrade-nginx-consul.yml

This will be documented and incorporated into an upgrade playbook in #1392

@ryane ryane merged commit e718fcc into master Apr 28, 2016
@ryane ryane deleted the feature/single-nginx-container branch April 28, 2016 14:48
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants