lib/kontena/machine/digital_ocean/cloudinit_master.yml in kontena-plugin-digitalocean-0.2.0.pre1 vs lib/kontena/machine/digital_ocean/cloudinit_master.yml in kontena-plugin-digitalocean-0.2.0.pre2

@@ -52,10 +52,11 @@
         ExecStartPre=-/usr/bin/docker stop kontena-server-mongo
         ExecStartPre=-/usr/bin/docker rm kontena-server-mongo
         ExecStart=/usr/bin/docker run --name=kontena-server-mongo \
             --volumes-from=kontena-server-mongo-data \
             mongo:3.0 mongod --smallfiles
+        ExecStop=/usr/bin/docker stop kontena-server-mongo
 <% end -%>
     - name: kontena-server-api.service
       command: start
       enable: true
       content: |
@@ -87,18 +88,19 @@
             -e MONGODB_URI=<%= mongodb_uri %> \
 <% else -%>
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
 <% end -%>
-<% if server_name %>
-            -e KONTENA_SERVER_NAME=<%= server_name %> \
+<% if server_name -%>
+            -e SERVER_NAME=<%= server_name %> \
 <% end -%>
-<% if initial_admin_code %>
-            -e KONTENA_INITIAL_ADMIN_CODE=<%= initial_admin_code %> \
+<% if initial_admin_code -%>
+            -e INITIAL_ADMIN_CODE=<%= initial_admin_code %> \
 <% end -%>
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
             kontena/server:${KONTENA_VERSION}
+        ExecStop=/usr/bin/docker stop kontena-server-api
 
     - name: kontena-server-haproxy.service
       command: start
       enable: true
       content: |
@@ -119,5 +121,6 @@
         EnvironmentFile=-/etc/kontena-server.custom.env
         ExecStartPre=-/usr/bin/docker stop kontena-server-haproxy
         ExecStartPre=-/usr/bin/docker rm kontena-server-haproxy
         ExecStartPre=-/usr/bin/docker pull kontena/haproxy:latest
         ExecStart=/opt/bin/kontena-haproxy.sh
+        ExecStop=/usr/bin/docker stop kontena-server-haproxy