Jose Diaz-Gonzalez
e2e36a5045
Add logging to :80 stanza
2015-06-27 12:24:27 -04:00
Jose Diaz-Gonzalez
6bb513f12c
Split nginx ssl logs by $APP
...
Refs #1158
2015-06-26 11:03:29 -04:00
Kirushanth Sakthivetpillai
db6e71b7d6
Update nginx.ssl.conf.template
...
use nginx $host variable intead of $ssl_server_nam (which may be *.example.com) which does bogus redirects
2015-06-05 15:01:22 -04:00
Andy Chambers
eedb05d656
[ Fixes #1158 ] Split nginx logs by $APP
...
* nginx access logs to /var/log/nginx/${APP}-access.log
* nginx error logs to /var/log/nginx/${APP}-error.log
2015-05-24 23:59: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
c83fbad205
xip.io style vhosts with tests. closes #1005
2015-03-19 11:23:00 -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
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
043b055558
don't use set to guard against pipefail
2015-02-11 17:48:55 -08:00
Michael Hobbs
ef583eef66
use consistent bash shebang. closes #959
2015-02-08 22:34:35 -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
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
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
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
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
ab7f9f1161
Move server_tokens off to the global nginx conf
2015-01-03 21:41:18 -05:00
Michael Hobbs
948d7902f2
bind docker container to internal port if using vhosts
2015-01-02 16:27:19 -08:00
Jose Diaz-Gonzalez
2a51301a5d
Disable server tokens in nginx. Closes #857
2015-01-01 15:03:43 -05: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
606bbda66c
make tests work
2014-12-21 14:51:40 -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
e99e2201cb
mv default VHOST creation to core install
2014-12-16 20:25:44 -08:00
