Michael Hobbs
88cd81e390
ensure we have newlines around our config. closes #1025
2015-03-09 19:32:05 -07: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
Michael Hobbs
b468c2e09e
Merge pull request #1008 from lmars/fix-nginx-multiple-ssl-vhosts
...
Support multiple domains using a wildcard TLS certificate
2015-03-09 12:05:20 -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
fb8f08d280
remove quoting from dockerfile env. closes #1002
2015-02-24 11:56:54 -08:00
Michael Hobbs
12777d9bf0
simplify SSL hostname handling and avoid overwriting variables. refs #971
2015-02-12 13:27:47 -08:00
Michael Hobbs
043b055558
don't use set to guard against pipefail
2015-02-11 17:48:55 -08:00
Michael Hobbs
e5fb746a7f
only look for long args in global space. allows for short args in plugins. closes #963
2015-02-09 16:59:07 -08:00
Michael Hobbs
ef583eef66
use consistent bash shebang. closes #959
2015-02-08 22:34:35 -08:00
Michael Hobbs
179a5e611b
introduce pre/post-build-buildstep and pre/post-release-buildstep
2015-02-07 17:56:01 -08:00
Michael Hobbs
7357df7c9d
first pass at dockerfile support
2015-02-07 17:56:01 -08:00
Michael Hobbs
1cfb1fc3fc
implement dokku shell and ls (by @plietar). refs #312
2015-02-07 14:46:17 -08:00
Michael Hobbs
959c51eb50
refactor function defs to be posix-like. remove usage of force positional argument in tests. support --force like arguments in client"
2015-02-07 11:35:04 -08:00
Michael Hobbs
fe3e079a93
[ci skip] rename -rm to --rm for DOKKU_RM_CONTAINER
2015-02-07 09:28:09 -08:00
Michael Hobbs
9164740117
rename log functions with dokku_log_ prefix
2015-02-06 08:28:14 -08:00
Michael Hobbs
371ba99540
include echo functions that don't print when quiet arg is passed
2015-02-05 12:38:59 -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
Jose Diaz-Gonzalez
72a58bbda3
Merge pull request #927 from progrium/906-mh-docker-args-phase-pluginhooks
...
support both docker-args PHASE and docker-args-PHASE for the time being. closes #906
2015-02-04 11:13:14 -05:00
Michael Hobbs
30d660335f
Merge pull request #941 from progrium/931-mh-source-glabal-env-deploy-run
...
source global env prior to app env. closes #931
2015-02-04 07:32:12 -08:00
Michael Hobbs
b48464a7e2
Merge pull request #925 from progrium/mh-ps-rebuild
...
implement rebuild command that reuses git_archive_all
2015-02-03 14:56:44 -08:00
Michael Hobbs
5fb30ab934
source global env prior to app env. closes #931
2015-02-03 13:47:20 -08:00
Vincent Fretin
955f95e899
enable ssl_prefer_server_ciphers
...
Since we create /etc/nginx/nginx.conf we don't have "ssl_prefer_server_ciphers on" option enabled anymore, enable it in dokku.conf
2015-02-03 09:52:18 +01:00
Michael Hobbs
1b22f69b9e
support both docker-args PHASE and docker-args-PHASE for the time being. closes #906
2015-01-29 18:33:20 -08:00
Michael Hobbs
c96d139f54
use flock when (re)building/deploying
2015-01-28 16:18:57 -08:00
Michael Hobbs
9f985077c7
implement rebuild command that reuses git_archive_all
2015-01-27 15:00:00 -08:00
Michael Hobbs
4ad0c3022e
use tty cmd to detect if we have one. closes #921
2015-01-24 20:00:11 -08:00
Michael Hobbs
3e100e3002
conditionally set interactive and tty on dokku run.
...
closes #552
closes #913
2015-01-21 13:49:46 -08:00
Jose Diaz-Gonzalez
b8851a66cf
Merge pull request #894 from progrium/dokku-client
...
Dokku client
2015-01-18 17:43:09 -05:00
Michael Hobbs
d7830fa730
prevent error on restartall when no apps deployed
2015-01-16 17:41:32 -08:00
Michael Hobbs
55c2b0fd62
allow force override
2015-01-16 14:57:49 -08:00
Jose Diaz-Gonzalez
19871fe81d
Merge pull request #900 from progrium/mh-nginx-ssl-san-hostname
...
support extracting SANs from SSL certificates and adding them to nginx config
2015-01-16 15:22:15 -05:00
Jose Diaz-Gonzalez
514d66f40d
Merge pull request #891 from progrium/keep-old
...
Keep existing configuration files when installing nginx. Refs #886
2015-01-16 15:19:57 -05:00
Michael Hobbs
6cd89fa72a
support extracting SANs from SSL certificates and adding them to nginx config
2015-01-15 12:08:27 -08:00
Michael Hobbs
e760e1cc92
implement ps:restartall. closes #82 #218
2015-01-14 16:37:49 -08:00
Michael Hobbs
9490889411
allow ps to be used by plugins that support pre container actions
2015-01-14 16:25:13 -08:00
Michael Hobbs
61e154899b
use ps:restart for config and domains plugins
2015-01-14 15:25:53 -08:00
Michael Hobbs
c0028f122b
initial pass at a ps plugin
2015-01-14 15:19:58 -08:00
Jose Diaz-Gonzalez
55129cb9f6
Keep existing configuration files when installing nginx. Refs #886
2015-01-13 22:42:33 -05: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
da465a61dd
disable VHOST deployment if global VHOST file is missing
2015-01-08 15:58:08 -08:00
Jose Diaz-Gonzalez
8502881633
Merge pull request #868 from expa/mh-circle-ci
...
use circleci for automated testing
2015-01-06 23:44:15 -05: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
9d81dda524
try circle again
2015-01-05 17:03:06 -08:00
Jose Diaz-Gonzalez
566cc15081
Merge pull request #864 from progrium/860-mh-bind-to-internal-ip
...
bind docker container to internal port if using vhosts
2015-01-05 19:58:18 -05:00
Michael Hobbs
441d212ef2
add ipv6 detection for external port binding
2015-01-05 10:47:20 -08:00
Jose Diaz-Gonzalez
bc072e1db3
Merge pull request #858 from progrium/857-disable-server-tokens
...
Disable server tokens in nginx. Closes #857
2015-01-03 22:12:22 -05:00
