Commit Graph
88 Commits
Author SHA1 Message Date
Jose Diaz-Gonzalez 27a2478a33 Follow bashstyle where possible 2015-09-16 16:06:31 -07:00
Jose Diaz-Gonzalez 1be4b94226 Merge pull request #1469 from progrium/1352_mh-nginx-logs-commands
Add nginx:access-logs and nginx:error-logs without sudo requirement
2015-09-15 12:03:32 -07:00
Michael Hobbs 964a84dc31 rename ssl terminated template to conform to naming scheme 2015-09-15 10:36:14 -07:00
Assaf Arkin 1b84527f8c ADDED Nginx configuration for running behind load balancer 2015-09-15 10:31:27 -07:00
Michael Hobbs 72a1b76b63 don't require sudo for tailing logs since we're root anyway 2015-09-15 10:15:22 -07:00
Jiahao Li cca49230d9 Add nginx:access-logs and nginx:error-logs.
Add two nginx subcommands to display nginx error/access logs for a particular app.
2015-09-15 10:08:52 -07:00
Jose Diaz-Gonzalez c929edfbe5 Source plugins from $PLUGIN_AVAILABLE_PATH when not using common plugin
This will allow us to override any core plugin
2015-09-15 02:22:08 -07:00
Michael Hobbs 8095df79f6 implement core plugin mgmt using plugn. add tests. 2015-09-15 02:17:28 -07:00
Jose Diaz-Gonzalez c9bca838f0 Add missing $ 2015-09-15 02:17:27 -07:00
Jose Diaz-Gonzalez ad72a137e1 Fix sourcing of functions 2015-09-15 02:16:40 -07:00
Michael Hobbs 5d8359c12e fix nginx template paths 2015-09-15 02:16:40 -07:00
Michael Hobbs 7a545759f2 initial pass at switching to plugn 2015-09-15 02:16:40 -07:00
Jose Diaz-Gonzalez d37e64d3d6 Move nginx:import-ssl to certs:add 2015-09-03 23:04:05 -04:00
Michael Hobbs a983456030 remove magic additions to VHOST based on SSL cert. fixes #1368 2015-09-03 22:35:00 -04:00
Jose Diaz-Gonzalez e7c035e207 Use config_export function instead of calling dokku as a subcommand 2015-08-30 01:55:14 -04:00
Jose Diaz-Gonzalez 60c0f56724 Fix lint errors 2015-08-30 01:23:56 -04:00
Jose Diaz-Gonzalez afe65a86fb eval the output of "dokku config --export" to get env config
This should theoretically be safe, as "--export" forces the `dokku config` command to return 0 in all cases, and it should only output lines that are "valid" environment variables
2015-08-30 01:23:56 -04:00
Jim Myhrberg d5df6a4190 Use $PLUGIN_PATH instead of $(dirname $0)/..
As briefly discussed in #1425, source the `common/functions` file via an
absolute path, rather than determining the relative path by using
`dirname`. 3rd-party plugins should follow suit and use the new
`$PLUGIN_PATH` convention too.
2015-08-28 14:14:28 +01:00
Jose Diaz-Gonzalez bd0803cf29 Merge pull request #1344 from AdamVig/master
Add better error checking on nginx:import-ssl
2015-08-26 00:26:07 -04:00
Adam Vigneaux c1a0e0ce68 Improve file searching and variable usage
- Count files using find and grep instead of ls and wc
- Use the same variable to find files and move files, allowing files to
be in a subdirectory
2015-07-28 18:48:31 -04:00
Michael Hobbs b30db17def use column to format help output 2015-07-28 09:31:56 -07:00
Adam Vigneaux dc5f34534b Improve formatting 2015-07-26 22:37:56 -04:00
Adam Vigneaux 14e72ea337 Add better error checking on nginx:import-ssl 2015-07-26 22:21:32 -04:00
alexkruegger 9910fb03da fix bug in nginx.conf.template getting from /app directory 2015-07-20 14:02:44 +03:00
Michael Hobbs c7cb014580 convenience functions for app container state 2015-07-13 09:27:42 -07:00
Jose Diaz-Gonzalez ca1b17ea8d Use nginx.conf.template as the template name 2015-07-12 20:06:21 -04:00
Jose Diaz-Gonzalez 007946f52a Use simplified method for retrieving a container id 2015-07-12 20:02:29 -04:00
Jose Diaz-Gonzalez 6895dd9936 Use get_container_ids method to retrieve container for nginx conf 2015-07-11 16:29:25 -04:00
Assaf Arkin 71b79da262 CHANGED extract nginx.conf.template from project 2015-07-11 15:05:06 -04:00
Michael Hobbs 4629a9909b Merge pull request #1291 from progrium/1261_mh-config-args-refactor
initial pass at config plugin arguments refactor
2015-07-10 07:55:18 -07:00
Michael Hobbs 033a267573 fix urls command when NO_VHOST=1 + tests. fixes #1294 2015-07-09 12:12:58 -07:00
Michael Hobbs a84397895a initial pass at config plugin arguments refactor 2015-07-06 19:41:17 -07:00
Michael Hobbs af38e4f25a filter out literal wildcard when deploying an unrelated domain. closes #1185 2015-05-19 17:58:02 -07:00
Michael Hobbs 0d2e5f1a14 Merge branch 'master' into mh-ps-scale 2015-05-17 17:45:01 -07:00
Michael Hobbs c5337cf6a2 include output when overriding nginx template 2015-05-11 12:00:44 -07:00
Michael Hobbs b836c1f65a use regex when filtering nonssl vhosts. process custom templates in the same manner as default templates. closes #1169 2015-05-06 16:49:37 -07:00
Michael Hobbs 290745d324 only validate and restart nginx if we're deployed. use REGEX when handling SSL and NON-SSL hosts 2015-04-24 11:31:27 -07:00
Michael Hobbs 636e139e4a only balance web containers 2015-04-21 14:33:28 -07:00
Michael Hobbs e27d0e6fa5 wrap container id checks and reading into common function that attempts new and old style container id files
aggregate log streams
2015-04-21 14:32:30 -07:00
Michael Hobbs 33f872183e initial pass at container-level scaling 2015-04-21 14:27:23 -07:00
Michael Hobbs 661b6706de fix verify_app_name to bomb on null app. use it in nginx:build-config 2015-04-21 10:58:11 -07:00
Jose Diaz-Gonzalez b299f66c28 Validate nginx configuration before reloading nginx. Closes #999 2015-04-21 02:07:27 -04:00
Jose Diaz-Gonzalez b5495ed0c3 use helper functions instead of echo command 2015-04-21 01:14:10 -04:00
Jose Diaz-Gonzalez 50f7b4236b Add .template suffix to nginx configuration templates. Refs #1054 2015-03-26 14:33:27 -04:00
Michael Hobbs 42ee978549 Merge pull request #1013 from lmars/fix-urls
Fix URL schemes in `dokku urls` output
2015-03-09 12:05:25 -07:00
Lewis Marshall 9202f110ab Fix wildcard TLS domain detection
As per RFC 2818 [0], a CN of *.dokku.me will only match direct
subdomains of dokku.me, not sub-subdomains like www.test.dokku.me, but
Dokku currently enables TLS for subdomains of all levels.

I have changed the regex from .*\.dokku\.me to [^.]*\.dokku\.me so TLS
is only enabled for direct subdomains.

[0] - http://tools.ietf.org/html/rfc2818#section-3.1

Signed-off-by: Lewis Marshall <lewis@lmars.net>
2015-03-08 21:32:31 +00:00
Lewis Marshall 3a7e1bfa16 Fix URL schemes in dokku urls output
Previously, the presence of TLS certificates would cause `dokku urls` to
output all https URLs, even for domains which were not configured to use
TLS.

This change introduces a URLS file in the app's directory which contains
the URLs with schemes based on whether they have been configured to use
TLS in the nginx config.

Signed-off-by: Lewis Marshall <lewis@lmars.net>
2015-03-01 01:29:38 +00:00
Lewis Marshall a4d79e2de9 Support multiple domains using a wildcard TLS certificate
Previous to this change, each TLS domain would be written to nginx.conf
using the nginx.ssl.conf template (lines 69-73) but with an empty
"server_name" directive (because NOSSL_SERVER_NAME was not set).

This would then become irrelevant because nginx.conf would get truncated
on line 88, and a single parsing of the template would then be written to
nginx.conf on line 89, meaning only the last TLS domain would be set up to
actually use TLS.

This patch changes this behaviour so that all TLS domains get added to
nginx.conf using the nginx.ssl.conf template (which includes redirecting
HTTP -> HTTPS), and all non-TLS domains get added using the nginx.conf
template, so do not get redirected to a TLS domain.

Signed-off-by: Lewis Marshall <lewis@lmars.net>
2015-02-26 01:58:17 +00:00
Michael Hobbs 12777d9bf0 simplify SSL hostname handling and avoid overwriting variables. refs #971 2015-02-12 13:27:47 -08:00
Michael Hobbs 9164740117 rename log functions with dokku_log_ prefix 2015-02-06 08:28:14 -08:00