Release 0.3.1

Plugin nginx-vhosts includes files in folder nginx.conf.d

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 2

HISTORY.md

@@ -1,8 +1,58 @@
 # History
 
-## 0.3.0 (in progress)
+## 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)
 

Makefile

@@ -14,7 +14,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.
@@ -24,7 +24,12 @@ 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
+	find /var/lib/dokku/plugins -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 /var/lib/dokku/plugins/$$plugin && \
+	    cp -R plugins/$$plugin /var/lib/dokku/plugins && \
+	    touch /var/lib/dokku/plugins/$$plugin/.core; \
+	    done
 
 addman:
 	mkdir -p /usr/local/share/man/man1
@@ -84,6 +89,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)
 

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.1/bootstrap.sh | sudo DOKKU_TAG=v0.3.1 bash
 
 ## Documentation
 

Vagrantfile

@@ -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

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

contrib/dokku-installer.rb

@@ -21,7 +21,7 @@ if ARGV[0] == "onboot"
   exit
 end
 
-version 	= "v0.2.1"
+version   = "v0.3.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

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.
+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.
-
-**Note: Support for 12.04 will be sunsetting in the near future after dokku & 14.04 have been more thoroughly tested.**
 
 ## 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.1/bootstrap.sh | sudo DOKKU_TAG=v0.3.1 bash
 ```
 
 ## Configuring
@@ -115,11 +113,7 @@ sudo BUILD_STACK=true make install
     vagrant up
     ```
 
-- Add SSH key to Dokku using `sshcommand`:
+- 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.
-
-    ```bash
-    cat ~/.ssh/id_rsa.pub | make vagrant-acl-add
-    ```
 
 You are now ready to deploy an app or install plugins.
 

docs/plugins.md

@@ -71,6 +71,7 @@ Note: The following plugins have been supplied by our community and may not have
 [cameron-martin]: https://github.com/cameron-martin
 [matto1990]: https://github.com/matto1990
 [ohardy]: https://github.com/ohardy
+[agco-adm]: https://github.com/agco-adm
 
 ### Datastores
 
@@ -140,11 +141,12 @@ Note: The following plugins have been supplied by our community and may not have
 | [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 |
+| [VHOSTS Custom Configuration](https://github.com/neam/dokku-nginx-vhosts-custom-configuration) | [motin][] | Compatible with 0.3.1+ |
 | [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 |
+| [dokku-registry](https://github.com/agco-adm/dokku-registry) | [agco-adm][] | |
 
 [8fca220]: https://github.com/progrium/dokku/commit/8fca2204edb0017796d6915ca9157c05b1238e28
 [217d00a]: https://github.com/progrium/dokku/commit/217d00a1bc47a7e24d8847617bb08a1633025fc7

docs/template.html

@@ -0,0 +1,98 @@
+<!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;
+    }
+    tr, td {
+      text-align: center;
+    }
+    #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>

dokku

@@ -12,6 +12,12 @@ if [[ $(id -un) != "dokku" && $1 != plugins-install* ]]; then
   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"
@@ -130,7 +136,7 @@ EOF
     ;;
 
   *)
-    for script in $(ls -d /var/lib/dokku/plugins/*/commands); do
+    for script in $(ls -d $PLUGIN_PATH/*/commands); do
       $script "$@"
     done
     ;;

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
-

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"
 

plugins/00_dokku-standard/backup-import

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 VERSION="$1"
 IMPORT_DIR="$2"
 TARGET_DIR="$3"

plugins/00_dokku-standard/commands

@@ -1,28 +1,9 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 case "$1" in
   delete)
-    if [[ -z $2 ]]; then
+    dokku apps:destroy $2
-        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
     ;;
 
   logs)
@@ -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
@@ -94,4 +74,3 @@ EOF
     ;;
 
 esac
-

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 {} \;
-
-

plugins/apps/commands

@@ -0,0 +1,70 @@
+#!/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 ".*" \) | sed 's|^\./||g' | sed 's|'$DOKKU_ROOT'\/||' | tail -n +2
+    ;;
+
+  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
+
+    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)
+    cat && cat<<EOF
+    apps                                            List your apps
+    apps:create <app>                               Create a new app
+    apps:destroy <app>                              Permanently destroy an app
+EOF
+    ;;
+
+esac

plugins/apps/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

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

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"
@@ -91,4 +93,3 @@ EOF
     ;;
 
 esac
-

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

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"

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"

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"
+    echo "$prefix$KEY:$zeros$VALUE"
-  done
+  done <<< "$vars"
 }
 
 config_restart_app() {
   APP="$1";
 
+  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
@@ -106,7 +109,7 @@ 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)
@@ -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,22 +133,24 @@ 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
@@ -180,4 +185,3 @@ EOF
   ;;
 
 esac
-

plugins/git/backup-import

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 VERSION="$1"
 IMPORT_DIR="$2"
 TARGET_DIR="$3"
@@ -12,6 +13,7 @@ while read APP; do
   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

plugins/git/commands

@@ -6,11 +6,11 @@ git_archive_all() {
   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
+  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 checkout $REV &> /dev/null
-    git submodule update --init --recursive > /dev/null
+  git submodule update --init --recursive &> /dev/null
   find -name .git -prune -exec rm -rf {} \; > /dev/null
   tar c .
   popd > /dev/null
@@ -31,7 +31,6 @@ 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
     ;;
 
@@ -45,6 +44,7 @@ case "$1" in
       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
@@ -57,5 +57,5 @@ EOF
   help)
     cat
     ;;
-esac
 
+esac

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"

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"

plugins/nginx-vhosts/commands

@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-
-case "$1" in
-  help)
-    cat
-    ;;
-esac
-

plugins/nginx-vhosts/dependencies

@@ -1,4 +1,5 @@
 #!/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

plugins/nginx-vhosts/post-delete

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+
 sudo /etc/init.d/nginx reload > /dev/null

plugins/nginx-vhosts/post-deploy

@@ -1,5 +1,6 @@
 #!/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"
@@ -56,6 +57,7 @@ $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
 
@@ -79,6 +81,7 @@ 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
 

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"
+}

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\"
 

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);