From 842982e9dd9be7fc8dadde6fba3ecac0624a0421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Peters?= <andre.peters@debinux.de>
Date: Tue, 3 Mar 2020 11:26:25 +0100
Subject: [PATCH] Simplify

---
 .github/ISSUE_TEMPLATE/Bug_report.md | 54 +++++++++++-----------------
 1 file changed, 21 insertions(+), 33 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index c6ab7e00..77c52615 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -3,66 +3,54 @@ name: Bug report
 about: Report a bug for this project
 
 ---
+
 <!--
-  For community support and other discussions, you are welcome to visit us on our community channels listed at https://mailcow.github.io/mailcow-dockerized-docs/#community-support. For professional commercial support, please check out https://mailcow.github.io/mailcow-dockerized-docs/#commercial-support instead
+  You are welcome to visit us on our community channels listed at https://mailcow.github.io/mailcow-dockerized-docs/#community-support
+  For commercial support, please check https://mailcow.github.io/mailcow-dockerized-docs/#commercial-support
 -->
 
-Please **try** to answer all questions. If you cannot, don't just delete it. If you completely ignore or remove the whole template, **your issue will be closed** with a label "missing information".
-Many awesome mailcow supporters don't bother to reply to an issue, when crucial information is missing. Especially when it could have been answered by using this issue template. We need as much information as possible. Please post all logs, do not copy that one line you think may be interesting. Copy the whole bunch and remove sensible information. Thank you!
-
 **Prior to placing the issue, please check following:** *(fill out each checkbox with a `X` once done)*
-- [ ] I understand that not following below instructions might result in immediate closing and deletion of my issue.
+- [ ] I understand, that not following below instructions might result in immediate closing and deletion of my issue.
 - [ ] I have understood that answers are voluntary and community-driven, and not commercial support.
 - [ ] I have verified that my issue has not been already answered in the past. I also checked previous [issues](https://github.com/mailcow/mailcow-dockerized/issues).
 
----
-
-**Description of the bug**: What kind of issue have you *exactly* come across?
+**Description of the bug**:
 <!--
   This should be a clear and concise description of what the bug is. What EXACTLY does happen?
   If applicable, add screenshots to help explain your problem. Very useful for bugs in mailcow UI.
   Write your detailed description below.
 -->
 
-My issue is...
-
-**Reproduction of said bug**: How *exactly* do you reproduce the bug?
+**Docker container logs of affected containers**:
 <!--
-  Here it is really helpful to know how exactly you are able to reproduce the reported issue.
-  Meaning: What are the exact steps - one by one - to get the above described behavior.
+  Please take a look at the [official documentation](https://mailcow.github.io/mailcow-dockerized-docs/debug-logs/) and post the last     few lines of logs, when the error occurs.
+-->
+
+**Reproduction of said bug**:
+<!--
+  It is really helpful to know how exactly you are able to reproduce the reported issue.
+  Have you tried to fix the issue? What did you try?
+  What are the exact steps to get the above described behavior?
   Screenshots can be added, if helpful. Add the text below.
 -->
 
-1. I go to...
-2. And then to...
-3. But once I do...
-
-__I have tried or I do...__ *(fill out each checkbox with a `X` if applicable)*
-- [ ] In case of WebUI issue, I have tried clearing the browser cache and the issue persists.
-- [ ] I do run mailcow on a Synology, QNAP or any other sort of NAS.
-
-**System information**
+**System information**:
 <!--
-  In this stage we would kindly ask you to attach logs or general system information about your setup.
+  In this stage we would kindly ask you to attach general system information about your setup.
   Please carefully read the questions and instructions below.
 -->
 
-Further information (where applicable):
-
 | Question | Answer |
 | --- | --- |
 | My operating system | I_DO_REPLY_HERE |
 | Is Apparmor, SELinux or similar active? | I_DO_REPLY_HERE |
-| Virtualization technlogy (KVM, VMware, Xen, etc) | I_DO_REPLY_HERE |
+| Virtualization technlogy (KVM, VMware, Xen, etc - **LXC and OpenVZ are not supported** | I_DO_REPLY_HERE |
 | Server/VM specifications (Memory, CPU Cores) | I_DO_REPLY_HERE |
 | Docker Version (`docker version`) | I_DO_REPLY_HERE |
 | Docker-Compose Version (`docker-compose version`) | I_DO_REPLY_HERE |
 | Reverse proxy (custom solution) | I_DO_REPLY_HERE |
 
-Further notes:
- - Output of `git diff origin/master`, any other changes to the code? If so, please post them.
- - All third-party firewalls and custom iptables rules are unsupported. Please check the Docker docs about how to use Docker with your own ruleset. Nevertheless, iptabels output can help _us_ to help _you_: `iptables -L -vn`, `ip6tables -L -vn`, `iptables -L -vn -t nat` and `ip6tables -L -vn -t nat `
- - Check `docker exec -it $(docker ps -qf name=acme-mailcow) dig +short stackoverflow.com @172.22.1.254` (set the IP accordingly, if you changed the internal mailcow network) and `docker exec -it $(docker ps -qf name=acme-mailcow) dig +short stackoverflow.com @1.1.1.1` - output? Timeout?
- 
- General logs:
-- Please take a look at the [official documentation](https://mailcow.github.io/mailcow-dockerized-docs/debug-logs/).
+- Output of `git diff origin/master`, any other changes to the code? If so, **please post them**.
+- All third-party firewalls and custom iptables rules are unsupported. *Please check the Docker docs about how to use Docker with your own ruleset*. Nevertheless, iptabels output can help us to help you: `iptables -L -vn`, `ip6tables -L -vn`, `iptables -L -vn -t nat` and `ip6tables -L -vn -t nat`.
+- DNS problems? Please run `docker exec -it $(docker ps -qf name=acme-mailcow) dig +short stackoverflow.com @172.22.1.254` (set the IP accordingly, if you changed the internal mailcow network) and post the output.
+