From 25a98e61a0b32d7ceb9beee39661e43830ec3b03 Mon Sep 17 00:00:00 2001
From: ecdsa521 <ecdsa521@gmail.com>
Date: Mon, 1 May 2017 22:23:52 +0200
Subject: [PATCH 1/3] Add instructions to integrate Gogs with Mailcow

---
 docs/u_and_e.md | 74 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 3 deletions(-)

diff --git a/docs/u_and_e.md b/docs/u_and_e.md
index d61b81ebc..a40859221 100644
--- a/docs/u_and_e.md
+++ b/docs/u_and_e.md
@@ -68,7 +68,7 @@ curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose versio
 
 Edit a domain as (domain) administrator to add an item to the filter table.
 
-Beware that a mailbox user can login to mailcow and override a domain policy filter item. 
+Beware that a mailbox user can login to mailcow and override a domain policy filter item.
 
 ## Customize Dockerfiles
 
@@ -102,7 +102,7 @@ Run postmap on check_sasl_access:
 
 ```
 docker-compose exec postfix-mailcow postmap /opt/postfix/conf/check_sasl_access
-``` 
+```
 
 Restart the Postfix container.
 
@@ -249,7 +249,7 @@ MariaDB [(none)]> SELECT user FROM mysql.user;
 +--------------+
 | user         |
 +--------------+
-| mailcow_user | <===== 
+| mailcow_user | <=====
 | root         |
 +--------------+
 2 rows in set (0.00 sec)
@@ -518,6 +518,74 @@ map $http_upgrade $connection_upgrade {
 
 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.
 
+## Gogs
+
+With Gogs' ability to authenticate over SMTP it is trivial to integrate it with mailcow. Few changes are needed:
+
+1\. Open `docker-compose.yml` and add gogs:
+
+```
+    gogs-mailcow:
+      image: gogs/gogs
+      volumes:
+        - ./data/gogs:/data
+      networks:
+        mailcow-network:
+          ipv4_address: 172.22.1.123
+          aliases:
+            - gogs
+      ports:
+        - "${GOGS_SSH_PORT:-50022}:22"
+        - "${GOGS_WWW_PORT:-50080}:3000"
+      dns:
+        - 172.22.1.254
+
+```
+
+2\. Open `data/conf/nginx/site.conf` and add in each `server{}` block
+```
+location /gogs/ {
+    proxy_pass http://172.22.1.123:3000/;
+}
+```
+
+3\. Open `mailcow.conf` and define ports you want gogs to open, as well as future database password. Example:
+
+```
+GOGS_WWW_PORT=3000
+GOGS_SSH_PORT=4000
+DBGOGS=CorrectHorseBatteryStaple
+```
+
+4\. Create database and user for Gogs to use.
+
+```
+. ./mailcow.conf
+docker-compose exec mysql-mailcow mysql -uroot -p$DBROOT
+mysql> CREATE USER gogs IDENTIFIED BY 'CorrectHorseBatteryStaple';
+mysql> CREATE DATABASE gogs;
+mysql> GRANT ALL PRIVILEGES ON gogs.* to gogs;
+```
+
+5\. Run `docker-compose up -d` to bring up Gogs container. Verify with `curl http://172.22.1.123:3000/` that it is running.
+
+6\. Proceed to installer from browser, for the time being using direct url `http://${MAILCOW_HOSTNAME}:${GOGS_WWW_PORT}/`, for example `http://example.org:3000/`. For database details set `172.22.1.2` as database host, user `gogs`, database name `gogs` and password as set above
+
+7\. Once install is complete, login as admin and in settings - authorization enable SMTP. SMTP Host should be `172.22.1.8` with port `587`. You'll probably want to set `Skip TLS Verify`.
+
+8\. Edit `data/gogs/gogs/conf/app.ini` and set following values. You can consult [Gogs cheat sheet](https://gogs.io/docs/advanced/configuration_cheat_sheet) for their meaning and other possible values.
+
+```
+[server]
+SSH_LISTEN_PORT = 22
+SSH_DOMAIN = [domain where ssh is available - used for ssh clone url]
+SSH_PORT = [port where ssh is open on host - used for ssh clone url]
+ROOT_URL = https://[url]/gogs/
+```
+
+9\. Restart Gogs with `docker-compose restart gogs-mailcow`. Your users should be able to login with mailcow managed accounts.
+
+
 ## Change autodiscover setup type
 
 This disables ActiveSync in the autodiscover service for Outlook and configures it with IMAP and SMTP instead:

From 78b27493c0121660d4ff00e649b462b26da6e3c5 Mon Sep 17 00:00:00 2001
From: broedli <ich@timotoups.de>
Date: Tue, 2 May 2017 21:36:57 +0200
Subject: [PATCH 2/3] Update documentation URL

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 74975412a..0682cdc1c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # mailcow dockerized documentation
 
-https://mailcow.github.io/mailcow-dockerized
+https://mailcow.github.io/mailcow-dockerized-docs

From 0f58dcba9c4080b77e8e4a54d9e7f57028e4e1b2 Mon Sep 17 00:00:00 2001
From: broedli <ich@timotoups.de>
Date: Tue, 2 May 2017 21:38:40 +0200
Subject: [PATCH 3/3] Removed pdns and corrected script name

---
 docs/u_and_e.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/u_and_e.md b/docs/u_and_e.md
index a40859221..1fc2cb994 100644
--- a/docs/u_and_e.md
+++ b/docs/u_and_e.md
@@ -313,7 +313,7 @@ Reset mailcow admin to `admin:moohoo`:
 
 ```
 cd mailcow_path
-bash reset_admin.sh
+bash mailcow-reset-admin.sh
 ```
 
 ## Rspamd
@@ -378,9 +378,6 @@ data/conf
 │       ├── listen_plain.template
 │       ├── listen_ssl.template
 │       └── server_name.template
-├── pdns
-│   ├── pdns_custom.lua
-│   └── recursor.conf
 ├── postfix
 │   ├── main.cf
 │   ├── master.cf