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

Adding ability to use alternate templates. #130

Merged
merged 9 commits into from May 25, 2015
Merged

Adding ability to use alternate templates. #130

merged 9 commits into from May 25, 2015

Commits on Feb 28, 2015

  1. Merge branch 'master' of github.com:octohost/octohost

    @joshuacox
    joshuacox committed Feb 28, 2015
    Copy the full SHA
    bf7af05 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2015

  1. Merge branch 'master' of github.com:octohost/octohost

    @joshuacox
    joshuacox committed Apr 3, 2015
    Copy the full SHA
    9d70730 View commit details
    Browse the repository at this point in the history

  2. specify alternate nginx config by setting conusl key of NGINX_ALT and… 

    … specify the path to the alternate nginx config for a contianer
    @joshuacox
    joshuacox committed Apr 3, 2015
    Copy the full SHA
    ca51ad9 View commit details
    Browse the repository at this point in the history

  3. dont do it that way, do it this way

    @joshuacox
    joshuacox committed Apr 3, 2015
    Copy the full SHA
    fe9a2e3 View commit details
    Browse the repository at this point in the history

  4. I inverted the logic of the if clause to make it a bit more readable,… 

    … now it is, IF in your consul key values for this you specify SSL_FORCED, then use the templateSSL.ctmpl template, but IF you specify a path to another template in NGINX_ALT it will use that instead, if none of the above use the normal template.ctmpl
    @joshuacox
    joshuacox committed Apr 3, 2015
    Copy the full SHA
    f4192bf View commit details
    Browse the repository at this point in the history

  5. elif breaks on the first so swapped order of ssl and alt, now works a… 

    …s speficified
    @joshuacox
    joshuacox committed Apr 3, 2015
    Copy the full SHA
    5494157 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2015

  1. Merge branch 'master' of github.com:octohost/octohost into NGINX_ALT

    @joshuacox
    joshuacox committed May 11, 2015
    Copy the full SHA
    9654134 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2015

  1. Merge branch 'master' of github.com:octohost/octohost into NGINX_ALT

    @joshuacox
    joshuacox committed May 23, 2015
    Copy the full SHA
    fff3c59 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2015

  1. Cleanup and make a little simpler.

    @darron
    darron committed May 24, 2015
    Copy the full SHA
    09879d0 View commit details
    Browse the repository at this point in the history