From 85b2bb0eaa1dc8e5d71cd6a1a08f4bf5f808ba6c Mon Sep 17 00:00:00 2001
From: MAGIC <magic@kthx.at>
Date: Sun, 28 Jan 2018 22:04:28 +0100
Subject: [PATCH 1/3] Add instruction for pulling + starting portainer
 container

---
 docs/third_party-portainer.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/third_party-portainer.md b/docs/third_party-portainer.md
index f486a1b36..c15f867e0 100644
--- a/docs/third_party-portainer.md
+++ b/docs/third_party-portainer.md
@@ -1,4 +1,4 @@
-In order to enable Portainer, the docker-compose.yml and site.conf for nginx must be modified.
+In order to enable Portainer, the docker-compose.yml and site.conf for Nginx must be modified.
 
 1\. docker-compose.yml: Insert this block for portainer
 ```
@@ -51,4 +51,8 @@ map $http_upgrade $connection_upgrade {
   }
 ```
 
+3\. Then you need to pull the container and restart Nginx:
+```
+docker-compose up -d && docker-compose restart nginx-mailcow
+```
 Now you can simply navigate to https://${MAILCOW_HOSTNAME}/portainer/ to view your Portainer container monitoring page. You’ll then be prompted to specify a new password for the **admin** account. After specifying your password, you’ll then be able to connect to the Portainer UI.

From 9515778b2571f9e5b77d9e081f8b8e227275769a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Peters?= <andre.peters@debinux.de>
Date: Mon, 29 Jan 2018 08:15:23 +0100
Subject: [PATCH 2/3] Update third_party-portainer.md

---
 docs/third_party-portainer.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/third_party-portainer.md b/docs/third_party-portainer.md
index c15f867e0..ea6c01d35 100644
--- a/docs/third_party-portainer.md
+++ b/docs/third_party-portainer.md
@@ -1,6 +1,6 @@
 In order to enable Portainer, the docker-compose.yml and site.conf for Nginx must be modified.
 
-1\. docker-compose.yml: Insert this block for portainer
+1\. Create a new file `docker-compose.override.yml` in the mailcow-dockerized root folder and insert the following configuration
 ```
     portainer-mailcow:
       image: portainer/portainer
@@ -16,7 +16,7 @@ In order to enable Portainer, the docker-compose.yml and site.conf for Nginx mus
           aliases:
             - portainer
 ```
-2a\. data/conf/nginx/site.conf: Just beneath the opening line, at the same level as a server { block, add this:
+2a\. Create `data/conf/nginx/portainer.conf`:
 ```
 upstream portainer {
   server portainer-mailcow:9000;
@@ -28,7 +28,7 @@ map $http_upgrade $connection_upgrade {
 }
 ```
 
-2b\. data/conf/nginx/site.conf: Then, inside **both** (ssl and plain) server blocks, add this:
+2b\. Insert a new location to the default mailcow site by creating the file `data/conf/nginx/site.portainer.custom`:
 ```
   location /portainer/ {
     proxy_http_version 1.1;
@@ -51,8 +51,9 @@ map $http_upgrade $connection_upgrade {
   }
 ```
 
-3\. Then you need to pull the container and restart Nginx:
+3\. Apply your changes:
 ```
 docker-compose up -d && docker-compose restart nginx-mailcow
 ```
+
 Now you can simply navigate to https://${MAILCOW_HOSTNAME}/portainer/ to view your Portainer container monitoring page. You’ll then be prompted to specify a new password for the **admin** account. After specifying your password, you’ll then be able to connect to the Portainer UI.

From d5ea374435668c11a6e63fedd04b6691e9345536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Peters?= <andre.peters@debinux.de>
Date: Mon, 29 Jan 2018 08:16:53 +0100
Subject: [PATCH 3/3] Update third_party-portainer.md

---
 docs/third_party-portainer.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/third_party-portainer.md b/docs/third_party-portainer.md
index ea6c01d35..c3f4270d6 100644
--- a/docs/third_party-portainer.md
+++ b/docs/third_party-portainer.md
@@ -2,6 +2,8 @@ In order to enable Portainer, the docker-compose.yml and site.conf for Nginx mus
 
 1\. Create a new file `docker-compose.override.yml` in the mailcow-dockerized root folder and insert the following configuration
 ```
+version: '2.1'
+services:
     portainer-mailcow:
       image: portainer/portainer
       volumes: