Release 0.3.5

Merge pull request #784 from progrium/no-vhost-hotfix
Fix NO_VHOST check
2014-11-24 02:17:50 -05:00 · 2014-11-24 02:16:39 -05:00 · 2014-11-24 02:16:21 -05:00 · 2014-11-23 23:37:18 -05:00 · 2014-11-23 23:27:34 -05:00 · 2014-11-23 19:58:12 -08:00
41 changed files with 1063 additions and 408 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+root = true
+
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 2
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,8 +1,87 @@
 # History

-## 0.3.0 (in progress)
+## 0.3.5
+
+- #784: @josegonzalez Fix NO_VHOST check
+
+## 0.3.4
+
+- #780: @josegonzalez Output error message when a command is not found. Closes #778
+- #781: @michaelhobbs use DOKKU_IMAGE (i.e. progrium/buildstep)
+
+## 0.3.3
+
+- #659: @Xe contrib: add dokku client shell script
+- #669 @ohardy Handle dokku plugins-update command
+- #722: @wrboyce Add `git pull` support with git-pre-pull and git-post-pull hooks
+- #751: @tboerger Partial openSUSE support
+- #776: @joliv Update man page for new commands
+- #777: @tboerger Use PLUGINS_PATH env var and persist environment when running dokku with sudo
+- #779: @josegonzalez Minor bash formatting changes
+
+## 0.3.2
+
+- #675: @michaelhobbs port wait-to-retire from broadly/dokku
+- #765: @josegonzalez Ignore tls directory when listing apps
+- #766: @josegonzalez Sort output of apps command
+- #771: @josegonzalez Doc updates
+- #518 #772: @nickl- Import ssl certificates
+- #773: @alex-sherwin Support a way to not create nginx vhost
+- #774: @josegonzalez Add the ability to customize an app's hostname using nginx-hostname pluginhook
+
+## 0.3.1
+
+- 647b2157: @josegonzalez Update HISTORY.md for 0.3.0
+- #359: @plietar Remove plugins before copying them again
+- #573: @eriknomitch Use command instead of which for apt-get existential check in bootstrap.sh
+- #579: @motin Plugin nginx-vhosts includes files in folder nginx.conf.d
+- #607: @fbochu Use PLUGIN_PATH in dokku default case
+- #617: @markstos Document what bootstrap.sh is doing
+- #758: @josegonzalez Make ENV file readable only from dokku user. Closes #621
+- #699: @tombell Actually suppress the output from `git_archive_all`
+- #702: @jazzzz Allows config:set to set parameters values with spaces
+- #754: @josegonzalez Remove all references to Ubuntu 12.04. Refs #238
+- #755: @josegonzalez Setup dokku-installer within Vagrant VM on first provision
+- #759: @josegonzalez Create an `apps` core plugin
+- #760: @josegonzalez Formatting
+- #761: @josegonzalez Add dokku-registry to list. Closes #716
+- #762: @josegonzalez Update template for dokku docs
+
+## 0.3.0
+
+- Added git submodules support
+- 969aed87: @jfrazelle  Fix double brackets issue in nginx-vhosts install
+- 42fee25f: @rhy-jot Mention 14.04 & 12.10 sunset
+- 4f5fc586: @rhy-jot Update cipher list
+- #276: @joliv  Add dependencies hook - wingrunr21- #476: Added man page entry
+- #522: @wingrunr21 Improve SSL support and implement SPDY
+- #544: @jfrazelle  if dokku.conf has not been created, create it
+- #555: @jakubholynet Readme fix, Env vars only set at run time
+- #562: @assaf Zero down-time deploy and server checks
+- #571: @joliv Added man page plugin command
+  #601: @jazzzz Restart app only if config changed
+- #628: @voronianski Update Vagrant box to trusty because of raring server issues
+- #632: @jazzzz Fixed port when docker is start with --ip with an IP other than 0.0.0.0
+- #654: @cameron-martin Fixed variable name for RESTART
+- #664: @alexernst Don't overwrite $APP/URL modified by plugins in post-deploy hook
+- #665: @protomouse Explicitly install man-db
+- #698: @tombell Help output formatting
+- #701: @jazzzz  Fix issues with single-letter config:set usage
+- #703: @jazzzz  Display help when invoking dokku with no parameter
+- #706: @josegonzalez Consolidate documentation on viewthedocs
+- #709: @rinti Grammar and spelling fixes
+- #708: @josegonzalez Simplify vagrant workflow
+- #717: @kristofsajdak Add dokku-registry to plugin list
+- #718: @Coaxial Use https for installation instructions
+- #721: @wrboyce  Fix issue in plugins-install-dependencies
+- #723: @ghostbar Let users know they are starting buildstep during installation
+- #735: @andrewsomething Redirect to the app deployment docs on success.
+- #745: @rcarmo Typo
+- #746: @vincentfretin replace gitreceive by sshcommand in example url
+- #748: @vincentfretin Link to proper blog url
+- #749: @vincentfretin Fix app certificate directory in backup-import/export
+- #750: @th4t Remove unintended phrase repetition in installation.md

-* Added git submodules support

 ## 0.2.0 (2013-11-24)

--- a/22
+++ b/22
@@ -5,6 +5,7 @@ PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_
 STACK_URL ?= https://github.com/progrium/buildstep.git
 PREBUILT_STACK_URL ?= https://github.com/progrium/buildstep/releases/download/2014-03-08/2014-03-08_429d4a9deb.tar.gz
 DOKKU_ROOT ?= /home/dokku
+PLUGINS_PATH ?= /var/lib/dokku/plugins

 # If the first argument is "vagrant-dokku"...
 ifeq (vagrant-dokku,$(firstword $(MAKECMDGOALS)))
@@ -14,7 +15,7 @@ ifeq (vagrant-dokku,$(firstword $(MAKECMDGOALS)))
  $(eval $(RUN_ARGS):;@:)
 endif

-.PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count vagrant-acl-add vagrant-dokku
+.PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count dokku-installer vagrant-acl-add vagrant-dokku

 all:
 	# Type "make install" to install.
@@ -23,8 +24,13 @@ install: dependencies stack copyfiles plugin-dependencies plugins version

 copyfiles: addman
 	cp dokku /usr/local/bin/dokku
-	mkdir -p /var/lib/dokku/plugins
-	cp -r plugins/* /var/lib/dokku/plugins
+	mkdir -p ${PLUGINS_PATH}
+	find ${PLUGINS_PATH} -mindepth 2 -maxdepth 2 -name '.core' -printf '%h\0' | xargs -0 rm -Rf
+	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do \
+	    rm -Rf ${PLUGINS_PATH}/$$plugin && \
+	    cp -R plugins/$$plugin ${PLUGINS_PATH} && \
+	    touch ${PLUGINS_PATH}/$$plugin/.core; \
+	    done

 addman:
 	mkdir -p /usr/local/share/man/man1
@@ -84,6 +90,16 @@ count:
 	@echo "Test lines:"
 	@find tests -type f | xargs cat | wc -l

+dokku-installer:
+	test -f /var/lib/dokku/.dokku-installer-created || gem install rack -v 1.5.2 --no-rdoc --no-ri
+	test -f /var/lib/dokku/.dokku-installer-created || gem install rack-protection -v 1.5.3 --no-rdoc --no-ri
+	test -f /var/lib/dokku/.dokku-installer-created || gem install sinatra -v 1.4.5 --no-rdoc --no-ri
+	test -f /var/lib/dokku/.dokku-installer-created || gem install tilt -v 1.4.1 --no-rdoc --no-ri
+	test -f /var/lib/dokku/.dokku-installer-created || ruby /root/dokku/contrib/dokku-installer.rb onboot
+	test -f /var/lib/dokku/.dokku-installer-created || service dokku-installer start
+	test -f /var/lib/dokku/.dokku-installer-created || service nginx reload
+	test -f /var/lib/dokku/.dokku-installer-created || touch /var/lib/dokku/.dokku-installer-created
+
 vagrant-acl-add:
 	vagrant ssh -- sudo sshcommand acl-add dokku $(USER)

--- a/README.md
+++ b/README.md
@@ -4,13 +4,13 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. S

 ## Requirements

- A fresh VM running either Ubuntu `14.04 x64` or `12.04 x64`
+- A fresh VM running Ubuntu `14.04 x64`

 ## Installing

 To install the latest stable version of dokku, you can run the following bootstrapper command:

-    $ wget -qO- https://raw.github.com/progrium/dokku/v0.3.0/bootstrap.sh | sudo DOKKU_TAG=v0.3.0 bash
+    $ wget -qO- https://raw.github.com/progrium/dokku/v0.3.5/bootstrap.sh | sudo DOKKU_TAG=v0.3.5 bash

 ## Documentation

--- a/1
+++ b/1
@@ -30,4 +30,5 @@ Vagrant::configure("2") do |config|
  end

  config.vm.provision :shell, :inline => "apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}"
+  config.vm.provision :shell, :inline => "cd /root/dokku && make dokku-installer"
 end
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
+# A script to bootstrap dokku.
+# It expects to be run on Ubuntu 14.04 via 'sudo'
+# It checks out the dokku source code from Github into ~/dokku and then runs 'make install' from dokku source.
+
 set -eo pipefail
 export DEBIAN_FRONTEND=noninteractive
 export DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"}

-if ! which apt-get &>/dev/null
+if ! command -v apt-get &>/dev/null
 then
  echo "This installation script requires apt-get. For manual installation instructions, consult https://github.com/progrium/dokku ."
  exit 1
--- a/contrib/dokku-installer.rb
+++ b/contrib/dokku-installer.rb
@@ -3,120 +3,120 @@ require "sinatra"
 require "open3"

 if ARGV[0] == "onboot"
-	File.open("/etc/init/dokku-installer.conf", "w") do |f|
-		f.puts "start on runlevel [2345]"
-		f.puts "exec #{File.absolute_path(__FILE__)} selfdestruct"
-	end
-	File.open("/etc/nginx/conf.d/dokku-installer.conf", "w") do |f|
-		f.puts "upstream dokku-installer { server 127.0.0.1:2000; }"
-		f.puts "server {"
-  		f.puts "	listen      80;"
-  		f.puts "	location    / {"
-    	f.puts "		proxy_pass  http://dokku-installer;"
-  		f.puts "	}"
-		f.puts "}"
-	end
-	`rm /etc/nginx/sites-enabled/*`
-	puts "Installed Upstart service and default Nginx virtualhost for installer to run on boot."
-	exit
+  File.open("/etc/init/dokku-installer.conf", "w") do |f|
+    f.puts "start on runlevel [2345]"
+    f.puts "exec #{File.absolute_path(__FILE__)} selfdestruct"
+  end
+  File.open("/etc/nginx/conf.d/dokku-installer.conf", "w") do |f|
+    f.puts "upstream dokku-installer { server 127.0.0.1:2000; }"
+    f.puts "server {"
+      f.puts "  listen      80;"
+      f.puts "  location    / {"
+      f.puts "    proxy_pass  http://dokku-installer;"
+      f.puts "  }"
+    f.puts "}"
+  end
+  `rm /etc/nginx/sites-enabled/*`
+  puts "Installed Upstart service and default Nginx virtualhost for installer to run on boot."
+  exit
 end

-version 	= "v0.2.1"
-dokku_root	= ENV["DOKKU_ROOT"] || "/home/dokku"
-admin_key 	= `cat /root/.ssh/authorized_keys`.split("\n").first
-hostname 	= `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip
-template 	= DATA.read
+version   = "v0.3.5"
+dokku_root  = ENV["DOKKU_ROOT"] || "/home/dokku"
+admin_key   = `cat /root/.ssh/authorized_keys`.split("\n").first
+hostname  = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip
+template  = DATA.read

 set :port, 2000
 set :environment, :production
 disable :protection

 get "/" do
-	ERB.new(template).result binding
+  ERB.new(template).result binding
 end

 post "/setup" do
-	if params[:vhost] == "true"
-		File.open("#{dokku_root}/VHOST", "w") {|f| f.write params[:hostname] }
-	else
-		`rm #{dokku_root}/VHOST`
-	end
-	File.open("#{dokku_root}/HOSTNAME", "w") {|f| f.write params[:hostname] }
-	Open3.capture2("sshcommand acl-add dokku admin", :stdin_data => params[:key])
-	Thread.new {
-		`rm /etc/nginx/conf.d/dokku-installer.conf && /etc/init.d/nginx stop && /etc/init.d/nginx start`
-		`rm /etc/init/dokku-installer.conf && stop dokku-installer`
-	}.run if ARGV[0] == "selfdestruct"
+  if params[:vhost] == "true"
+    File.open("#{dokku_root}/VHOST", "w") {|f| f.write params[:hostname] }
+  else
+    `rm #{dokku_root}/VHOST`
+  end
+  File.open("#{dokku_root}/HOSTNAME", "w") {|f| f.write params[:hostname] }
+  Open3.capture2("sshcommand acl-add dokku admin", :stdin_data => params[:key])
+  Thread.new {
+    `rm /etc/nginx/conf.d/dokku-installer.conf && /etc/init.d/nginx stop && /etc/init.d/nginx start`
+    `rm /etc/init/dokku-installer.conf && stop dokku-installer`
+  }.run if ARGV[0] == "selfdestruct"
 end

 __END__
 <html>
 <head>
-	<title>Dokku Setup</title>
-	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" />
-	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
+  <title>Dokku Setup</title>
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" />
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 </head>
 <body>
-	<div class="container" style="width: 640px;">
-	<form id="form" role="form">
-		<h1>Dokku Setup <small><%= version %></small></h1>
-		<div class="form-group">
-			<h3><small style="text-transform: uppercase;">Admin Access</small></h3>
-			<label for="key">Public Key</label><br />
-			<textarea class="form-control" name="key" rows="7" id="key"><%= admin_key %></textarea>
-		</div>
-		<div class="form-group">
-			<h3><small style="text-transform: uppercase;">Hostname Configuration</small></h3>
-			<div class="form-group">
-				<label for="hostname">Hostname</label>
-				<input class="form-control" type="text" id="hostname" name="hostname" value="<%= hostname %>" />
-			</div>
-			<div class="checkbox">
-				<label><input id="vhost" name="vhost" type="checkbox" value="true"> Use <abbr title="Nginx will be run on port 80 and backend to your apps based on hostname">virtualhost naming</abbr> for apps</label>
-			</div>
-			<p>Your app URLs will look like:</p>
-			<pre id="example">http://hostname:port</pre>
-		</div>
-		<button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span style="padding-left: 20px;" id="result"></span>
-	</form>
-	</div>
-	<div id="error-output"></div>
-	<script>
-		function setup() {
-			if ($.trim($("#key").val()) == "") {
-				alert("Your admin public key cannot be blank.")
-				return
-			}
-			if ($.trim($("#hostname").val()) == "") {
-				alert("Your hostname cannot be blank.")
-				return
-			}
-			data = $("#form").serialize()
-			$("input,textarea,button").prop("disabled", true);
-			$.post('/setup', data)
-				.done(function() {
-					$("#result").html("Success!")
-					window.location.href = "http://progrium.viewdocs.io/dokku/application-deployment";
-				})
-				.fail(function(data) {
-					$("#result").html("Something went wrong...")
-					$("#error-output").html(data.responseText)
-				});
-		}
-		function update() {
-			if ($("#vhost").is(":checked") && $("#hostname").val().match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
-				alert("In order to use virtualhost naming, the hostname must not be an IP but a valid domain name.")
-				$("#vhost").prop('checked', false);
-			}
-			if ($("#vhost").is(':checked')) {
-				$("#example").html("http://&lt;app-name&gt;."+$("#hostname").val())
-			} else {
-				$("#example").html("http://"+$("#hostname").val()+":&lt;app-port&gt;")
-			}
-		}
-		$("#vhost").change(update);
-		$("#hostname").change(update);
-		update();
-	</script>
+  <div class="container" style="width: 640px;">
+  <form id="form" role="form">
+    <h1>Dokku Setup <small><%= version %></small></h1>
+    <div class="form-group">
+      <h3><small style="text-transform: uppercase;">Admin Access</small></h3>
+      <label for="key">Public Key</label><br />
+      <textarea class="form-control" name="key" rows="7" id="key"><%= admin_key %></textarea>
+    </div>
+    <div class="form-group">
+      <h3><small style="text-transform: uppercase;">Hostname Configuration</small></h3>
+      <div class="form-group">
+        <label for="hostname">Hostname</label>
+        <input class="form-control" type="text" id="hostname" name="hostname" value="<%= hostname %>" />
+      </div>
+      <div class="checkbox">
+        <label><input id="vhost" name="vhost" type="checkbox" value="true"> Use <abbr title="Nginx will be run on port 80 and backend to your apps based on hostname">virtualhost naming</abbr> for apps</label>
+      </div>
+      <p>Your app URLs will look like:</p>
+      <pre id="example">http://hostname:port</pre>
+    </div>
+    <button type="button" onclick="setup()" class="btn btn-primary">Finish Setup</button> <span style="padding-left: 20px;" id="result"></span>
+  </form>
+  </div>
+  <div id="error-output"></div>
+  <script>
+    function setup() {
+      if ($.trim($("#key").val()) == "") {
+        alert("Your admin public key cannot be blank.")
+        return
+      }
+      if ($.trim($("#hostname").val()) == "") {
+        alert("Your hostname cannot be blank.")
+        return
+      }
+      data = $("#form").serialize()
+      $("input,textarea,button").prop("disabled", true);
+      $.post('/setup', data)
+        .done(function() {
+          $("#result").html("Success!")
+          window.location.href = "http://progrium.viewdocs.io/dokku/application-deployment";
+        })
+        .fail(function(data) {
+          $("#result").html("Something went wrong...")
+          $("#error-output").html(data.responseText)
+        });
+    }
+    function update() {
+      if ($("#vhost").is(":checked") && $("#hostname").val().match(/^(\d{1,3}\.){3}\d{1,3}$/)) {
+        alert("In order to use virtualhost naming, the hostname must not be an IP but a valid domain name.")
+        $("#vhost").prop('checked', false);
+      }
+      if ($("#vhost").is(':checked')) {
+        $("#example").html("http://&lt;app-name&gt;."+$("#hostname").val())
+      } else {
+        $("#example").html("http://"+$("#hostname").val()+":&lt;app-port&gt;")
+      }
+    }
+    $("#vhost").change(update);
+    $("#hostname").change(update);
+    update();
+  </script>
 </body>
 </html>
--- a/contrib/dokku_client.sh
+++ b/contrib/dokku_client.sh
@@ -0,0 +1,32 @@
+if [ -z "$DOKKU_HOST" ]
+then
+	function dokku {
+		appname=$(git remote -v 2>/dev/null | grep dokku | head -n 1 | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
+		if [ "$?" != "0" ]
+		then
+			donotshift="YES"
+		fi
+		if [ "$1" = "create" ]
+		then
+			appname=$(echo "print(elfs.GenName())" | lua -l elfs)
+			if git remote add dokku dokku@$DOKKU_HOST:$appname
+			then
+				echo "-----> Dokku remote added at $DOKKU_HOST"
+				echo "-----> Application name is $appname"
+			else
+				echo "!      Dokku remote not added! Do you already have a dokku remote?"
+				return
+			fi
+			git push dokku master
+		else
+			if [ -z "$donotshift" ]
+			then
+				ssh dokku@$DOKKU_HOST $*
+				exit
+			fi
+			verb=$1
+			shift
+			ssh dokku@$DOKKU_HOST "$verb" "$appname" $@
+		fi
+	}
+fi
--- a/docs/index.md
+++ b/docs/index.md
@@ -12,7 +12,7 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen.
 - [Remote commands](http://progrium.viewdocs.io/dokku/remote-commands)
 - [Plugins](http://progrium.viewdocs.io/dokku/plugins)
 - [Configuration management](http://progrium.viewdocs.io/dokku/configuration-management)
- [TLS/SPDY support](http://progrium.viewdocs.io/dokku/tls-spdy-support)
+- [Nginx Configuration](http://progrium.viewdocs.io/dokku/nginx)
 - [DNS](http://progrium.viewdocs.io/dokku/dns)

 ## Things this project won't do
@@ -23,4 +23,4 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen.

 ## Sponsors

-Though we love everybody doing open source, we especially love [Deis](http://deis.io/) for sponsoring Dokku.
+Though we love everybody doing open source, we especially love [Deis](http://deis.io/) for sponsoring Dokku.
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -2,18 +2,16 @@

 ## Requirements

- A fresh VM running either Ubuntu `14.04 x64` or `12.04 x64`
+- A fresh VM running Ubuntu `14.04 x64`

-Ubuntu 14.04 x64 or 12.04 x64. Ideally have a domain ready to point to your host. It's designed for and is probably best to use a fresh VM. The bootstrapper will install everything it needs.
-
-**Note: Support for 12.04 will be sunsetting in the near future after dokku & 14.04 have been more thoroughly tested.**
+Ubuntu 14.04 x64 x64. Ideally have a domain ready to point to your host. It's designed for and is probably best to use a fresh VM. The bootstrapper will install everything it needs.

 ## Installing the latest Stable version

 To install the latest stable version of dokku, you can run the following bootstrapper command:

 ```bash
-wget -qO- https://raw.github.com/progrium/dokku/v0.3.0/bootstrap.sh | sudo DOKKU_TAG=v0.3.0 bash
+wget -qO- https://raw.github.com/progrium/dokku/v0.3.5/bootstrap.sh | sudo DOKKU_TAG=v0.3.5 bash
 ```

 ## Configuring
@@ -115,11 +113,7 @@ sudo BUILD_STACK=true make install
    vagrant up
    ```

- Add SSH key to Dokku using `sshcommand`:
-
-    ```bash
-    cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
-    ```
+- Copy your SSH key via `cat ~/.ssh/id_rsa.pub | pbcopy` and paste it into the dokku-installer at http://dokku.me . Change the `Hostname` field on the Dokku Setup screen to your domain and then check the box that says `Use virtualhost naming`. Then click *Finish Setup* to install your key. You'll be directed to application deployment instructions from here.

 You are now ready to deploy an app or install plugins.

--- a/docs/tls-spdy-support.md
+++ b/docs/tls-spdy-support.md
@@ -1,14 +1,18 @@
-# TLS/SPDY support
+# Nginx
+
+Dokku uses nginx as it's server for routing requests to specific applications.
+
+## TLS/SPDY support

 Dokku provides easy TLS/SPDY support out of the box. This can be done app-by-app or for all subdomains at once. Note that whenever TLS support is enabled SPDY is also enabled.

-## Per App
+### Per App

 To enable TLS connection to to one of your applications, copy or symlink the `.crt`/`.pem` and `.key` files into the application's `/home/dokku/:app/tls` folder (create this folder if it doesn't exist) as `server.crt` and `server.key` respectively.

 Redeployment of the application will be needed to apply TLS configuration. Once it is redeployed, the application will be accessible by `https://` (redirection from `http://` is applied as well).

-## All Subdomains
+### All Subdomains

 To enable TLS connections for all your applications at once you will need a wildcard TLS certificate.

@@ -23,8 +27,52 @@ The nginx configuration will need to be reloaded in order for the updated TLS co

 **Note**: TLS will not be enabled unless the application's VHOST matches the certificate's name. (i.e. if you have a cert for *.example.com TLS won't be enabled for something.example.org or example.net)

-## HSTS Header
+### HSTS Header

 The [HSTS header](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) is an HTTP header that can inform browsers that all requests to a given site should be made via HTTPS. dokku does not, by default, enable this header. It is thus left up to you, the user, to enable it for your site.

 Beware that if you enable the header and a subsequent deploy of your application results in an HTTP deploy (for whatever reason), the way the header works means that a browser will not attempt to request the HTTP version of your site if the HTTPS version fails.
+
+### Importing ssl certificates
+
+You can import ssl certificates via tarball using the following command:
+
+``` bash
+dokku nginx:import-ssl myapp < archive-of-certs.tar
+```
+
+This archive should is expanded via `tar xvf`. It should contain `server.crt` and `server.key`.
+
+## Disabling VHOSTS
+
+If desired, it is possible to disable vhosts by setting the `NO_VHOST` environment variable:
+
+```bash
+dokku config:set myapp NO_VHOST=1
+```
+
+On subsequent deploys, the nginx virtualhost will be discarded. This is useful when deploying internal-facing services that should not be publicly routeable.
+
+## Customizing hostnames
+
+Applications typically have the following structure for their hostname:
+
+```
+scheme://subdomain.domain.tld
+```
+
+The `subdomain` is inferred from the pushed application name, while the `domain` is set during initial configuration in the `$DOKKU_ROOT/VHOST` file.
+
+You can optionally override this in a plugin by implementing the `nginx-hostname` pluginhook. For example, you can reverse the subdomain with the following sample `nginx-hostname` pluginhook:
+
+```bash
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1"; SUBDOMAIN="$2"; VHOST="$3"
+
+NEW_SUBDOMAIN=`echo $SUBDOMAIN | rev`
+echo "$NEW_SUBDOMAIN.$VHOST"
+```
+
+If the `nginx-hostname` has no output, the normal hostname algorithm will be executed.
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -28,123 +28,190 @@ If you create your own plugin:
 3. edit this page and add a link to it below!
 4. subscribe to the [dokku development blog](http://progrium.com) to be notified about API changes and releases

+### Sample plugin
+
+The below plugin is a dummy `dokku hello` plugin. If your plugin exposes commands, this is a good template for your `commands` file:
+
+```bash
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+case "$1" in
+  hello)
+    [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
+    [[ ! -d "$DOKKU_ROOT/$APP" ]] && echo "App $APP does not exist" && exit 1
+    APP="$2";
+
+    echo "Hello $APP"
+    ;;
+
+  hello:world)
+    echo "Hello world"
+    ;;
+
+  help)
+    cat && cat<<EOF
+    hello <app>                                     Says "Hello <app>"
+    hello:world                                     Says "Hello world"
+EOF
+    ;;
+
+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;
+
+esac
+```
+
+A few notes:
+
+- You should always support `DOKKU_TRACE` as specified on the 2nd line of the plugin.
+- If your command requires that an application exists, ensure you check for it's existence in the manner prescribed above.
+- A `help` command is required, though it is allowed to be empty.
+- Commands *should* be namespaced.
+- As of 0.3.3, a catch-all should be implemented which exits with a `DOKKU_NOT_IMPLEMENTED_EXIT` code. This allows dokku to output a `command not found` message.
+
 ## Community plugins

 Note: The following plugins have been supplied by our community and may not have been tested by dokku maintainers.

-[Kloadut]: https://github.com/Kloadut
-[jeffutter]: https://github.com/jeffutter
-[jezdez]: https://github.com/jezdez
-[blag]: https://github.com/blag
-[luxifer]: https://github.com/luxifer
-[stuartpb]: https://github.com/stuartpb
-[hughfletcher]: https://github.com/hughfletcher
-[Aomitayo]: https://github.com/Aomitayo
-[jlachowski]: https://github.com/jlachowski
-[apmorton]: https://github.com/apmorton
-[statianzo]: https://github.com/statianzo
-[sehrope]: https://github.com/sehrope
-[wmluke]: https://github.com/wmluke
-[krisrang]: https://github.com/krisrang
-[scottatron]: https://github.com/scottatron
-[pauldub]: https://github.com/pauldub
-[dyson]: https://github.com/dyson
-[musicglue]: https://github.com/musicglue
-[motin]: https://github.com/motin
-[neam]: https://github.com/neam
-[cedricziel]: https://github.com/cedricziel
-[pnegahdar]: https://github.com/pnegahdar
-[fgrehm]: https://github.com/fgrehm
-[alexanderbeletsky]: https://github.com/alexanderbeletsky
-[thrashr888]: https://github.com/thrashr888
-[robv]: https://github.com/robv
-[rlaneve]: https://github.com/rlaneve
-[cef]: https://github.com/cef
+[agco-adm]: https://github.com/agco-adm
+[ademuk]: https://github.com/ademuk
 [alex-sherwin]: https://github.com/alex-sherwin
+[alexanderbeletsky]: https://github.com/alexanderbeletsky
+[Aomitayo]: https://github.com/Aomitayo
+[apmorton]: https://github.com/apmorton
+[blag]: https://github.com/blag
+[cameron-martin]: https://github.com/cameron-martin
+[cedricziel]: https://github.com/cedricziel
+[cef]: https://github.com/cef
+[darkpixel]: https://github.com/darkpixel
+[dyson]: https://github.com/dyson
 [F4-Group]: https://github.com/F4-Group
 [fermuch]: https://github.com/fermuch
-[Zenedith]: https://github.com/Zenedith
+[fgrehm]: https://github.com/fgrehm
+[gdi2290]: https://github.com/gdi2290
 [heichblatt]: https://github.com/heichblatt
-[michaelshobbs]: https://github.com/michaelshobbs
+[hughfletcher]: https://github.com/hughfletcher
 [iskandar]: https://github.com/iskandar
-[mikexstudios]: https://github.com/mikexstudios
-[cameron-martin]: https://github.com/cameron-martin
+[jeffutter]: https://github.com/jeffutter
+[jezdez]: https://github.com/jezdez
+[jlachowski]: https://github.com/jlachowski
+[krisrang]: https://github.com/krisrang
+[Kloadut]: https://github.com/Kloadut
+[luxifer]: https://github.com/luxifer
+[mlebkowski]: https://github.com/mlebkowski
 [matto1990]: https://github.com/matto1990
+[michaelshobbs]: https://github.com/michaelshobbs
+[mikecsh]: https://github.com/mikecsh
+[mikexstudios]: https://github.com/mikexstudios
+[motin]: https://github.com/motin
+[musicglue]: https://github.com/musicglue
+[neam]: https://github.com/neam
+[nornagon]: https://github.com/nornagon
 [ohardy]: https://github.com/ohardy
+[pauldub]: https://github.com/pauldub
+[pnegahdar]: https://github.com/pnegahdar
+[RaceHub]: https://github.com/racehub
+[rlaneve]: https://github.com/rlaneve
+[robv]: https://github.com/robv
+[scottatron]: https://github.com/scottatron
+[sehrope]: https://github.com/sehrope
+[statianzo]: https://github.com/statianzo
+[stuartpb]: https://github.com/stuartpb
+[thrashr888]: https://github.com/thrashr888
+[wmluke]: https://github.com/wmluke
+[Zenedith]: https://github.com/Zenedith

 ### Datastores

-| Plugin | Author | Compatibility |
-| --- | --- | --- |
-| [CouchDB](https://github.com/racehub/dokku-couchdb-plugin) | [RaceHub](https://github.com/racehub) | Compatible with 0.2.0 |
-| [MariaDB](https://github.com/Kloadut/dokku-md-plugin) | [Kloadut][] | Compatible with 0.2.0 |
-| [MariaDB (single container)](https://github.com/ohardy/dokku-mariadb) | [ohardy][] | Compatible with 0.2.0 |
-| [MongoDB (single container)](https://github.com/jeffutter/dokku-mongodb-plugin) | [jeffutter][] | |
-| [PostgreSQL](https://github.com/Kloadut/dokku-pg-plugin) | [Kloadut][] | Compatible with 0.2.0 |
-| [PostgreSQL (single container)](https://github.com/jeffutter/dokku-postgresql-plugin) | [jeffutter][] | This plugin creates a single postgresql container that all your apps can use. Thus only one instance of postgresql running (good for servers without a ton of memory). |
-| [PostgreSQL](https://github.com/jezdez/dokku-postgres-plugin) | [jezdez][] | Compatible with 0.2.0 |
-| [PostgreSQL (single container)](https://github.com/ohardy/dokku-psql) | [ohardy][] | Compatible with 0.2.0 |
-| [PostGIS](https://github.com/fermuch/dokku-pg-plugin) | [fermuch][] | |
-| [Redis](https://github.com/jezdez/dokku-redis-plugin) | [jezdez][] | Requires https://github.com/rlaneve/dokku-link; compatible with 0.2.0 |
-| [Redis](https://github.com/luxifer/dokku-redis-plugin) | [luxifer][] | |
-| [Redis (single container)](https://github.com/ohardy/dokku-redis) | [ohardy][] | Compatible with 0.2.0 |
-| [RethinkDB](https://github.com/stuartpb/dokku-rethinkdb-plugin) | [stuartpb][] | 2014-02-22: targeting dokku @ [latest][217d00a]; will fail with Dokku earlier than [28de3ec][]. |
-| [RiakCS (single container)](https://github.com/jeffutter/dokku-riakcs-plugin) | [jeffutter][] | Incompatible with 0.2.0 (checked at [dccee02][]) |
-| [MySQL](https://github.com/hughfletcher/dokku-mysql-plugin) | [hughfletcher][] | |
-| [Memcached](https://github.com/jezdez/dokku-memcached-plugin) | [jezdez][] | Compatible with 0.2.0 |
-| [Neo4j](https://github.com/Aomitayo/dokku-neo4j-plugin) | [Aomitayo][] | |
-| [RabbitMQ](https://github.com/jlachowski/dokku-rabbitmq-plugin) | [jlachowski][] | IP & PORT available directly in linked app container env variables (requires link plugin)|
-| [RabbitMQ (single container)](https://github.com/jlachowski/dokku-rabbitmq-single-plugin) | [jlachowski][] | IP & PORT available directly in linked app container env variables (requires link plugin)|
-| [Postgresql](https://github.com/jlachowski/dokku-pg-plugin) | [jlachowski][] | IP & PORT available directly in linked app container env variables (requires link plugin)|
-| [Memcached](https://github.com/jlachowski/dokku-memcached-plugin) | [jlachowski][] | IP & PORT available directly in linked app container env variables (requires link plugin)|
-| [Varnish](https://github.com/Zenedith/dokku-varnish-plugin) | [Zenedith][] | Varnish cache between nginx and application with base configuration|
+#### Relational
+
+| Plugin                                                                                            | Author                | Compatibility         |
+| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [MariaDB](https://github.com/Kloadut/dokku-md-plugin)                                             | [Kloadut][]           | Compatible with 0.2.0 |
+| [MariaDB (single container)](https://github.com/ohardy/dokku-mariadb)                             | [ohardy][]            | Compatible with 0.2.0 |
+| [MySQL](https://github.com/hughfletcher/dokku-mysql-plugin)                                       | [hughfletcher][]      |                       |
+| [PostgreSQL](https://github.com/Kloadut/dokku-pg-plugin)                                          | [Kloadut][]           | Compatible with 0.2.0 |
+| [PostgreSQL](https://github.com/jezdez/dokku-postgres-plugin)                                     | [jezdez][]            | Compatible with 0.2.0 |
+| [PostgreSQL](https://github.com/jlachowski/dokku-pg-plugin)                                       | [jlachowski][]        | IP & PORT available directly in linked app container env variables (requires link plugin)|
+| [PostgreSQL (single container)](https://github.com/jeffutter/dokku-postgresql-plugin)             | [jeffutter][]         | This plugin creates a single postgresql container that all your apps can use. Thus only one instance of postgresql running (good for servers without a ton of memory). |
+| [PostgreSQL (single container)](https://github.com/ohardy/dokku-psql)                             | [ohardy][]            | Compatible with 0.2.0 |
+| [PostGIS](https://github.com/fermuch/dokku-pg-plugin)                                             | [fermuch][]           |                       |
+
+#### Caching
+
+| Plugin                                                                                            | Author                | Compatibility         |
+| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [Memcached](https://github.com/jezdez/dokku-memcached-plugin)                                     | [jezdez][]            | Compatible with 0.2.0 |
+| [Memcached](https://github.com/jlachowski/dokku-memcached-plugin)                                 | [jlachowski][]        | IP & PORT available directly in linked app container env variables (requires link plugin)|
+| [Redis](https://github.com/jezdez/dokku-redis-plugin)                                             | [jezdez][]            | Requires https://github.com/rlaneve/dokku-link; compatible with 0.2.0 |
+| [Redis](https://github.com/luxifer/dokku-redis-plugin)                                            | [luxifer][]           |                       |
+| [Redis (single container)](https://github.com/ohardy/dokku-redis)                                 | [ohardy][]            | Compatible with 0.2.0 |
+| [Varnish](https://github.com/Zenedith/dokku-varnish-plugin)                                       | [Zenedith][]          | Varnish cache between nginx and application with base configuration|
+
+#### Queuing
+
+| Plugin                                                                                            | Author                | Compatibility         |
+| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [RabbitMQ](https://github.com/jlachowski/dokku-rabbitmq-plugin)                                   | [jlachowski][]        | IP & PORT available directly in linked app container env variables (requires link plugin)|
+| [RabbitMQ (single container)](https://github.com/jlachowski/dokku-rabbitmq-single-plugin)         | [jlachowski][]        | IP & PORT available directly in linked app container env variables (requires link plugin)|
+
+#### Other
+
+| Plugin                                                                                            | Author                | Compatibility         |
+| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [CouchDB](https://github.com/racehub/dokku-couchdb-plugin)                                        | [RaceHub][]           | Compatible with 0.2.0 |
+| [MongoDB (single container)](https://github.com/jeffutter/dokku-mongodb-plugin)                   | [jeffutter][]         |                       |
+| [RethinkDB](https://github.com/stuartpb/dokku-rethinkdb-plugin)                                   | [stuartpb][]          | 2014-02-22: targeting dokku @ [latest][217d00a]; will fail with Dokku earlier than [28de3ec][]. |
+| [RiakCS (single container)](https://github.com/jeffutter/dokku-riakcs-plugin)                     | [jeffutter][]         | Incompatible with 0.2.0 (checked at [dccee02][]) |
+| [Neo4j](https://github.com/Aomitayo/dokku-neo4j-plugin)                                           | [Aomitayo][]          |                       |

 [dccee02]: https://github.com/jeffutter/dokku-riakcs-plugin/commit/dccee02702e7001851917b7814e78a99148fb709

 ### Process Managers

-| Plugin | Author | Compatibility |
-| --- | --- | --- |
-| [Circus](https://github.com/apmorton/dokku-circus) | [apmorton][] | |
-| [Shoreman ](https://github.com/statianzo/dokku-shoreman) | [statianzo][] | Compatible with 0.2.0 |
-| [Supervisord](https://github.com/statianzo/dokku-supervisord) | [statianzo][] | Compatible with 0.2.0 |
-| [Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord) | [sehrope][] | Works with dokku @ [c77cbf1][] - no 0.2.0 compatibility |
-| [Forego](https://github.com/iskandar/dokku-forego) | [iskandar][] | Compatible with 0.2.x |
+| Plugin                                                                                            | Author                | Compatibility         |
+| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [Circus](https://github.com/apmorton/dokku-circus)                                                | [apmorton][]          |                       |
+| [Shoreman ](https://github.com/statianzo/dokku-shoreman)                                          | [statianzo][]         | Compatible with 0.2.0 |
+| [Supervisord](https://github.com/statianzo/dokku-supervisord)                                     | [statianzo][]         | Compatible with 0.2.0 |
+| [Logging Supervisord](https://github.com/sehrope/dokku-logging-supervisord)                       | [sehrope][]           | Works with dokku @ [c77cbf1][] - no 0.2.0 compatibility |
+| [Forego](https://github.com/iskandar/dokku-forego)                                                | [iskandar][]          | Compatible with 0.2.x |

 [c77cbf1]: https://github.com/progrium/dokku/commit/c77cbf1d3ae07f0eafb85082ed7edcae9e836147
 [28de3ec]: https://github.com/progrium/dokku/commit/28de3ecaa3231a223f83fd8d03f373308673bc40

 ### Dokku Features

-| Plugin | Author | Compatibility |
-| --- | --- | --- |
-| [Custom Domains](https://github.com/neam/dokku-custom-domains) | [motin][] | Compatible with 0.2.* and master |
-| [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>4</sup> | [wmluke][] | Compatible with 0.2.0 . |
-| [git rev-parse HEAD in env](https://github.com/nornagon/dokku-git-rev) | [nornagon](https://github.com/nornagon) | Compatible with 0.2.0 |
-| [Rebuild application](https://github.com/scottatron/dokku-rebuild) | [scottatron][] | Compatible with 0.2.x |
-| [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack) | [pauldub][] | |
-| [Docker Options](https://github.com/dyson/dokku-docker-options) | [dyson][] | Requires dokku >= [c77cbf1][] |
-| [Persistent Storage](https://github.com/dyson/dokku-persistent-storage) | [dyson][] | Requires dokku >= [c77cbf1][] |
-| [Volume (persistent storage)](https://github.com/ohardy/dokku-volume) | [ohardy][] | Compatible with 0.2.0 |
-| [user-env-compile](https://github.com/musicglue/dokku-user-env-compile)<sup>1</sup>  | [musicglue][] | Compatible with dokku master branch |
-| [user-env-compile](https://github.com/motin/dokku-user-env-compile)<sup>1</sup>  | [motin][] | Compatible with 0.2.1 |
-| [registry](https://github.com/agco-adm/dokku-registry)<sup>5</sup>  | [agco-adm](https://github.com/agco-adm) |  |
-| [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>2</sup>  | [cedricziel][] | 2014-01-17: compatible with upstream/master |
-| [SSH Hostkeys](https://github.com/cedricziel/dokku-hostkeys-plugin)<sup>3</sup>  | [cedricziel][] | 2014-01-17: compatible with upstream/master |
-| [Link Containers](https://github.com/rlaneve/dokku-link) | [rlaneve][] | Requires dokku >= [c77cbf1][] |
-| [Host Port binding](https://github.com/stuartpb/dokku-bind-port) | [stuartpb][] | Requires dokku >= [c77cbf1][]. 2014-02-17: [a043e98][] targeting dokku @ [latest][217d00a] |
-| [Docker name](https://github.com/alex-sherwin/dokku-name) | [alex-sherwin][] | Requires dokku >= [c77cbf1][] |
-| [No VHOST](https://github.com/alex-sherwin/dokku-novhost) | [alex-sherwin][] | Requires dokku >= [c77cbf1][] |
-| [Docker Direct](https://github.com/heichblatt/dokku-docker-direct) | [heichblatt][] | |
-| [Ports](https://github.com/heichblatt/dokku-ports) | [heichblatt][] | |
-| [Debug](https://github.com/heichblatt/dokku-debug) | [heichblatt][] | |
-| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks) | [michaelshobbs][] | |
-| [Hostname](https://github.com/michaelshobbs/dokku-hostname) | [michaelshobbs][] | |
-| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration) | [motin][] | Requires https://github.com/progrium/dokku/pull/579 |
-| [Multiple domains and per-app custom nginx.conf](https://github.com/mikexstudios/dokku-nginx-alt) | [mikexstudios][] | Works with v0.2.3 |
-| [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)| [cameron-martin][] | Works with v0.2.3 |
-| [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps) | [matto1990][] | Works with v0.2.3 |
-| [app-url](https://github.com/mikecsh/dokku-app-url) | [mikecsh](https://github.com/mikecsh) | Works with 0.2.0 |
+| Plugin                                                                                            | Author                | Compatibility         |
+| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [app-url](https://github.com/mikecsh/dokku-app-url)                                               | [mikecsh][]           | Works with 0.2.0      |
+| [Custom Domains](https://github.com/neam/dokku-custom-domains)                                    | [motin][]             | Compatible with 0.2.* |
+| [Debug](https://github.com/heichblatt/dokku-debug)                                                | [heichblatt][]        |                       |
+| [Docker Direct](https://github.com/heichblatt/dokku-docker-direct)                                | [heichblatt][]        |                       |
+| [Docker Options](https://github.com/dyson/dokku-docker-options)                                   | [dyson][]             | dokku >= [c77cbf1][]  |
+| [Dokku Name](https://github.com/alex-sherwin/dokku-name)                                          | [alex-sherwin][]      | dokku >= [c77cbf1][]  |
+| [Dokku Registry](https://github.com/agco-adm/dokku-registry)                                      | [agco-adm][]          |                       |
+| [git rev-parse HEAD in env](https://github.com/nornagon/dokku-git-rev)                            | [nornagon][]          | Compatible with 0.2.0 |
+| [HTTP Auth Secure Apps](https://github.com/matto1990/dokku-secure-apps)                           | [matto1990][]         | Works with v0.2.3     |
+| [Host Port binding](https://github.com/stuartpb/dokku-bind-port)                                  | [stuartpb][]          | dokku >= [c77cbf1][]. 2014-02-17: [a043e98][] targeting dokku @ [latest][217d00a] |
+| [Hostname](https://github.com/michaelshobbs/dokku-hostname)                                       | [michaelshobbs][]     |                       |
+| [Link Containers](https://github.com/rlaneve/dokku-link)                                          | [rlaneve][]           | dokku >= [c77cbf1][]  |
+| [Multi-Buildpack](https://github.com/pauldub/dokku-multi-buildpack)                               | [pauldub][]           |                       |
+| [Multiple Domains](https://github.com/wmluke/dokku-domains-plugin)<sup>4</sup>                    | [wmluke][]            | Compatible with 0.2.0 |
+| [Nginx-Alt](https://github.com/mikexstudios/dokku-nginx-alt)                                      | [mikexstudios][]      | Works with v0.2.3     |
+| [Persistent Storage](https://github.com/dyson/dokku-persistent-storage)                           | [dyson][]             | Requires dokku >= [c77cbf1][] |
+| [Ports](https://github.com/heichblatt/dokku-ports)                                                | [heichblatt][]        |                       |
+| [Pre-Deploy Tasks](https://github.com/michaelshobbs/dokku-app-predeploy-tasks)                    | [michaelshobbs][]     |                       |
+| [Rebuild application](https://github.com/scottatron/dokku-rebuild)                                | [scottatron][]        | Compatible with 0.2.x |
+| [SSH Deployment Keys](https://github.com/cedricziel/dokku-deployment-keys)<sup>2</sup>            | [cedricziel][]        | 2014-01-17: compatible with upstream/master |
+| [SSH Hostkeys](https://github.com/cedricziel/dokku-hostkeys-plugin)<sup>3</sup>                   | [cedricziel][]        | 2014-01-17: compatible with upstream/master |
+| [Supply env vars to buildpacks](https://github.com/cameron-martin/dokku-build-env)                | [cameron-martin][]    | Works with v0.2.3     |
+| [user-env-compile](https://github.com/musicglue/dokku-user-env-compile)<sup>1</sup>               | [musicglue][]         | Compatible with dokku master branch |
+| [user-env-compile](https://github.com/motin/dokku-user-env-compile)<sup>1</sup>                   | [motin][]             | Compatible with 0.2.1 |
+| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration)    | [motin][]             | Compatible with 0.3.1 |
+| [Volume (persistent storage)](https://github.com/ohardy/dokku-volume)                             | [ohardy][]            | Compatible with 0.2.0 |

 [8fca220]: https://github.com/progrium/dokku/commit/8fca2204edb0017796d6915ca9157c05b1238e28
 [217d00a]: https://github.com/progrium/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7
@@ -163,21 +230,21 @@ Note: The following plugins have been supplied by our community and may not have

 ### Other Add-ons

-| Plugin | Author | Compatibility |
-| --- | --- | --- |
-| [Node](https://github.com/pnegahdar/dokku-node) | [pnegahdar](https://github.com/pnegahdar) | |
-| [Node](https://github.com/ademuk/dokku-nodejs) | [ademuk](https://github.com/ademuk) | |
-| [Chef cookbooks](https://github.com/fgrehm/chef-dokku) | [fgrehm][] | |
-| [Bower install](https://github.com/alexanderbeletsky/dokku-bower-install) | [alexanderbeletsky][] | |
-| [Bower/Grunt](https://github.com/thrashr888/dokku-bower-grunt-build-plugin) | [thrashr888][] | |
-| [Bower/Gulp](https://github.com/gdi2290/dokku-bower-gulp-build-plugin) | [gdi2290](https://github.com/gdi2290) | |
-| [Elasticsearch](https://github.com/robv/dokku-elasticsearch) | [robv][] | |
-| [Elasticsearch](https://github.com/jezdez/dokku-elasticsearch-plugin) | [jezdez][] | Compatible with 0.2.0 |
-| [Elasticsearch](https://github.com/blag/dokku-elasticsearch-plugin)<sup>1</sup> | [blag][] | Compatible with 0.2.0 |
-| [HipChat Notifications](https://github.com/cef/dokku-hipchat) | [cef][] | |
-| [Graphite/statsd] (https://github.com/jlachowski/dokku-graphite-plugin) | [jlachowski][] | |
-| [APT](https://github.com/F4-Group/dokku-apt) | [F4-Group][] | |
-| [User ACL](https://github.com/mlebkowski/dokku-acl) | [Maciej Łebkowski](https://github.com/mlebkowski) | |
-| [PrimeCache](https://github.com/darkpixel/dokku-prime-cache) | [darkpixel](https://github.com/darkpixel/) | |
+| Plugin                                                                                            | Author                | Compatibility         |
+| ------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
+| [Node](https://github.com/pnegahdar/dokku-node)                                                   | [pnegahdar][]         |                       |
+| [Node](https://github.com/ademuk/dokku-nodejs)                                                    | [ademuk][]            |                       |
+| [Chef cookbooks](https://github.com/fgrehm/chef-dokku)                                            | [fgrehm][]            |                       |
+| [Bower install](https://github.com/alexanderbeletsky/dokku-bower-install)                         | [alexanderbeletsky][] |                       |
+| [Bower/Grunt](https://github.com/thrashr888/dokku-bower-grunt-build-plugin)                       | [thrashr888][]        |                       |
+| [Bower/Gulp](https://github.com/gdi2290/dokku-bower-gulp-build-plugin)                            | [gdi2290][]           |                       |
+| [Elasticsearch](https://github.com/robv/dokku-elasticsearch)                                      | [robv][]              |                       |
+| [Elasticsearch](https://github.com/jezdez/dokku-elasticsearch-plugin)                             | [jezdez][]            | Compatible with 0.2.0 |
+| [Elasticsearch](https://github.com/blag/dokku-elasticsearch-plugin)<sup>1</sup>                   | [blag][]              | Compatible with 0.2.0 |
+| [HipChat Notifications](https://github.com/cef/dokku-hipchat)                                     | [cef][]               |                       |
+| [Graphite/statsd](https://github.com/jlachowski/dokku-graphite-plugin)                            | [jlachowski][]        |                       |
+| [APT](https://github.com/F4-Group/dokku-apt)                                                      | [F4-Group][]          |                       |
+| [User ACL](https://github.com/mlebkowski/dokku-acl)                                               | [Maciej Łebkowski][]  |                       |
+| [PrimeCache](https://github.com/darkpixel/dokku-prime-cache)                                      | [darkpixel][]         |                       |

 <sup>1</sup> Forked from [jezdez/dokku-elasticsearch-plugin](https://github.com/jezdez/dokku-elasticsearch-plugin): uses Elasticsearch 1.2 (instead of 0.90), doesn't depend on dokku-link, runs as elasticsearch user instead of root, and turns off multicast autodiscovery for use in a VPS environment.
--- a/docs/template.html
+++ b/docs/template.html
@@ -0,0 +1,105 @@
+<!doctype html>
+<head>
+  <meta charset="utf-8">
+  <title>{{NAME}} :: viewdocs.io</title>
+  <link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:300,600' rel='stylesheet' type='text/css'>
+  <link href='http://fonts.googleapis.com/css?family=Montserrat:400,700' rel='stylesheet' type='text/css'>
+  <link rel="stylesheet" href="http://static.gist.io/css/screen.css">
+  <style type="text/css">
+    body {
+      background: #f0f3f3;
+      font: 500 16px proxima-nova-1, proxima-nova-2, 'Proxima Nova', 'Montserrat', HelveticaNeue, Helvetica, Arial, sans-serif;
+    }
+    article pre {
+      background-color: #fff;
+      border-radius: 2px;
+      box-shadow: 0 0 10px rgba(0,0,0,.1);
+      color: #222;
+      font-family: 'Source Code Pro', Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
+      font-size: 14px;
+      overflow: auto;
+      padding: 10px;
+      width: 100%;
+      -moz-border-radius: 2px;
+      -webkit-border-radius: 2px;
+    }
+    article p code {
+      background-color: #fff;
+      border-radius: 2px;
+      box-shadow: 0 0 10px rgba(0,0,0,.1);
+      color: #333;
+      font-family: 'Source Code Pro', Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
+      font-size: 14px;
+      padding: 0 4px;
+      -moz-border-radius: 2px;
+      -webkit-border-radius: 2px;
+    }
+    article .highlight {
+      padding: 0;
+    }
+    article h1 {
+      font-size: 2em;
+      font-weight: bold;
+    }
+    article h2 {
+      font-size: 1.5em;
+      font-weight: bold;
+    }
+    article h3 {
+      font-size: 1em;
+      text-transform: uppercase;
+      font-weight: bold;
+    }
+    article ul, article ol {
+      list-style-position: outside;
+      padding-left: 20px;
+    }
+    th:nth-of-type(1) {
+      width: 230px;
+    }
+    th:nth-of-type(2) {
+      width: 140px;
+    }
+    tr, td {
+      line-height: 24px;
+      text-align: left;
+    }
+    #gistbody h1:first-child {
+      border-bottom: 1px solid #dadada;
+      display: block;
+      color: #000;
+      font-weight: 700;
+      font-size: 20px;
+      line-height: 1;
+      margin: 0 0 24px 0;
+      padding-bottom: 31px;
+      -webkit-font-smoothing: antialiased;
+      -moz-osx-font-smoothing: grayscale;
+    }
+    .content {
+      font-size: 1em;
+    }
+  </style>
+</head>
+<body>
+  <section class="content">
+    <header>
+      <h1 id="gistid"><a href="http://github.com/{{USER}}/{{NAME}}">{{NAME}}</a> :: <a href="/{{NAME}}">index</a></h1>
+      </header>
+      <article id="gistbody" class="instapaper_body entry-content">
+        {{CONTENT}}
+      </article>
+    </section>
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-6824126-17', 'viewdocs.io');
+      ga('send', 'pageview');
+    </script>
+    <script src="//static.getclicky.com/js" type="text/javascript"></script>
+    <script type="text/javascript">try{ clicky.init(100672863); }catch(e){}</script>
+    <noscript><p><img alt="Clicky" width="1" height="1" src="//in.getclicky.com/100672863ns.gif" /></p></noscript>
+  </body>
+</html>
--- a/62
+++ b/62
@@ -1,17 +1,29 @@
 #!/usr/bin/env bash
 set -eo pipefail
+
+export DOKKU_DISTRO=${DOKKU_DISTRO:="ubuntu"}
+export DOKKU_IMAGE=${DOKKU_IMAGE:="progrium/buildstep"}
 export DOKKU_ROOT=${DOKKU_ROOT:="/home/dokku"}
+
 export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
+export DOKKU_NOT_IMPLEMENTED_EXIT=10
+export DOKKU_VALID_EXIT=0

 [[ -f $DOKKU_ROOT/dokkurc ]] && source $DOKKU_ROOT/dokkurc

 [[ $DOKKU_TRACE ]] && set -x

-if [[ $(id -un) != "dokku" && $1 != plugins-install* ]]; then
-  sudo -u dokku -H $0 "$@"
+if [[ $(id -un) != "dokku" && $1 != plugins-install* && $1 != "plugins-update" ]]; then
+  sudo -u dokku -E -H $0 "$@"
  exit
 fi

+if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
+  export -n SSH_ORIGINAL_COMMAND
+  $0 $SSH_ORIGINAL_COMMAND
+  exit $?
+fi
+
 case "$1" in
  receive)
    APP="$2"; IMAGE="dokku/$APP"
@@ -30,7 +42,7 @@ case "$1" in

  build)
    APP="$2"; IMAGE="dokku/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache"
-    id=$(cat | docker run -i -a stdin progrium/buildstep /bin/bash -c "mkdir -p /app && tar -xC /app")
+    id=$(cat | docker run -i -a stdin $DOKKU_IMAGE /bin/bash -c "mkdir -p /app && tar -xC /app")
    test $(docker wait $id) -eq 0
    docker commit $id $IMAGE > /dev/null
    [[ -d $CACHE_DIR ]] || mkdir $CACHE_DIR
@@ -89,7 +101,18 @@ case "$1" in

    # kill the old container
    if [[ -n "$oldid" ]]; then
-      docker inspect $oldid &> /dev/null && docker kill $oldid > /dev/null
+      # Let the old container finish processing requests, before terminating it
+      WAIT="${DOKKU_WAIT_TO_RETIRE:-60}"
+      echo "-----> Shutting down old container in $WAIT seconds"
+      (
+        exec >/dev/null 2>/dev/null </dev/null
+        trap '' INT HUP
+        sleep $WAIT
+        docker kill $oldid
+      ) & disown -a
+      # Use trap since disown/nohup don't seem to keep child alive
+      # Give child process just enough time to set the traps
+      sleep 0.1
    fi

    ;;
@@ -113,26 +136,49 @@ case "$1" in
    pluginhook dependencies
    ;;

+  plugins-update)
+    pluginhook update
+    ;;
+
  # temporary hack for https://github.com/progrium/dokku/issues/82
  deploy:all)
-    for app in $(ls -d $DOKKU_ROOT/*/); do
-      APP=$(basename $app);
+    for app in $(ls -d $DOKKU_ROOT/*/CONTAINER); do
+      APP=$(basename $(dirname $app));
      dokku deploy $APP
    done
    ;;

  help|'')
+    echo "Usage: dokku COMMAND <app> [command-specific-options]"
+    echo ""
+
    cat<<EOF | pluginhook commands help | sort
    help                                            Print the list of commands
    plugins                                         Print active plugins
    plugins-install                                 Install active plugins
+    plugins-update                                  Update active plugins
 EOF
    ;;

  *)
-    for script in $(ls -d /var/lib/dokku/plugins/*/commands); do
-      $script "$@"
+    implemented=0
+    for script in $(ls -d $PLUGIN_PATH/*/commands); do
+      set +e; $script "$@" ; exit_code=$? ; set -e
+      if [ "$exit_code" -eq "$DOKKU_NOT_IMPLEMENTED_EXIT" ]; then
+        continue
+      fi
+
+      implemented=1
+      if [ "$exit_code" -ne "$DOKKU_VALID_EXIT" ]; then
+        exit $exit_code
+      fi
    done
+
+    if [ "$implemented" -eq 0 ]; then
+      echo " !    \`$@\` is not a dokku command."
+      echo " !    See \`dokku help\` for a list of available commands."
+      exit 1
+    fi
    ;;

 esac
--- a/dokku.1
+++ b/dokku.1
@@ -1,4 +1,4 @@
-.TH DOKKU 1 2014-05-10
+.TH DOKKU 1 2014-11-22
 .\"Make sure to change that date when you commit a change!
 .\"
 .SH NAME
@@ -15,6 +15,15 @@ work with plugins and inspect the current state of your server.
 .\"
 .SH OPTIONS
 .TP
+.BI apps:create " <app>"
+Create a new app.
+.TP
+.BI apps:destroy " <app>"
+Permanantly destroy an app.
+.TP
+.B apps
+List your apps.
+.TP
 .BI backup:import " file"
 Import dokku config files.
 .TP
@@ -33,18 +42,22 @@ Set one or more config vars for an app.
 .BI config:unset " <app> KEY1" \fR\ (KEY2\ \.\.\.)
 Remove one or more config vars from an app.
 .TP
-.BI delete " <app>"
-Delete an application.
-.TP
 .B help
 Print the list of commands.
 .TP
 .B logs \ \fI<app> \fR[\fI-t\fR]
 Show the last logs for an application (-t follows)
 .TP
+.BI nginx:import-ssl " <app>"
+Imports a tarball from stdin which should contain
+server\.crt and server\.key
+.TP
 .B plugins-install
 Install active plugins.
 .TP
+.B plugins-update
+Update active plugins.
+.TP
 .B plugins
 Print active plugins.
 .TP
--- a/plugins/00_dokku-standard/backup-check
+++ b/plugins/00_dokku-standard/backup-check
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 VERSION="$1"
 IMPORT_DIR="$2"
 TARGET_DIR="$3"
@@ -15,4 +16,3 @@ for app in $APPS; do
 done

 exit $ret
-
--- a/plugins/00_dokku-standard/backup-export
+++ b/plugins/00_dokku-standard/backup-export
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 VERSION="$1"
 BASE_DIR="$2"

--- a/plugins/00_dokku-standard/backup-import
+++ b/plugins/00_dokku-standard/backup-import
@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 VERSION="$1"
 IMPORT_DIR="$2"
 TARGET_DIR="$3"

 [[ -f $IMPORT_DIR/.sshcommand ]] && mv $IMPORT_DIR/.sshcommand $TARGET_DIR/.sshcommand
 if [[ -f $IMPORT_DIR/.ssh/authorized_keys ]]; then
-    mkdir -p $TARGET_DIR/.ssh
-    cat $IMPORT_DIR/.ssh/authorized_keys $TARGET_DIR/.ssh/authorized_keys | uniq > $TARGET_DIR/.ssh/authorized_keys
-    chmod 0700 $TARGET_DIR/.ssh
-    chmod 0600 $TARGET_DIR/.ssh/*
+  mkdir -p $TARGET_DIR/.ssh
+  cat $IMPORT_DIR/.ssh/authorized_keys $TARGET_DIR/.ssh/authorized_keys | uniq > $TARGET_DIR/.ssh/authorized_keys
+  chmod 0700 $TARGET_DIR/.ssh
+  chmod 0600 $TARGET_DIR/.ssh/*
 fi
 [[ -f $IMPORT_DIR/HOSTNAME ]] && mv $IMPORT_DIR/HOSTNAME $TARGET_DIR/HOSTNAME
 [[ -f $IMPORT_DIR/VHOST ]] && mv $IMPORT_DIR/VHOST $TARGET_DIR/VHOST
--- a/plugins/00_dokku-standard/commands
+++ b/plugins/00_dokku-standard/commands
@@ -1,39 +1,20 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 case "$1" in
  delete)
-    if [[ -z $2 ]]; then
-        echo "Please specify an app to delete"
-        exit 1
-    fi
-    APP="$2"; IMAGE="dokku/$APP";
-    if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
-        echo "App does not exist"
-        exit 1
-    fi
-
-    pluginhook pre-delete $APP
-    if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
-      ID=$(< "$DOKKU_ROOT/$APP/CONTAINER")
-
-      docker stop $ID > /dev/null || true
-      docker rm $ID  > /dev/null || true
-    fi
-
-    docker images | grep $IMAGE | awk '{print $3}' | xargs docker rmi &> /dev/null &
-
-    pluginhook post-delete $APP
+    dokku apps:destroy $2
    ;;

  logs)
    if [[ -z $2 ]]; then
-        echo "Please specify an app to run the command on"
-        exit 1
+      echo "Please specify an app to run the command on"
+      exit 1
    fi
    APP="$2";
    if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
-        echo "App $APP does not exist"
-        exit 1
+      echo "App $APP does not exist"
+      exit 1
    fi

    if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
@@ -50,13 +31,13 @@ case "$1" in

  run)
    if [[ -z $2 ]]; then
-        echo "Please specify an app to run the command on"
-        exit 1
+      echo "Please specify an app to run the command on"
+      exit 1
    fi
    APP="$2"; IMAGE="dokku/$APP"
    if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
-        echo "App $APP does not exist"
-        exit 1
+      echo "App $APP does not exist"
+      exit 1
    fi
    shift 2

@@ -67,14 +48,14 @@ case "$1" in
  url)
    APP="$2";
    if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
-        echo "App $APP does not exist"
-        exit 1
+      echo "App $APP does not exist"
+      exit 1
    fi

    if [[ -f "$DOKKU_ROOT/$APP/URL" ]]; then
      echo $(< "$DOKKU_ROOT/$APP/URL")
    fi
-    ;;
+  ;;

  version)
    cat "$DOKKU_ROOT/VERSION" || {
@@ -85,7 +66,6 @@ case "$1" in

  help)
    cat && cat<<EOF
-    delete <app>                                    Delete an application
    logs <app> [-t]                                 Show the last logs for an application (-t follows)
    run <app> <cmd>                                 Run a command in the environment of an application
    url <app>                                       Show the URL for an application
@@ -93,5 +73,8 @@ case "$1" in
 EOF
    ;;

-esac
+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;

+esac
--- a/plugins/00_dokku-standard/install
+++ b/plugins/00_dokku-standard/install
@@ -2,12 +2,14 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x

 if [[ ! -f  "$DOKKU_ROOT/HOSTNAME" ]]; then
-    echo $(hostname -f) > $DOKKU_ROOT/HOSTNAME
+  echo $(hostname -f) > $DOKKU_ROOT/HOSTNAME
 fi

 # temporary hack for https://github.com/progrium/dokku/issues/82
 # redeploys all apps after a reboot
-cat<<EOF > /etc/init/dokku-redeploy.conf
+case "$DOKKU_DISTRO" in
+  ubuntu)
+    cat<<EOF > /etc/init/dokku-redeploy.conf
 description "Dokku app redeploy service"

 start on (started docker)
@@ -17,3 +19,21 @@ script
  sudo -i -u dokku /usr/local/bin/dokku deploy:all
 end script
 EOF
+    ;;
+
+  opensuse)
+    cat<<EOF > /etc/systemd/system/dokku-redeploy.service
+[Unit]
+Description=Dokku app redeploy service
+After=docker.target
+
+[Service]
+Type=simple
+User=dokku
+ExecStart=/usr/local/bin/dokku deploy:all
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    ;;
+esac
--- a/plugins/00_dokku-standard/pre-delete
+++ b/plugins/00_dokku-standard/pre-delete
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-APP="$1"
-IMAGE=dokku/"$1"
-CACHE_DIR="$DOKKU_ROOT/$APP/cache"
-
-docker run -v $CACHE_DIR:/cache $IMAGE find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \;
-
-
--- a/plugins/apps/commands
+++ b/plugins/apps/commands
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+case "$1" in
+  apps)
+    echo "=== My Apps"
+    find $DOKKU_ROOT -maxdepth 1 -type d  \( ! -iname ".*" \)  -not -path $DOKKU_ROOT/tls | sed 's|^\./||g' | sed 's|'$DOKKU_ROOT'\/||' | tail -n +2 | sort
+    ;;
+
+  apps:create)
+    if [[ -z $2 ]]; then
+      echo "Please specify an app to create"
+      exit 1
+    fi
+    APP="$2"
+    if [[ -d "$DOKKU_ROOT/$APP" ]]; then
+      echo " !    Name is already taken"
+      exit 1
+    fi
+
+    mkdir -p "$DOKKU_ROOT/$APP"
+    echo "Creating $APP... done"
+    ;;
+
+  apps:destroy)
+    if [[ -z $2 ]]; then
+      echo "Please specify an app to delete"
+      exit 1
+    fi
+    APP="$2"; IMAGE="dokku/$APP";
+    if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
+      echo "App $APP does not exist"
+      exit 1
+    fi
+
+    if [[ "$APP" == "tls" ]]; then
+      echo "Unable to destroy tls directory"
+      exit 1
+    fi
+
+    echo " !    WARNING: Potentially Destructive Action"
+    echo " !    This command will destroy $APP (including all add-ons)."
+    echo " !    To proceed, type \"$APP\""
+    echo ""
+
+    read -p "> " app_name
+    if [[ "$app_name" != "$APP" ]]; then
+      echo " !    Confirmation did not match $APP. Aborted."
+      exit 1
+    fi
+
+    echo "Destroying $APP (including all add-ons)"
+
+    pluginhook pre-delete $APP
+    if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
+      ID=$(< "$DOKKU_ROOT/$APP/CONTAINER")
+
+      docker stop $ID > /dev/null || true
+      docker rm $ID  > /dev/null || true
+    fi
+
+    docker images | grep $IMAGE | awk '{print $3}' | xargs docker rmi &> /dev/null &
+
+    pluginhook post-delete $APP
+    ;;
+
+  help | apps:help)
+    cat && cat<<EOF
+    apps                                            List your apps
+    apps:create <app>                               Create a new app
+    apps:destroy <app>                              Permanently destroy an app
+EOF
+    ;;
+
+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;
+
+esac
--- a/plugins/00_dokku-standard/post-delete
+++ b/plugins/00_dokku-standard/post-delete
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 [[ -n $1 ]] && rm -r "$DOKKU_ROOT/$1" > /dev/null
--- a/plugins/apps/pre-delete
+++ b/plugins/apps/pre-delete
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
+APP="$1"; IMAGE="dokku/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache"
+if [[ -d $CACHE_DIR ]]; then
+  docker run -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \;
+fi
--- a/plugins/backup/commands
+++ b/plugins/backup/commands
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 CURRENT_BACKUP_VERSION=1
-set -e; case "$1" in
+
+case "$1" in
  backup:export)
    OUTPUT_FILE="$2"
    BACKUP_DIR="$DOKKU_ROOT"
@@ -24,9 +26,9 @@ set -e; case "$1" in

    # if no file specified, output to stdout
    if [[ -z $OUTPUT_FILE ]]; then
-        cat $BACKUP_TMP_FILE
+      cat $BACKUP_TMP_FILE
    else
-        mv $BACKUP_TMP_FILE $OUTPUT_FILE
+      mv $BACKUP_TMP_FILE $OUTPUT_FILE
    fi

    rm -rf $BACKUP_TMP_DIR
@@ -48,14 +50,14 @@ set -e; case "$1" in
    tar xf $INPUT_FILE --directory=$BACKUP_TMP_DIR

    if [[ ! -f $BACKUP_TMP_DIR/.dokku_backup_version ]]; then
-        echo "Unable to determine backup version"
-        exit 1
+      echo "Unable to determine backup version"
+      exit 1
    fi

    VERSION=$(< $BACKUP_TMP_DIR/.dokku_backup_version)
    if [[ $VERSION -ne 1 ]]; then
-        echo "Unknown format version $VERSION"
-        exit 1
+      echo "Unknown format version $VERSION"
+      exit 1
    fi

    echo "Importing a version $VERSION backup..."
@@ -83,12 +85,15 @@ set -e; case "$1" in
    echo "Import complete."
    ;;

-  help)
+  help | backup:help)
    cat && cat<<EOF
    backup:export [file]                            Export dokku configuration files
    backup:import [file]                            Import dokku configuration files
 EOF
    ;;

-esac
+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;

+esac
--- a/plugins/checks/check-deploy
+++ b/plugins/checks/check-deploy
@@ -14,6 +14,7 @@
 # in seconds).

 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 CONTAINERID="$1"; APP="$2"; PORT="$3" ; HOSTNAME="${4:-localhost}"

 # source in app env to get DOKKU_CHECKS_WAIT and any other necessary vars
@@ -27,23 +28,23 @@ WAIT="${DOKKU_CHECKS_WAIT:-5}"
 # after successfully copying the file. Thus, we suppress stderr.
 # ref: https://github.com/dotcloud/docker/issues/3986
 if [[ ! -f "$FILENAME" ]] ; then
-    echo "       check-deploy: $FILENAME not found. attempting to retrieve it from container ..."
-    TMPDIR=$(mktemp -d /tmp/CHECKS.XXXXX)
-    docker cp $CONTAINERID:/app/CHECKS $TMPDIR 2> /dev/null || true
-    if [[ ! -s "${TMPDIR}/CHECKS" ]] ; then
-        echo "       CHECKS file not found in container. skipping checks."
-        rm -rf $TMPDIR
-        exit 0
-    else
-        echo "       CHECKS file found in container"
-        FILENAME=${TMPDIR}/CHECKS
+  echo "       check-deploy: $FILENAME not found. attempting to retrieve it from container ..."
+  TMPDIR=$(mktemp -d /tmp/CHECKS.XXXXX)
+  docker cp $CONTAINERID:/app/CHECKS $TMPDIR 2> /dev/null || true
+  if [[ ! -s "${TMPDIR}/CHECKS" ]] ; then
+    echo "       CHECKS file not found in container. skipping checks."
+    rm -rf $TMPDIR
+    exit 0
+  else
+    echo "       CHECKS file found in container"
+    FILENAME=${TMPDIR}/CHECKS

-        function cleanup() {
-          echo "       removing CHECKS file copied from container"
-          rm -rf $TMPDIR
-        }
-        trap cleanup EXIT
-    fi
+    function cleanup() {
+      echo "       removing CHECKS file copied from container"
+      rm -rf $TMPDIR
+    }
+    trap cleanup EXIT
+  fi
 fi

 echo "Waiting $WAIT seconds ..."
--- a/plugins/config/backup-export
+++ b/plugins/config/backup-export
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 shopt -s nullglob
 VERSION="$1"
 BASE_DIR="$2"
--- a/plugins/config/backup-import
+++ b/plugins/config/backup-import
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 shopt -s nullglob
 VERSION="$1"
 IMPORT_DIR="$2"
@@ -7,5 +8,5 @@ TARGET_DIR="$3"

 cd $IMPORT_DIR
 for file in */ENV; do
-    cp $file "$TARGET_DIR/$file"
+  cp $file "$TARGET_DIR/$file"
 done
--- a/plugins/config/commands
+++ b/plugins/config/commands
@@ -25,19 +25,20 @@ if [[ $1 == config ]] || [[ $1 == config:* ]]; then
 fi

 config_styled_hash () {
-  vars=`echo -e "$1"`
+  vars="$1"
+  prefix="$2"

  longest=""
-  for word in $vars; do
+  while read -r word; do
    KEY=`echo $word | cut -d"=" -f1`
    if [ ${#KEY} -gt ${#longest} ]; then
      longest=$KEY
    fi
-  done
+  done <<< "$vars"

-  for word in $vars; do
+  while read -r word; do
    KEY=`echo $word | cut -d"=" -f1`
-    VALUE=`echo $word | cut -d"=" -f2-`
+    VALUE=`echo $word | cut -d"=" -f2- | sed -e "s/^'//" -e "s/'$//"`

    num_zeros=$((${#longest} - ${#KEY}))
    zeros=" "
@@ -45,19 +46,21 @@ config_styled_hash () {
      zeros="$zeros "
      num_zeros=$(($num_zeros - 1))
    done
-    echo "$KEY:$zeros$VALUE"
-  done
+    echo "$prefix$KEY:$zeros$VALUE"
+  done <<< "$vars"
 }

 config_restart_app() {
  APP="$1";

-  echo "-----> Releasing $APP ..."
-  dokku release $APP
-  echo "-----> Release complete!"
-  echo "-----> Deploying $APP ..."
-  dokku deploy $APP
-  echo "-----> Deploy complete!"
+  if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
+    echo "-----> Releasing $APP ..."
+    dokku release $APP
+    echo "-----> Release complete!"
+    echo "-----> Deploying $APP ..."
+    dokku deploy $APP
+    echo "-----> Deploy complete!"
+  fi
 }

 config_write() {
@@ -65,13 +68,13 @@ config_write() {
  echo -e "$ENV_TEMP" | sed '/^$/d' | sort > $ENV_FILE_TEMP
  if ! cmp -s $ENV_FILE $ENV_FILE_TEMP; then
    cp -f $ENV_FILE_TEMP $ENV_FILE
+    chmod 600 $ENV_FILE
    config_restart_app $APP
  fi
  rm -f $ENV_FILE_TEMP
 }

 case "$1" in
-
  config)
    APP="$2"

@@ -80,7 +83,7 @@ case "$1" in
      exit 1
    fi

-    VARS=`cat $ENV_FILE | grep -Eo "export ([a-zA-Z_][a-zA-Z0-9_]*=.*)" | cut -d" " -f2`
+    VARS=`cat $ENV_FILE | grep -Eo "export ([a-zA-Z_][a-zA-Z0-9_]*=.*)" | cut -d" " -f2-`

    for var in "$@"; do
      if [[ "$var" == "--shell" ]]; then
@@ -91,7 +94,7 @@ case "$1" in

    echo "=== $APP config vars ==="
    config_styled_hash "$VARS"
-  ;;
+    ;;

  config:get)
    if [[ -z $3 ]]; then
@@ -106,8 +109,8 @@ case "$1" in

    KEY="$3"

-    cat $ENV_FILE | grep -Eo "export ([a-zA-Z_][a-zA-Z0-9_]*=.*)" | cut -d" " -f2 | grep "^$KEY=" | cut -d"=" -f2-
-  ;;
+    cat $ENV_FILE | grep -Eo "export ([a-zA-Z_][a-zA-Z0-9_]*=.*)" | grep "^export $KEY=" | cut -d"=" -f2- | sed -e "s/^'//" -e "s/'$//"
+    ;;

  config:set)
    if [[ -z "${*:3}" ]]; then
@@ -120,9 +123,9 @@ case "$1" in
    ENV_ADD=""
    ENV_TEMP=`cat "${ENV_FILE}"`
    RESTART_APP=false
-    VARS="${*:3}"
+    shift 2

-    for var in $VARS; do
+    for var; do
      if [[ $var != *"="* ]]; then
        echo "Usage: dokku config:set APP KEY1=VALUE1 [KEY2=VALUE2 ...]"
        echo "Must specify KEY and VALUE to set."
@@ -130,26 +133,28 @@ case "$1" in
      fi
    done

-    for var in $VARS; do
+    for var; do
      KEY=`echo ${var} | cut -d"=" -f1`
      VALUE=`echo ${var} | cut -d"=" -f2-`

      if [[ $KEY =~ [a-zA-Z_][a-zA-Z0-9_]* ]]; then
        RESTART_APP=true
        ENV_TEMP=$(echo -e "${ENV_TEMP}" | sed "/^export $KEY=/ d")
-        ENV_TEMP="${ENV_TEMP}\nexport ${var}"
+        ENV_TEMP="${ENV_TEMP}\nexport $KEY='$VALUE'"
        ENV_ADD=$(echo -e "${ENV_ADD}" | sed "/^$KEY=/ d")
-        ENV_ADD="${ENV_ADD}\n${var}"
+        ENV_ADD="${ENV_ADD}$
+${var}"
      fi
    done
+    ENV_ADD=$(echo "$ENV_ADD" | tail -n +2) #remove first empty line

    if [ $RESTART_APP ]; then
      echo "-----> Setting config vars and restarting $APP"
-      config_styled_hash "$ENV_ADD"
+      config_styled_hash "$ENV_ADD" "       "

      config_write "$ENV_TEMP"
    fi
-  ;;
+    ;;

  config:unset)
    if [[ -z $3 ]]; then
@@ -168,16 +173,19 @@ case "$1" in

      config_write "$ENV_TEMP"
    done
-  ;;
+    ;;

-  help)
+  help | config:help)
    cat && cat<<EOF
    config <app>                                    Display the config vars for an app
    config:get <app> KEY                            Display a config value for an app
    config:set <app> KEY1=VALUE1 [KEY2=VALUE2 ...]  Set one or more config vars
    config:unset <app> KEY1 [KEY2 ...]              Unset one or more config vars
 EOF
-  ;;
+    ;;
+
+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;

 esac
-
--- a/plugins/git/backup-import
+++ b/plugins/git/backup-import
@@ -1,18 +1,20 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 VERSION="$1"
 IMPORT_DIR="$2"
 TARGET_DIR="$3"
 APPS="$4"

-while read APP; do 
-    APP_PATH="$TARGET_DIR/$APP"; 
-    git init --bare $APP_PATH > /dev/null
-    PRERECEIVE_HOOK="$APP_PATH/hooks/pre-receive"
-    cat > $PRERECEIVE_HOOK <<EOF
+while read APP; do
+  APP_PATH="$TARGET_DIR/$APP";
+  git init --bare $APP_PATH > /dev/null
+  PRERECEIVE_HOOK="$APP_PATH/hooks/pre-receive"
+  cat > $PRERECEIVE_HOOK <<EOF
 #!/usr/bin/env bash
 set -e; set -o pipefail;
+
 cat | DOKKU_ROOT="$DOKKU_ROOT" dokku git-hook $APP
 EOF
-    chmod +x $PRERECEIVE_HOOK
+  chmod +x $PRERECEIVE_HOOK
 done < $APPS > /dev/null
--- a/plugins/git/commands
+++ b/plugins/git/commands
@@ -2,19 +2,19 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x

 git_archive_all() {
-    APP=$1; REV=$2
-    TMP_WORK_DIR=$(mktemp -d)
-    chmod 755 $TMP_WORK_DIR
-    unset GIT_DIR GIT_WORK_TREE
-    git clone $DOKKU_ROOT/$APP $TMP_WORK_DIR > /dev/null
-    pushd $TMP_WORK_DIR > /dev/null
-    git config advice.detachedHead false
-    git checkout $REV > /dev/null
-    git submodule update --init --recursive > /dev/null
-    find -name .git -prune -exec rm -rf {} \; > /dev/null
-    tar c .
-    popd > /dev/null
-    rm -rf $TMP_WORK_DIR > /dev/null
+  APP=$1; REV=$2
+  TMP_WORK_DIR=$(mktemp -d)
+  chmod 755 $TMP_WORK_DIR
+  unset GIT_DIR GIT_WORK_TREE
+  git clone -q $DOKKU_ROOT/$APP $TMP_WORK_DIR &> /dev/null
+  pushd $TMP_WORK_DIR > /dev/null
+  git config advice.detachedHead false
+  git checkout $REV &> /dev/null
+  git submodule update --init --recursive &> /dev/null
+  find -name .git -prune -exec rm -rf {} \; > /dev/null
+  tar c .
+  popd > /dev/null
+  rm -rf $TMP_WORK_DIR > /dev/null
 }

 case "$1" in
@@ -31,31 +31,42 @@ case "$1" in
        echo $'\e[1G\e[K'"-----> WARNING: deploy did not complete, you must push to master."
        echo $'\e[1G\e[K'"-----> for example, try 'git push <dokku> ${refname/refs\/heads\/}:master'"
      fi
-
    done
    ;;

+  git-upload-pack)
+    APP="$(echo $2 | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g')"
+    pluginhook git-pre-pull $APP
+    cat | git-upload-pack "$DOKKU_ROOT/$APP"
+    pluginhook git-post-pull $APP
+    ;;
+
  git-*)
    APP="$(echo $2 | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g')"
    APP_PATH=$DOKKU_ROOT/$APP

    if [[ $1 == "git-receive-pack" && ! -d "$APP_PATH/refs" ]]; then
-        git init --bare $APP_PATH > /dev/null
-        PRERECEIVE_HOOK="$APP_PATH/hooks/pre-receive"
-        cat > $PRERECEIVE_HOOK <<EOF
+      git init --bare $APP_PATH > /dev/null
+      PRERECEIVE_HOOK="$APP_PATH/hooks/pre-receive"
+      cat > $PRERECEIVE_HOOK <<EOF
 #!/usr/bin/env bash
 set -e; set -o pipefail;
+
 cat | DOKKU_ROOT="$DOKKU_ROOT" dokku git-hook $APP
 EOF
-        chmod +x $PRERECEIVE_HOOK
+      chmod +x $PRERECEIVE_HOOK
    fi

    args=$@
    git-shell -c "$args"
    ;;

-  help)
+  help | git:help)
    cat
    ;;
-esac

+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;
+
+esac
--- a/plugins/nginx-vhosts/backup-export
+++ b/plugins/nginx-vhosts/backup-export
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 shopt -s nullglob
 VERSION="$1"
 BASE_DIR="$2"
--- a/plugins/nginx-vhosts/backup-import
+++ b/plugins/nginx-vhosts/backup-import
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 shopt -s nullglob
 VERSION="$1"
 IMPORT_DIR="$2"
@@ -8,6 +9,6 @@ TARGET_DIR="$3"
 cd $IMPORT_DIR

 for file in */tls/server.*; do
-    mkdir -p $(dirname $TARGET_DIR$file)
-    cp $file $TARGET_DIR$file
+  mkdir -p $(dirname $TARGET_DIR$file)
+  cp $file $TARGET_DIR$file
 done
--- a/plugins/nginx-vhosts/commands
+++ b/plugins/nginx-vhosts/commands
@@ -2,8 +2,47 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x

 case "$1" in
-  help)
-    cat
-    ;;
-esac
+  nginx:import-ssl)
+    if [[ -z $2 ]]; then
+      echo "Please specify an app to create"
+      exit 1
+    fi
+    APP="$2"
+    if [[ ! -d "$DOKKU_ROOT/$APP" ]]; then
+      echo "App $APP does not exist"
+      exit 1
+    fi
+    if [[ -t 0 ]]; then
+      echo "Tar archive containing server.crt and server.key expected on stdin"
+      exit 1
+    fi

+    TEMP_DIR=`mktemp -d`
+    cd $TEMP_DIR
+    tar xvf - <&0
+    if [[ -f "$TEMP_DIR/server.crt" ]]; then
+      echo "Tar archive missing server.crt"
+      exit 1
+    fi
+    if [[ -f "$TEMP_DIR/server.key" ]]; then
+      echo "Tar archive missing server.key"
+      exit 1
+    fi
+
+    mkdir -p "$DOKKU_ROOT/$APP/tls"
+    mv "$TEMP_DIR/server.crt" "$DOKKU_ROOT/$APP/tls/server.crt"
+    mv "$TEMP_DIR/server.key" "$DOKKU_ROOT/$APP/tls/server.key"
+    rm -rf $TEMP_DIR
+    ;;
+
+  help | nginx:help)
+    cat && cat<<EOF
+    nginx:import-ssl <app>                          Imports a tarball from stdin; should contain server.crt and server.key
+EOF
+    ;;
+
+  *)
+    exit $DOKKU_NOT_IMPLEMENTED_EXIT
+    ;;
+
+esac
--- a/plugins/nginx-vhosts/dependencies
+++ b/plugins/nginx-vhosts/dependencies
@@ -1,7 +1,15 @@
 #!/bin/bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x

-# latest stable NGINX 1.4.x with websocket support
-apt-get install -qq -y software-properties-common python-software-properties
-add-apt-repository -y ppa:nginx/stable
-apt-get update
-apt-get install -qq -y nginx dnsutils
+case "$DOKKU_DISTRO" in
+  ubuntu)
+    apt-get install -qq -y software-properties-common python-software-properties
+    add-apt-repository -y ppa:nginx/stable
+    apt-get update
+    apt-get install -qq -y nginx dnsutils
+    ;;
+
+  opensuse)
+    zypper -q in -y nginx bind-utils
+    ;;
+esac
--- a/plugins/nginx-vhosts/install
+++ b/plugins/nginx-vhosts/install
@@ -1,12 +1,18 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x

-if ! grep -q dokku-nginx-reload "/etc/sudoers"; then
-  touch /etc/sudoers.tmp
-  cp /etc/sudoers /tmp/sudoers.new
-  echo "%dokku ALL=(ALL)NOPASSWD:/etc/init.d/nginx reload # dokku-nginx-reload" >> /tmp/sudoers.new
-  EDITOR="cp /tmp/sudoers.new" visudo
-  rm /tmp/sudoers.new
+if [[ ! -f /etc/sudoers.d/dokku-nginx ]]; then
+  case "$DOKKU_DISTRO" in
+    ubuntu)
+      echo "%dokku ALL=(ALL) NOPASSWD:/etc/init.d/nginx reload" >> /etc/sudoers.d/dokku-nginx
+      ;;
+
+    opensuse)
+      echo "%dokku ALL=(ALL) NOPASSWD:/sbin/service nginx reload" >> /etc/sudoers.d/dokku-nginx
+      ;;
+  esac
+
+  chmod 0440 /etc/sudoers.d/dokku-nginx
 fi

 # if dokku.conf has not been created, create it
@@ -25,10 +31,19 @@ ssl_prefer_server_ciphers on;
 #ssl_certificate_key $DOKKU_ROOT/tls/server.key;
 EOF
 fi
-sed -i 's/# server_names_hash_bucket_size/server_names_hash_bucket_size/' /etc/nginx/nginx.conf
+
+echo 'server_names_hash_bucket_size 64' >| /etc/nginx/conf.d/server_names_hash_bucket_size.conf

 if [[ ! -f  "$DOKKU_ROOT/VHOST" ]]; then
  [[ $(dig +short $(< "$DOKKU_ROOT/HOSTNAME")) ]] && cp "$DOKKU_ROOT/HOSTNAME" "$DOKKU_ROOT/VHOST"
 fi

-/etc/init.d/nginx start
+case "$DOKKU_DISTRO" in
+  ubuntu)
+    /etc/init.d/nginx start
+    ;;
+
+  opensuse)
+    /sbin/service nginx start
+    ;;
+esac
--- a/plugins/nginx-vhosts/post-delete
+++ b/plugins/nginx-vhosts/post-delete
@@ -1,3 +1,12 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-sudo /etc/init.d/nginx reload > /dev/null
+
+case "$DOKKU_DISTRO" in
+  ubuntu)
+    sudo /etc/init.d/nginx reload > /dev/null
+    ;;
+
+  opensuse)
+    sudo /sbin/service nginx reload > /dev/null
+    ;;
+esac
--- a/plugins/nginx-vhosts/post-deploy
+++ b/plugins/nginx-vhosts/post-deploy
@@ -1,16 +1,28 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 APP="$1"; PORT="$2"
 WILDCARD_SSL="$DOKKU_ROOT/tls"
 SSL="$DOKKU_ROOT/$APP/tls"

-if [[ -f "$DOKKU_ROOT/VHOST" ]]; then
+set +e
+NO_VHOST=$(dokku config:get $APP NO_VHOST)
+set -e
+
+if [[ -n "$NO_VHOST" ]]; then
+  echo "-----> NO_VHOST config detected"
+fi
+
+if [[ -f "$DOKKU_ROOT/VHOST" && ! -n "$NO_VHOST" ]]; then
  VHOST=$(< "$DOKKU_ROOT/VHOST")
  SUBDOMAIN=${APP/%\.${VHOST}/}
-  if [[ "$APP" == *.* ]] && [[ "$SUBDOMAIN" == "$APP" ]]; then
-    hostname="${APP/\//-}"
-  else
-    hostname="${APP/\//-}.$VHOST"
+  hostname=$(: | pluginhook nginx-hostname $APP $SUBDOMAIN $VHOST)
+  if [[ ! -n $hostname ]]; then
+    if [[ "$APP" == *.* ]] && [[ "$SUBDOMAIN" == "$APP" ]]; then
+      hostname="${APP/\//-}"
+    else
+      hostname="${APP/\//-}.$VHOST"
+    fi
  fi

  if [[ -e "$SSL/server.crt" ]] && [[ -e "$SSL/server.key" ]]; then
@@ -25,9 +37,9 @@ EOF
    SSL_DIRECTIVES=""
  fi

-  # ssl based nginx.conf
  if [[ -n "$SSL_INUSE" ]]; then
-  cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf
+    echo "-----> Creating ssl nginx.conf"
+    cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf
 upstream $APP { server 127.0.0.1:$PORT; }
 server {
  listen      [::]:80;
@@ -56,13 +68,14 @@ $SSL_DIRECTIVES
    proxy_set_header X-Forwarded-Port \$server_port;
    proxy_set_header X-Request-Start \$msec;
  }
+  include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf;
 }
 EOF

-  echo "https://$hostname" > "$DOKKU_ROOT/$APP/URL"
-else
-# default nginx.conf
-  cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf
+    echo "https://$hostname" > "$DOKKU_ROOT/$APP/URL"
+  else
+    echo "-----> Creating non-ssl nginx.conf"
+    cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf
 upstream $APP { server 127.0.0.1:$PORT; }
 server {
  listen      [::]:80;
@@ -79,13 +92,44 @@ server {
    proxy_set_header X-Forwarded-Port \$server_port;
    proxy_set_header X-Request-Start \$msec;
  }
+  include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf;
 }
 EOF

-  echo "http://$hostname" > "$DOKKU_ROOT/$APP/URL"
+    echo "http://$hostname" > "$DOKKU_ROOT/$APP/URL"
  fi
+
  echo "-----> Running nginx-pre-reload"
  pluginhook nginx-pre-reload $APP $PORT
+
  echo "       Reloading nginx"
-  sudo /etc/init.d/nginx reload > /dev/null
+  case "$DOKKU_DISTRO" in
+    ubuntu)
+      sudo /etc/init.d/nginx reload > /dev/null
+      ;;
+
+    opensuse)
+      sudo /sbin/service nginx reload > /dev/null
+      ;;
+  esac
+else
+  if [[ -f "$DOKKU_ROOT/$APP/URL" ]]; then
+    echo "------> NO_VHOST set, deleting $APP/URL"
+    rm "$DOKKU_ROOT/$APP/URL"
+  fi
+  if [[ -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
+    echo "------> NO_VHOST set, deleting $APP/nginx.conf"
+    rm "$DOKKU_ROOT/$APP/nginx.conf"
+    echo "------> NO_VHOST set, reloading nginx after nginx.conf deletion"
+    case "$DOKKU_DISTRO" in
+      ubuntu)
+        sudo /etc/init.d/nginx reload > /dev/null
+        ;;
+
+      opensuse)
+        sudo /sbin/service nginx reload > /dev/null
+        ;;
+    esac
+    sudo /etc/init.d/nginx reload > /dev/null
+  fi
 fi
--- a/tests/apps/config/check_deploy
+++ b/tests/apps/config/check_deploy
@@ -1,3 +1,15 @@
 #!/bin/bash
-set -e; output="$(curl -s $1)"; echo $output; test "$output" == "config-test"
+set -e;

+base_url="$1"
+test_url / "config-test"
+test_url /hello "Hello world"
+
+test_url () {
+  path="$1"
+  expected_output="$2"
+  url="$base_url$path"
+  output="$(curl -s $url)"
+  echo $output
+  test "$output" == "$expected_output"
+}
--- a/tests/apps/config/post-deploy
+++ b/tests/apps/config/post-deploy
@@ -4,5 +4,5 @@ set -ex;
 REMOTE=$1
 REPO=$2

-ssh $REMOTE config:set $REPO CONFTEST=config-test
+ssh $REMOTE config:set $REPO CONFTEST=config-test HELLO=\"Hello world\"

--- a/tests/apps/config/web.js
+++ b/tests/apps/config/web.js
@@ -6,6 +6,10 @@ app.get('/', function(request, response) {
  response.send(process.env.CONFTEST);
 });

+app.get('/hello', function(request, response) {
+  response.send(process.env.HELLO);
+});
+
 var port = process.env.PORT || 5000;
 app.listen(port, function() {
  console.log("Listening on " + port);
Author	SHA1	Message	Date
Jose Diaz-Gonzalez	a1bbc1ec4d	Release 0.3.5	2014-11-24 02:17:50 -05:00
Jose Diaz-Gonzalez	793f1b6058	Merge pull request #784 from progrium/no-vhost-hotfix Fix NO_VHOST check	2014-11-24 02:16:39 -05:00
Jose Diaz-Gonzalez	20977fc2a2	Fix NO_VHOST check It used to check if NO_VHOST is unset or set to the empty string It now checks if NO_VHOST is set to a non-empty string	2014-11-24 02:16:21 -05:00
Jose Diaz-Gonzalez	6cad7ef8f4	Release 0.3.4	2014-11-23 23:37:18 -05:00
Jose Diaz-Gonzalez	c6f80bcf55	Merge pull request #781 from expa/master use DOKKU_IMAGE (i.e. progrium/buildstep)	2014-11-23 23:27:34 -05:00
Michael Hobbs	4d8c7033a9	use DOKKU_IMAGE (i.e. progrium/buildstep)	2014-11-23 19:58:12 -08:00
Michael Hobbs	d2547c4233	Merge pull request #3 from progrium/master merge from upstream v0.3.2	2014-11-23 19:56:41 -08:00
Jose Diaz-Gonzalez	4fa567dbe3	Merge pull request #780 from progrium/778-better-error-message Output error message when a command is not found. Closes #778	2014-11-23 21:05:08 -05:00
Jose Diaz-Gonzalez	463f725872	Use git-* as a pluginhook prefix	2014-11-23 21:02:40 -05:00
Jose Diaz-Gonzalez	aa1c7f6fa4	Move git-upload-pack command to git plugin Also use the same APP escaping as used for other git commands.	2014-11-23 20:47:15 -05:00
Jose Diaz-Gonzalez	5f6f73ff22	Merge pull request #722 from wrboyce-git-pull	2014-11-23 20:40:08 -05:00
Will Boyce	ad497191df	Add `git pull` support	2014-11-23 20:39:57 -05:00
Jose Diaz-Gonzalez	53c58ec8b9	Merge pull request #777 from feature/improve-core	2014-11-23 20:32:21 -05:00
Thomas Boerger	9eab9ed1e1	Replaced hard coded plugins path To be able to switch the plugin path i have removed the hard coded plugin path from the catch all section of the switch within the main dokku executable.	2014-11-23 20:32:13 -05:00
Thomas Boerger	3faa37b2e1	Keep environment for sudo To be able to set some other environment variables even if dokku gets called from a different user we have to keep the environment with sudo intact, so i added the -E option.	2014-11-23 20:32:13 -05:00
Jose Diaz-Gonzalez	fd55e8d41b	Merge pull request #669 from ohardy/master	2014-11-23 20:29:12 -05:00
Olivier Hardy	303bc18265	Handle dokku plugins-update command	2014-11-23 20:22:26 -05:00
Jose Diaz-Gonzalez	2141435ce1	Rename DOKKU_CONTROLLER to DOKKU_HOST	2014-11-23 19:54:10 -05:00
Jose Diaz-Gonzalez	03e5248256	Merge pull request #659 from Xe/client contrib: add dokku client shell script	2014-11-23 19:53:26 -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	1e5a904747	Merge pull request #779 from progrium/minor-formatting Minor bash formatting changes	2014-11-23 16:49:21 -05:00
Jose Diaz-Gonzalez	a46582225a	Merge pull request #751 from webhippie/feature/improvements Partial openSUSE support	2014-11-23 16:47:36 -05:00
Jose Diaz-Gonzalez	8bc3d372ec	Minor bash formatting changes	2014-11-23 16:42:21 -05:00
Thomas Boerger	14b1743c2a	Added openSUSE support I have done the first steps to get dokku running for other distros like openSUSE. I have simply replaced the important places within the core plugins with a check for DOKKU_DISTRO that gets exported by dokku itself. It just replaces the apt-get and service start/restart/reload functionality with the openSUSE counterparts.	2014-11-23 11:37:58 +01:00
Thomas Boerger	2d776292c3	Added environment variable for base container In order to be able to use a different base image i have added another environment variable where everybody can switch the used base container for the applications directly through the environment variable DOKKU_IMAGE or with the help of the dokkurc configuration.	2014-11-23 11:34:29 +01:00
Jose Diaz-Gonzalez	f0fe32a9c6	Merge pull request #776 from joliv/master Update man page for new commands	2014-11-22 23:21:25 -05:00
joliv	c4f5b3e219	Update man page for new commands	2014-11-22 22:09:11 -05:00
Jose Diaz-Gonzalez	e7219c0346	Release 0.3.2	2014-11-22 18:02:06 -05:00
Jose Diaz-Gonzalez	842ae10b74	Merge pull request #775 from progrium/plugin-help Add PLUGIN:help command to each plugin	2014-11-22 17:58:24 -05:00
Jose Diaz-Gonzalez	cfc7c41e47	Add PLUGIN:help command to each plugin	2014-11-22 17:52:46 -05:00
Jose Diaz-Gonzalez	c7af391c06	Merge pull request #774 from progrium/254-nginx-hostname-hook Add the ability to customize an app's hostname using nginx-hostname pluginhook	2014-11-22 17:19:38 -05:00
Jose Diaz-Gonzalez	4754f241f2	Add the ability to customize an app's hostname using the nginx-hostname pluginhook Closes #254	2014-11-22 17:18:33 -05:00
Jose Diaz-Gonzalez	fd1678b576	Remove reference to no-vhost plugin that is now in core	2014-11-22 16:50:06 -05:00
Jose Diaz-Gonzalez	7f730d0697	Merge pull request #773 from progrium/485-native-no-vhost Disable nginx vhosts via `dokku config:set myapp NO_VHOST=1`. Closes #485	2014-11-22 16:44:05 -05:00
Jose Diaz-Gonzalez	69f360864f	Disable nginx vhosts via `dokku config:set myapp NO_VHOST=1`. Closes #485	2014-11-22 16:42:55 -05:00
Jose Diaz-Gonzalez	16fd7ebc6b	Merge pull request #772 from progrium/518-import-ssl Import ssl certificates	2014-11-22 16:23:24 -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
Jose Diaz-Gonzalez	a24c1bcc92	Merge pull request #771 from progrium/doc-changes Doc changes	2014-11-22 15:38:43 -05:00
Jose Diaz-Gonzalez	47811f60f4	Ensure tables have proper width	2014-11-22 15:37:42 -05:00
Jose Diaz-Gonzalez	ab01206351	Better formatting of plugin tables	2014-11-22 15:37:29 -05:00
Michael Hobbs	fd0bafa7d9	Merge pull request #2 from progrium/master merge from upstream	2014-11-22 10:25:33 -08:00
Jose Diaz-Gonzalez	ac84ef68cc	Change tables to be left aligned	2014-11-17 17:11:00 -05:00
Jose Diaz-Gonzalez	5caf2ab6e3	Reorganized list of available datastore plugins	2014-11-17 17:03:22 -05:00
Jose Diaz-Gonzalez	11bff42180	Merge pull request #766 from progrium/sort-apps Sort output of apps command	2014-11-16 19:20:39 -05:00
Jose Diaz-Gonzalez	bf4876107d	Sort output of apps command	2014-11-16 19:14:51 -05:00
Jose Diaz-Gonzalez	2ec17a4033	Merge pull request #765 from progrium/ignore-tls-directory Ignore tls directory	2014-11-16 13:10:17 -05:00
Jose Diaz-Gonzalez	d36249f51a	Ignore tls directory when listing out apps	2014-11-16 13:08:00 -05:00
Jose Diaz-Gonzalez	b011e54dca	Skip tls directory in deploy:all hack	2014-11-16 13:00:33 -05:00
Jose Diaz-Gonzalez	b68a8da2ce	Do not allow users to delete the tls directory	2014-11-16 13:00:07 -05:00
Jose Diaz-Gonzalez	a421dbf063	Merge pull request #675 from expa/mh-broadly-wait-to-retire port wait-to-retire from broadly/dokku	2014-11-16 12:56:51 -05:00
Jose Diaz-Gonzalez	00a8370b7d	Release 0.3.1	2014-11-16 12:36:31 -05:00
Jose Diaz-Gonzalez	647b215738	Update HISTORY.md for 0.3.0	2014-11-16 12:19:29 -05:00
Jose Diaz-Gonzalez	3e224cc723	Merge pull request #579 from neam/include-nginx-conf.d Plugin nginx-vhosts includes files in folder nginx.conf.d	2014-11-16 07:19:24 -05:00
Fredrik Wollsén	26a9e2fbf2	Update plugins list - VHOSTS Custom Configuration required core PR was made available in dokku core 0.3.1	2014-11-16 13:18:26 +02:00
Fredrik Wollsén	580f89e63b	Plugin nginx-vhosts includes files in folder nginx.conf.d	2014-11-16 13:14:24 +02:00
Jose Diaz-Gonzalez	614a310bbf	Merge pull request #762 from progrium/custom Update template for dokku docs	2014-11-16 04:20:00 -05:00
Jose Diaz-Gonzalez	99304ac3d9	Update template for dokku docs	2014-11-16 04:18:34 -05:00
Jose Diaz-Gonzalez	403843832f	Merge pull request #761 from progrium/add-registry-plugin Add dokku-registry to list. Closes #716	2014-11-16 03:04:52 -05:00
Jose Diaz-Gonzalez	7d9aa7c492	Add dokku-registry to list. Closes #716	2014-11-16 03:04:26 -05:00
Jose Diaz-Gonzalez	33eca3bf39	Merge pull request #760 from progrium/formatting Formatting	2014-11-16 03:01:04 -05:00
Jose Diaz-Gonzalez	aefa11db8b	Add editorconfig to dokku This should help dokku contributors force proper formatting on their contributions	2014-11-16 03:00:32 -05:00
Jose Diaz-Gonzalez	52774536ca	Standardize installer on 2 spaces	2014-11-16 02:59:42 -05:00
Jose Diaz-Gonzalez	0f6ca81afd	Update dokku-installer version to v0.3.0	2014-11-16 02:59:28 -05:00
Jose Diaz-Gonzalez	44201a66d9	Add `set -eo` statement to nginx-vhosts/dependencies	2014-11-16 02:59:07 -05:00
Jose Diaz-Gonzalez	7b361e564f	Use 2 spaces for formatting bash Also remove extra trailing newlines	2014-11-16 02:58:52 -05:00
Jose Diaz-Gonzalez	f13c1031c7	Ensure there is a newline after calling `set -e`	2014-11-16 02:54:54 -05:00
Jose Diaz-Gonzalez	bca8aa3923	Merge pull request #759 from progrium/apps-plugin Create an `apps` core plugin.	2014-11-16 02:36:01 -05:00
Jose Diaz-Gonzalez	4b9433052f	Create an `apps` core plugin. This creates the following commands: - apps - apps:create <app> - apps:destroy <app> It also: - makes `delete` an alias for `apps:destroy` - adds confirmation to `apps:destroy` - allows a developer to remove apps that have been created via apps:create but have not been deployed Refs #87 Refs #543 Refs #586 Closes #599 Refs #655 Refs #656 Refs #685 Closes #757	2014-11-16 02:30:39 -05:00
Jose Diaz-Gonzalez	d0ceee5b3b	Merge pull request #758 from progrium/621-permissions Make ENV file readable only from dokku user. Closes #621	2014-11-16 00:27:07 -05:00
Jose Diaz-Gonzalez	913af9b641	Make ENV file readable only from dokku user. Closes #621	2014-11-16 00:26:12 -05:00
Jose Diaz-Gonzalez	f03c0c5440	Merge pull-request #617 from markstos/document-bootstrap	2014-11-16 00:16:51 -05:00
Mark Stosberg	96b348e880	Document what bootstrap.sh is doing.	2014-11-16 00:16:33 -05:00
Jose Diaz-Gonzalez	8a5b954bda	Merge pull request #607 from fbochu/master Use PLUGIN_PATH in dokku default case.	2014-11-16 00:13:48 -05:00
Jose Diaz-Gonzalez	b766654b4f	Merge pull request #359 from plietar/rm-plugins Remove plugins before copying them again.	2014-11-15 23:34:42 -05:00
Jose Diaz-Gonzalez	af0005196a	Standardize the way in which we set variables	2014-11-15 23:32:30 -05:00
Jose Diaz-Gonzalez	c3df79f369	Merge pull-request #702 from jazzzz/config-spaces	2014-11-15 22:12:10 -05:00
Jose Diaz-Gonzalez	0f31ff1f24	Add a set of spaces to prefix config variables when setting them	2014-11-15 22:11:55 -05:00
Ludovic Perrine	043a1a01c5	Fixed setting config values with spaces over SSH	2014-11-15 22:03:54 -05:00
Ludovic Perrine	361011ec69	Added test for config with spaces	2014-11-15 22:03:54 -05:00
Ludovic Perrine	5dbc864060	Handle config values with spaces	2014-11-15 22:03:54 -05:00
Jose Diaz-Gonzalez	ac5f9a707c	Merge pull request #755 from progrium/vagrant-dokku-installer Setup dokku-installer within Vagrant VM on first provision	2014-11-15 20:25:13 -05:00
Jose Diaz-Gonzalez	d4235304ee	Merge pull request #699 from tombell/suppress-git-archive-all-output Actually suppress the output from `git_archive_all`	2014-11-15 20:23:57 -05:00
Jose Diaz-Gonzalez	a2d1d8c065	Setup dokku-installer within Vagrant VM on first provision	2014-11-15 20:14:01 -05:00
Jose Diaz-Gonzalez	190c50b694	Merge pull request #754 from progrium/remove-12-04	2014-11-15 16:59:01 -05:00
Jose Diaz-Gonzalez	ad516d6bf5	Remove all references to Ubuntu 12.04. Refs #238 We no longer test against 12.04 VMs	2014-11-15 16:57:59 -05:00
Jose Diaz-Gonzalez	a9ef99fe3d	Merge pull request #573 from Prelang/command-instead-of-which	2014-11-15 16:40:42 -05:00
Erik Nomitch	592c95eaeb	Use command instead of which for apt-get existential check in bootstrap.sh	2014-11-15 16:38:40 -05:00
Michael Hobbs	09df79cd8b	Merge pull request #1 from expa/mh-merge-upstream merge from upstream	2014-10-09 11:32:18 -07:00
Michael Hobbs	9c0667c51a	Merge remote-tracking branch 'upstream/master' into mh-merge-upstream	2014-10-09 11:29:48 -07:00
Tom Bell	42c9d7aaa6	Actually suppress the output from the git commands	2014-09-30 21:08:23 +01:00
Michael Hobbs	5fcba7e288	port 'wait_to_retire' from broadly/dokku	2014-09-02 18:18:14 -07:00
Sam Dodrill	939a876348	contrib: add dokku client shell script This is adapted from the one I use in my shell profile scripts. This kinda-sorta-maybe acts like the `heroku` or `deis` commands and does some clever reorganization of data before sending it to the server. To use the app name generator, install the `elfs` rock from Moonrocks.	2014-08-16 19:05:20 -07:00
Fabien Bochu	22cdc11d57	Use PLUGIN_PATH in dokku default case.	2014-08-13 21:27:47 +02:00
Paul Lietar	4da4995a18	Only delete core plugins.	2013-11-29 20:57:53 +00: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