Changed dokku.install

3 files changed, 35 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e280e84148cf..b188a3fb14d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,7 +20,7 @@ pkgbase = dokku
 	source = https://github.com/dokku/dokku/archive/v0.12.3.zip
 	source = dokku.install
 	sha256sums = 7b35c2698226eb91cbea411951f62107cc41a5118f141ba375590ede5c0f28a1
-	sha256sums = abdf6a166cc248857d4e8e268925d3cbd38cfff254e30dd95a95bd836b0e2863
+	sha256sums = b8a2db64ca043cc860cd0e0ee8bdc6865e0b0720c5463341ca97b915d12d06ba
 
 pkgname = dokku
 
diff --git a/PKGBUILD b/PKGBUILD
index 5b0238b8ee85..c69dbcb3c671 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,7 +28,7 @@ source=(
   "${pkgname}.install"
 )
 sha256sums=('7b35c2698226eb91cbea411951f62107cc41a5118f141ba375590ede5c0f28a1'
-            'abdf6a166cc248857d4e8e268925d3cbd38cfff254e30dd95a95bd836b0e2863')
+            'b8a2db64ca043cc860cd0e0ee8bdc6865e0b0720c5463341ca97b915d12d06ba')
 install=${pkgname}.install
 
 package() {
diff --git a/dokku.install b/dokku.install
index 71d18434df04..30a75a8d5b24 100644
--- a/dokku.install
+++ b/dokku.install
@@ -1,38 +1,16 @@
 #!/bin/sh
 post_install() {
-  getent group dokku >/dev/null ||
-    groupadd --system dokku
-
-  # same as: sshcommand create dokku /usr/bin/dokku
-  getent passwd dokku >/dev/null ||
-    useradd --system \
-            --gid dokku \
-            --shell /usr/bin/dokku \
-            --home-dir /var/dokku/ \
-            -m \
-            dokku
-
-  chown dokku:dokku /var/dokku/
-  mkdir -p /var/dokku/.ssh/
-  touch /var/dokku/.ssh/authorized_keys
-  chown -R dokku:dokku /var/dokku/.ssh/
-  gpasswd -a dokku docker > /dev/null
-
-  echo "$1" | cut -d "-" -f 1 > /var/dokku/VERSION
-
-  if [ ! -f "/var/dokku/HOSTNAME" ]; then
-    hostname -f > "/var/dokku/HOSTNAME"
-    chown dokku:dokku "/var/dokku/HOSTNAME"
-  fi
+  DOKKU_ROOT="/home/dokku"
+  DOKKU_LIB_ROOT="/var/lib/dokku"
 
-  echo "%dokku ALL=(ALL) NOPASSWD:/usr/bin/systemctl reload nginx, /usr/sbin/nginx -t" > /etc/sudoers.d/dokku-nginx
+  sshcommand create dokku /usr/bin/dokku &>/dev/null
 
-  mkdir -p /etc/nginx/conf.d
+  (egrep -i "^docker" /etc/group || groupadd docker) &>/dev/null
+  usermod -aG docker dokku
 
-  DOKKU_LIB_ROOT="/var/lib/dokku"
-
-  echo "Cleanup orphaned symlinks"
-  find -L ${DOKKU_LIB_ROOT} -type l -delete
+  echo "Setting up storage directories"
+  mkdir -p ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
+  chown dokku:dokku ${DOKKU_LIB_ROOT}/data ${DOKKU_LIB_ROOT}/data/storage
 
   echo "Setting up plugin directories"
   # should be replaced by `plugn init`
@@ -48,37 +26,53 @@ post_install() {
       PLUGIN_PATH=${DOKKU_LIB_ROOT}/plugins plugn enable $plugin
     fi
   done
+  find -L ${DOKKU_LIB_ROOT} -type l -delete
   chown dokku:dokku -R ${DOKKU_LIB_ROOT}/plugins ${DOKKU_LIB_ROOT}/core-plugins
 
+  echo "Ensure proper sshcommand path"
+  echo '/usr/bin/dokku' > "${DOKKU_ROOT}/.sshcommand"
+  if [[ -f .ssh/authorized_keys ]]; then
+    sed -i.bak 's#/usr/local/bin/dokku#/usr/bin/dokku#' "${DOKKU_ROOT}/.ssh/authorized_keys"
+    rm "${DOKKU_ROOT}/.ssh/authorized_keys"
+  fi
+
   echo "Install all core plugins"
   dokku plugin:install --core
 
+  echo "$1" | cut -d "-" -f 1 > ${DOKKU_LIB_ROOT}/VERSION
+  
+  hostname -f > "${DOKKU_ROOT}/HOSTNAME"
+
+  mkdir -p /etc/nginx/conf.d
+  echo "%dokku ALL=(ALL) NOPASSWD:/usr/bin/systemctl reload nginx, /usr/sbin/nginx -t" > /etc/sudoers.d/dokku-nginx
+
   echo "
     Please add your ssh pubkey like:
-      $ cat ~/.ssh/id_rsa.pub | sudo sshcommand acl-add dokku 'local key'
+      $ cat ~/.ssh/id_rsa.pub | sudo sshcommand acl-add dokku default
 
     To enable nginx autoconfiguration, add to your /etc/nginx/nginx.conf in http section:
       include /etc/nginx/conf.d/*.conf;
-"
+    And reload nginx:
+      $ sudo systemctl reload nginx
+  "
 }
 
 post_upgrade() {
   post_install $1
 }
 
-pre_remove() {
-  userdel dokku &>/dev/null || true
-  groupdel dokku &>/dev/null || true
-}
-
 post_remove() {
   rm -f /etc/init/dokku-installer.conf
   rm -f /etc/init/dokku-redeploy.conf
   rm -f /etc/systemd/system/dokku-installer.conf
   rm -f /etc/systemd/system/dokku-redeploy.service
   rm -f /etc/update-motd.d/99-dokku
-  rm -rf /var/dokku
+
+  rm -rf /etc/nginx/conf.d/dokku.conf
+  systemctl reload nginx
+
   rm -rf /var/lib/dokku
   rm -rf /var/log/dokku
-  rm -rf /etc/nginx/conf.d/dokku.conf
+
+  userdel -r dokku &>/dev/null
 }