Commit Graph

371 Commits

Author SHA1 Message Date
Jakob Krigovsky
a60dfd3b5e Set X-Forwarded-Proto header if TLS is enabled when running checks 2015-07-09 22:03:29 +02:00
Michael Hobbs
64d76724e5 fix typo. good thing we have a test suite. :P 2015-07-09 12:35:43 -07:00
Michael Hobbs
033a267573 fix urls command when NO_VHOST=1 + tests. fixes #1294 2015-07-09 12:12:58 -07:00
Jose Diaz-Gonzalez
5aada53945 Merge pull request #1277 from progrium/gzip-templates
Gzip templates
2015-07-03 18:23:50 -04:00
Jose Diaz-Gonzalez
35ff3fa5ca Merge pull request #1149 from mlebkowski/feature/receive-branch
pluginhook to receive branches different than master
2015-07-03 17:07:31 -04:00
Jose Diaz-Gonzalez
2d6054605e Remove non-standard redirects 2015-07-03 16:41:17 -04:00
krishna rokhale
62d1d41bc5 removing new lines. 2015-07-03 16:40:23 -04:00
krishna rokhale
adfa13235d added two more cases to SSL template and gzip as default in templates. 2015-07-03 16:40:23 -04:00
Michael Hobbs
0e53a76a1a [ci skip] ensure we parse the correct section of the string. closes #1271 2015-07-03 07:47:30 -07:00
Alessio Treglia
0ed0201b90 Use d-neg condition to prevent unexpected failures 2015-07-01 19:48:09 +01:00
Alessio Treglia
89d1acaa38 Revert "Fix double negative statement"
This reverts commit 54ed3c1f2b.
2015-07-01 19:47:38 +01:00
Alessio Treglia
54ed3c1f2b Fix double negative statement
This is mostly for consistency with its own install script.
2015-07-01 19:20:53 +01:00
Alessio Treglia
91c691a806 Create dokku's /var/log/dokku/ private namespace
Rename dokku.log to events.log.
Refresh tests accordingly.
2015-07-01 18:25:11 +01:00
Alessio Treglia
172e71cac6 Merge branch 'master' into pr-dokku-events 2015-07-01 17:50:09 +01:00
Alessio Treglia
69aba06361 Handle log rotation
As requested by @josegonzalez.
2015-06-28 23:25:50 +01:00
Jose Diaz-Gonzalez
e2e36a5045 Add logging to :80 stanza 2015-06-27 12:24:27 -04:00
Alessio Treglia
16e4001677 Restart rsyslog once installed
Seems that a mere reload doesn't work.
2015-06-27 10:20:07 +01:00
Alessio Treglia
fb5d3a06f0 Attempt to fix SC2046 2015-06-26 18:01:40 +01:00
Alessio Treglia
da3b00a894 Get rid of cruft leftover 2015-06-26 17:57:43 +01:00
Alessio Treglia
466670d804 Quote `find' statement to prevent word splitting
This should fix ShellCheck SC2046 error.
2015-06-26 16:37:01 +01:00
Jose Diaz-Gonzalez
6bb513f12c Split nginx ssl logs by $APP
Refs #1158
2015-06-26 11:03:29 -04:00
Alessio Treglia
8e7916131c Double quote $@ in plugins/20_events/install too 2015-06-26 15:25:57 +01:00
Alessio Treglia
a858bc8f81 Double quote $@ array expansions 2015-06-26 15:18:38 +01:00
Alessio Treglia
f5e213e390 Add missing DOKKU_RSYSLOG_FILTER in install script
It had gone lost while porting the original 3rd party plugin.
2015-06-26 15:12:55 +01:00
Alessio Treglia
e9a73442e2 Fix missing 'fi' in plugins/20_events/install 2015-06-26 15:11:42 +01:00
Alessio Treglia
783bb02b2c Implement events logging feature
Record events (i.e. pluginhook's calls) as syslog entries and
provide a shortcut command to display the last part of the log
file.

A brief summary of the changes follows:

dokku:
 - New DOKKU_EVENTS_LOGFILE envvar to hold logfile location.

plugins/20_events/commands:
 - events output log entries, a tail's follow-like mode is
   provided too.
 - events:[on|off] enables/disables logging.
 - events:list lists events that are logged.

plugins/20_events/hook:
 - Generic hook that writes log entries. All the events are
   registered via symlink to this script.

plugins/common/functions:
 - dokku_log_event() writes log entries via logger.
 - dokku_log_pluginhook_call() formats log entries and writes
   them via dokku_log_event().
2015-06-26 14:47:18 +01:00
Maciej Łebkowski
259f8507ca pluginhook to receive branches different than master 2015-06-25 18:00:11 +02:00
Arthur Schreiber
0da389e8af Further fixes for config values containing newlines. 2015-06-23 23:53:10 +02:00
Arthur Schreiber
182ae4a50a Support config variables containing \n 2015-06-23 23:41:34 +02:00
Michael Hobbs
ea66619f3c allow passing of docker build options and document dockerfile deployment. closes #1231 2015-06-15 09:00:33 -07:00
Loïc Guitaut
9a71fff3f1 Use --no-cache when building Dockerfile
Since `docker build` is only invoked when actually building a new image
from a Dockerfile, using `--no-cache` allows to have an updated image
even if the Dockerfile hasn't changed.
This works well with Dockerfiles using `git` or packages referencing
latest versions instead of "static" ones.
2015-06-11 12:05:07 +02: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
c5a74fac90 Merge pull request #1193 from progrium/1187_mh-docker-opts-over-ssh
handle docker opts over ssh without escaping quotes. closes #1187
2015-05-18 12:16:08 -07:00
Michael Hobbs
bd0b14692a lintball 2015-05-18 10:27:16 -07:00
Michael Hobbs
a785bf82e6 handle docker opts over ssh without escaping quotes. closes #1187 2015-05-18 09:01:12 -07:00
Michael Hobbs
1f6badc6a1 lintball fix 2015-05-18 08:46:42 -07:00
Michael Hobbs
0d2e5f1a14 Merge branch 'master' into mh-ps-scale 2015-05-17 17:45:01 -07:00
Jose Diaz-Gonzalez
eac3eba50e Merge pull request #1179 from trsc/prevent_dismissal_of_urls_in_checks_file
prevent dismissal of URLs in CHECKS file that contain query params
2015-05-16 14:30:21 -04:00
Vincent Fretin
2e69ff6041 wait 30 seconds and not 30 minutes 2015-05-16 18:20:50 +02:00
Michael Hobbs
c5337cf6a2 include output when overriding nginx template 2015-05-11 12:00:44 -07:00
Andreas Follmann
6eefcbb87c prevent dismissal of URLs in CHECKS file that contain query params 2015-05-11 15:31:28 +02: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
4aedb6507a Merge branch 'master' into mh-ps-scale 2015-04-30 10:32:29 -07:00
Jose Diaz-Gonzalez
713a8d4f31 Merge pull request #1146 from progrium/1142_mh-domains-no-redeploy
don't re-deploy on domains:add. allow multple domains on command line. closes #1142
2015-04-27 22:11:01 -04:00
Michael Hobbs
dce031d38d don't re-deploy on domains:add. allow multple domains on command line. closes #1142 2015-04-24 15:41:32 -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
e9663caf5c updated dokku ls output with container status 2015-04-24 10:49:18 -07:00
Andreas Litt
5968e81b17 exec git-receive-pack with correct path 2015-04-23 15:17:25 +02:00