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
Michael Hobbs
6ad65dd9b4
first stab at a common functions library. include argument parsing and a few definitions wired up. closes #932 . closes #945
2015-02-05 11:32:46 -08:00
Michael Hobbs
5fb30ab934
source global env prior to app env. closes #931
2015-02-03 13:47:20 -08:00
Michael Hobbs
6cd89fa72a
support extracting SANs from SSL certificates and adding them to nginx config
2015-01-15 12:08:27 -08:00
Jose Diaz-Gonzalez
938a16de53
Merge pull request #880 from progrium/879-mh-port-based-fix
...
disable VHOST deployment if global VHOST file is missing and an app domain has not been added
2015-01-11 18:14:55 -05:00
Michael Hobbs
80d13c0005
allow users to add a domain to an app if there is no global vhost
2015-01-11 14:35:02 -08:00
Michael Hobbs
c63be44989
IP and PORT are likely to get clobbered. rename them
2015-01-09 12:12:52 -08:00
Michael Hobbs
896ce50c93
support pre deployment usage of domains plugin. fixes interface binding issue
2015-01-06 12:42:21 -08:00
Michael Hobbs
948d7902f2
bind docker container to internal port if using vhosts
2015-01-02 16:27:19 -08:00
Michael Hobbs
de09260c33
add certificate CN to app VHOST if it's not already
2014-12-23 23:08:22 -08:00
Michael Hobbs
e8b4bd5a89
lintball
2014-12-21 14:51:42 -08:00
Michael Hobbs
9322200eae
lintball
2014-12-21 14:51:41 -08:00
Michael Hobbs
3706392e65
test with wercker
2014-12-21 14:51:40 -08:00
Michael Hobbs
56472bd08c
VHOST fallback
2014-12-16 23:01:32 -08:00
Michael Hobbs
59f047bb45
include SSL_VHOSTS in NOSSL_SERVER_NAME so we can redirect from http to https on the secure hostname as well
2014-12-16 12:15:10 -08:00
Michael Hobbs
1b208778f3
bugfixes
...
- don't match substrings in VHOSTS
- handle case where NOSSL_SERVER_NAME is \' \'
- rebuild nginx config on ssl import
- prevent cwd errors after we rm the temp dir
2014-12-15 18:10:14 -08:00
Michael Hobbs
4e0670f1ac
rebuild nginx config on domain change
2014-12-12 17:53:30 -08:00
Adem Gaygusuz
469d1e3f49
Fix crt/key check
2014-12-09 00:37:47 +00:00
Jose Diaz-Gonzalez
04dbe31919
Unify the way in which all error messages are specified
...
Other parts of dokku use one-liners where possible, so these parts should as well
2014-11-23 23:32:42 -05:00
Jose Diaz-Gonzalez
a3b3a6a12a
Unify missing app error messages
2014-11-23 23:32:42 -05:00
Jose Diaz-Gonzalez
d307a5b8ec
Output error message when a command is not found. Closes #778
...
Plugins with commands will need to implement a catch-all command that exits with the `DOKKU_NOT_IMPLEMENTED_EXIT`` code (10). This signals to dokku that a given plugin has indeed not executed anything for a plugin (which may not always be the case).
Using plugins that do not implement this pattern will result in those plugins silencing the error message.
2014-11-23 18:09:11 -05:00
Jose Diaz-Gonzalez
8bc3d372ec
Minor bash formatting changes
2014-11-23 16:42:21 -05:00
Jose Diaz-Gonzalez
cfc7c41e47
Add PLUGIN:help command to each plugin
2014-11-22 17:52:46 -05:00
Jose Diaz-Gonzalez
19609f7078
Import ssl certificates
...
Also ensures output is stored in proper tls directory
Closes #518
2014-11-22 16:19:06 -05:00
Paul Lietar
78591a618b
Remove plugins before copying them again.
...
This way plugins can rename/delete files w/o having old files lying around.
2013-11-29 20:57:53 +00:00
Paul Lietar
10a8c75224
Add an empty help message to the nginx-vhosts plugin.
...
Not doing anything just destroys the help message coming from previous
plugins. Run cat to forward stdin into stdout.
2013-11-23 00:10:30 +00:00
Paul Lietar
455be29249
Fix commands, the easy way.
...
Don't use pluginhook to run the commands hook, just run all the scripts
in a loop.
2013-11-22 21:42:39 +00:00
Paul Lietar
83ce81fc51
Enable tracing in hooks when DOKKU_TRACE is set.
...
This makes it much easier to debug plugins.
Also source the 'dokkurc' file when starting dokku. This makes it easy
to define DOKKU_TRACE over ssh.
2013-11-18 20:59:48 +00:00
Jeff Lindsay
df7507d1be
normalizing shebang and bash options. also added long-term fix for bootstrap instructions
2013-10-29 17:13:02 -05:00
Alexander
85f14baad5
Introduce URL for app. Plugins can override this.
...
fixes #242
2013-10-24 13:44:05 +02:00
Jose Diaz-Gonzalez
a308ff6546
heroku-like configuration handling for dokku
...
refs #55
superscedes #188
2013-10-17 17:47:19 -04:00
Alexander
774b1f3c45
Merge pull request #180 from asm89/add-run-cmd
...
Add dokku run command to run commands in the app env
2013-08-21 14:47:51 -07:00
Alexander
3e9e6127a7
run-cli -> run, fix help formatting
2013-08-21 00:02:52 +02:00
Alexander
6ead1ab943
Fix that only the output the last plugin command is shown
...
Plugin "commands" should end with "cat" because the output of each
plugin's command is piped through the next one by pluginhook
2013-08-19 21:22:18 +02:00
Alexander
2563581f49
Update help command
2013-08-18 14:32:14 +02:00
Alexander
4b5b86173f
Remove redundant command from dokku-standard plugin
2013-08-18 14:27:38 +02:00