From 9b67ffe9d434c0103a2cbe7f297111433cf271d1 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 9 Jun 2019 12:17:32 -0400
Subject: [PATCH] feat: properly handle dhparam

The dhparam file should be specific to each installation, and thus needs to be generated on first run.
---
 .dockerignore                      | 1 +
 Dockerfile                         | 3 +++
 docker/etc/my_init.d/10_dokku_init | 9 +++++++++
 3 files changed, 13 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index 84200e4bd..a89678a7f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,4 +10,5 @@ tests
 !contrib/dokku-update
 !contrib/bash-completion
 !contrib/docker
+!tests/dhparam.pem
 vendor
diff --git a/Dockerfile b/Dockerfile
index 934417d80..51d1b4541 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,9 @@ ARG DOKKU_SKIP_KEY_FILE=true
 RUN addgroup --gid $DOKKU_GID dokku && \
     adduser --uid $DOKKU_UID --gid $DOKKU_GID --disabled-password --gecos "" "dokku"
 
+RUN mkdir /etc/nginx/
+COPY tests/dhparam.pem /etc/nginx/dhparam.pem
+
 RUN export DOKKU_TAG=$DOKKU_TAG \
       DOKKU_DOCKERFILE=$DOKKU_DOCKERFILE \
       DOKKU_WEB_CONFIG=$DOKKU_WEB_CONFIG \
diff --git a/docker/etc/my_init.d/10_dokku_init b/docker/etc/my_init.d/10_dokku_init
index 3d253fce5..1d0dc4a36 100755
--- a/docker/etc/my_init.d/10_dokku_init
+++ b/docker/etc/my_init.d/10_dokku_init
@@ -42,6 +42,15 @@ main() {
     echo "dokku dokku/vhost_enable boolean true" | debconf-set-selections
     dokku --quiet domains:set-global "$DOKKU_HOSTNAME"
   fi
+
+  if [[ ! -f /mount/etc/nginx/dhparam.pem ]]; then
+    mkdir -p /mount/etc/nginx
+    openssl dhparam -out /mount/etc/nginx/dhparam.pem 2048
+  fi
+
+  cp -f /mount/etc/nginx/dhparam.pem /etc/nginx/dhparam.pem
+  chown root:root /etc/nginx/dhparam.pem
+  chown root:root /etc/nginx/conf.d
 }
 
 main "$@"