Stafford Brunk
e33f5c94a5
Use listen 443 ssl instead of ssl on in vhost conf file
2014-04-03 07:04:35 -06:00
eitland
e2a5e92cf7
s/ssl/TLS/g + domain name must match for wildcards
...
* Updated ssl to TLS as requested.
* Added information that names must match
2014-03-31 22:53:01 +02:00
eitland
9e49bc12ed
Add details on how to use wildcard ssls
...
After reading the source code for hints on how to deploy wildcard ssls I found it was already supported.
The proposed change should make this feature easier to find.
2014-03-31 21:27:19 +02:00
rhy-jot
4907c3c684
Merge pull request #488 from lucaswilric/ip-regex
...
Validate vhosts names more strictly
2014-03-12 15:13:32 -04:00
Lucas Wilson-Richter
69c13f1bd3
Improve IP detection regex so it isn't fooled by domains that
...
look like IP addresses.
2014-03-12 07:47:21 +11:00
Lucas Wilson-Richter
3fcc49ff00
Validate vhosts names more strictly
...
There was a bug in the setup page where valid domains that start with a number
would be captured by the validation check designed to detect IP
addresses. This check detects IPs by comparing the host name to a regex,
instead of simply detecting whether the first character is a number.
2014-03-10 17:05:37 +11:00
rhy-jot
0c49481282
Merge pull request #481 from elia/master
...
Ensure the app is really running before killing it
2014-03-08 17:45:20 -05:00
rhy-jot
900fe6fe8c
Delete test application when finished with it
2014-03-08 17:33:04 -05:00
rhy-jot
2368f2d65d
Add test for the multi buildpack, courtesy of https://github.com/AlJohri
2014-03-08 13:28:02 -08:00
rhy-jot
f6b7b62b15
Update PREBUILT_STACK_URL
2014-03-08 13:25:09 -08:00
rhy-jot
a9af04db81
Merge pull request #476 from joliv/master
...
Man page
2014-03-08 18:27:41 +00:00
joliv
c5665e1e83
Moved addman in Makefile as to not break everything
2014-03-08 12:23:22 -05:00
joliv
09610c1e4e
Added manpage installation
2014-03-08 11:46:46 -05:00
joliv
dd4c390168
Added man page
2014-03-08 11:29:25 -05:00
Elia Schito
b1267ebf56
Ensure the app is really running before killing it
2014-03-07 00:54:54 +01:00
rhy-jot
7fc7a46ed3
Merge pull request #475 from alimony/patch-1
...
Fix typo.
2014-03-03 21:12:40 +00:00
Markus Amalthea Magnuson
0e46eba05b
Fix typo.
...
prefered -> preferred
2014-03-03 21:37:36 +01:00
rhy-jot
c2ae9fabe0
No need for bin/. (see also: acf2dfa73a)
2014-02-28 16:41:21 -08:00
rhy-jot
ee7d3295c9
Follow redirects
2014-02-28 16:40:12 -08:00
rhy-jot
082ba1dc96
Update PREBUILT_STACK_URL
2014-02-28 16:39:51 -08:00
rhy-jot
ceeff6d09f
Update stable's version
2014-02-28 23:52:19 +00:00
rhy-jot
25f4a81b71
Merge pull request #467 from silasb/fixing-log-tail
...
Using logs --follow instead of attaching to instance
2014-02-27 15:16:56 -08:00
silasb
37f977a68d
If passing -t for tail, use logs --follow else just get last 100 lines
2014-02-25 21:23:01 -05:00
silasb
75286cdfa1
Using logs --follow instead of attaching to instance
2014-02-24 18:48:46 -05:00
rhy-jot
217d00a1bc
Merge pull request #440 from imchairmanm/patch-1
...
Bump version number in dokku-installer.rb
2014-02-17 10:00:09 -08:00
rhy-jot
12c907b148
Merge pull request #443 from gdi2290/patch-1
...
update copyright year
2014-02-17 09:59:54 -08:00
rhy-jot
8c237153d2
Merge pull request #454 from dmyers/vagrant-memory
...
Added option to set memory size for vagrant
2014-02-17 09:59:19 -08:00
Derek Myers
4ec4354b0a
Added option to set memory size for vagrant
2014-02-15 17:06:39 -06:00
PatrickJS
59dfe6b529
update copyright year
2014-02-03 22:53:56 -08:00
rhy-jot
f4d3d80075
SSL -> TLS
2014-02-03 10:13:09 -08:00
rhy-jot
af8e103bb3
Recommend 12.04 due to 13.04's EOL
2014-02-03 10:05:41 -08:00
imchairmanm
0272e87433
Bump version number in dokku-installer.rb
...
Just bumping the version number to bring it up-to-date with the rest of the project.
2014-02-02 13:00:53 -05:00
Paul Lietar
c5b7a63c8d
Merge pull request #415 from JasonPunyon/patch-1
...
Fix typo in README.md
2014-01-12 09:43:06 -08:00
Jason Punyon
88433433dc
Fix typo in README.md
...
aditional -> additional
2014-01-11 19:36:29 -05:00
rhy-jot
8fca2204ed
Merge pull request #407 from banyan/specify-docker-version
...
Add $DOCKER_VERSION to specify docker version
2014-01-08 13:27:30 -08:00
Paul Lietar
acb226cb86
Merge pull request #400 from aegypius/suppress-git-output-unless-dokku-trace-is-enabled
...
Suppress git "detached HEAD" notice output
2014-01-07 05:32:34 -08:00
aegypius
d208e53649
Suppress git advice related to detached HEAD
2014-01-07 14:30:29 +01:00
Kohei Hasegawa
57906fa562
Add $DOCKER_VERSION to specify docker version
2014-01-07 00:21:58 +09:00
Paul Lietar
3a3b56c7ab
Merge pull request #405 from AlJohri/master
...
Fix docker build for docker v0.7.3
2014-01-06 04:04:12 -08:00
Al Johri
a892a920a8
Docker build no longer works with github url
...
Change default URL for progrium/buildstep to include full git clone url
2014-01-06 06:00:42 -06:00
rhy-jot
f0c41e3a81
Merge pull request #370 from jazzzz/submodules
...
Submodule support
2013-12-28 19:50:23 -08:00
Jazz
7b28307306
Added submodules test
2013-12-28 16:10:50 +01:00
Jazz
7f0591fa1e
Submodules support
2013-12-28 16:10:13 +01:00
rhy-jot
419efc2cf1
Merge pull request #391 from mikexstudios/receive-predir-fix
...
Fix edge case: app directory is created before first app push
2013-12-23 19:13:32 -08:00
Michael Huynh
d9ed1e07eb
Fix edge case: app directory is created before first app push
...
When an app directory (i.e. `/home/dokku/myapp`) is created before the
app is pushed for the first time (which may occur if config files such
as `ENV` are added before the initial push), then the app directory will
not be initialized to a bare git repo nor will the pre-receive hook be
installed because `plugins/git/commands` assumes that if `$APP_PATH`
exists, then the directory must also be git initialized too. This fix
checks for `$APP_PATH/refs` instead.
2013-12-23 21:50:49 -05:00
rhy-jot
3ee694d3ea
Merge pull request #383 from colnpanic/features/notify-non-master-push
...
notify user when pushing to non-master branch
2013-12-22 14:09:08 -08:00
jay becker
7eae3b063c
notify user when pushing to non-master branch
2013-12-22 14:30:51 -06:00
rhy-jot
c16afaa338
Merge pull request #390 from rhy-jot/2013-12-20/java-test
...
Add Java test
2013-12-20 11:45:09 -08:00
rhy-jot
921bdc48a6
Add Java test
2013-12-20 11:35:00 -08:00
rhy-jot
b602cd3127
Update dig command
...
Was changed in da11349e81
2013-12-19 20:22:07 -08:00
