From 3cb5ce188e6608a29f5baddef5ac87dae48d8908 Mon Sep 17 00:00:00 2001
From: Kristian Haugene <haugene@users.noreply.github.com>
Date: Sun, 17 Mar 2019 13:13:25 +0100
Subject: [PATCH 1/5] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..81e4722b5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Container is not behaving as expected
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- 
+Thanks for filing an issue! Before hitting the button, please answer these questions. It's helpful to search the existing GitHub issues first. It's likely that another user has already reported the issue you're facing, or it's a known issue that we're already aware of.
+-->
+
+**Describe the problem**
+A clear and concise description of what the bug is.
+
+**Add your docker run command**
+To understand how your container is running, provide the docker run command or the docker-compose.yml file you used to start it. If you're using a GUI to set up the container then provide screenshots or a list of options and settings.
+
+**Logs**
+Provide all logs from the container. By default the should not be any sensitive information there, but if there is then mask it with *** or something similar.
+You can get the logs by running "docker logs <container-name>".
+
+**Host system:**
+Are you running on Ubuntu, a NAS, Raspberry Pi, Mac OS or something else?
+Which version of Docker are you using?

From e8bc0b5ef6446fa740f2f60df8b8c3d112a0c7b4 Mon Sep 17 00:00:00 2001
From: Kristian Haugene <haugene@users.noreply.github.com>
Date: Sun, 17 Mar 2019 13:32:43 +0100
Subject: [PATCH 2/5] Update issue templates

---
 .../ISSUE_TEMPLATE/add-or-update-provider.md  | 14 +++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md     | 20 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/add-or-update-provider.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/add-or-update-provider.md b/.github/ISSUE_TEMPLATE/add-or-update-provider.md
new file mode 100644
index 000000000..5b6ac4998
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/add-or-update-provider.md
@@ -0,0 +1,14 @@
+---
+name: Add or update provider
+about: Request for a new provider or update configs for an existing provider.
+title: ''
+labels: provider
+assignees: ''
+
+---
+
+**Which provider?**
+<!-- Name the provider you want updated -->
+
+**Where are the configs?**
+<!-- Most providers supply a .zip file containing all configs and certificates. Please provide a link to the .ovpn config bundle -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..6315abc65
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->

From 6963d368dad3ccd3a43638d981cb7bca1d66b8f4 Mon Sep 17 00:00:00 2001
From: Kristian Haugene <haugene@users.noreply.github.com>
Date: Sun, 17 Mar 2019 13:36:07 +0100
Subject: [PATCH 3/5] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 81e4722b5..344238dda 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,18 +9,20 @@ assignees: ''
 
 <!-- 
 Thanks for filing an issue! Before hitting the button, please answer these questions. It's helpful to search the existing GitHub issues first. It's likely that another user has already reported the issue you're facing, or it's a known issue that we're already aware of.
+
+Also. If you don't suspect that there are any issues with the image itself, but that you have issues configuring it - please read the README twice and try the gitter chat before posting here.
 -->
 
 **Describe the problem**
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 **Add your docker run command**
-To understand how your container is running, provide the docker run command or the docker-compose.yml file you used to start it. If you're using a GUI to set up the container then provide screenshots or a list of options and settings.
+<!-- To understand how your container is running, provide the docker run command or the docker-compose.yml file you used to start it. If you're using a GUI to set up the container then provide screenshots or a list of options and settings. -->
 
 **Logs**
-Provide all logs from the container. By default the should not be any sensitive information there, but if there is then mask it with *** or something similar.
-You can get the logs by running "docker logs <container-name>".
+<!-- Provide all logs from the container. By default the should not be any sensitive information there, but if there is then mask it with *** or something similar.
+You can get the logs by running "docker logs <container-name>". -->
 
 **Host system:**
-Are you running on Ubuntu, a NAS, Raspberry Pi, Mac OS or something else?
-Which version of Docker are you using?
+<!-- Are you running on Ubuntu, a NAS, Raspberry Pi, Mac OS or something else?
+Which version of Docker are you using? -->

From b112ae1cf6a3b56df71dfb4e9fa1f1c3cc7d7960 Mon Sep 17 00:00:00 2001
From: Kristian Haugene <kristian.haugene@greenbird.com>
Date: Sun, 17 Mar 2019 13:42:53 +0100
Subject: [PATCH 4/5] Adding template for other issue types

---
 .github/ISSUE_TEMPLATE.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..12a192ad8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,7 @@
+<!--
+You're now creating an issue that is not one of the templated types (bug, feature request, provider edits).
+The issue templates were created to make sure that we had enough information to resolve them.
+
+Please have a look at the other templates to see what kind of information we're looking for, 
+and try to make your issue as informative as possible.
+-->
\ No newline at end of file

From 46ba5e0995dfbb185abd9e083e1edec3ce6fb785 Mon Sep 17 00:00:00 2001
From: Kristian Haugene <kristian.haugene@greenbird.com>
Date: Sun, 17 Mar 2019 13:44:51 +0100
Subject: [PATCH 5/5] Revert "Adding template for other issue types"

This reverts commit b112ae1cf6a3b56df71dfb4e9fa1f1c3cc7d7960.
---
 .github/ISSUE_TEMPLATE.md | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 12a192ad8..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-<!--
-You're now creating an issue that is not one of the templated types (bug, feature request, provider edits).
-The issue templates were created to make sure that we had enough information to resolve them.
-
-Please have a look at the other templates to see what kind of information we're looking for, 
-and try to make your issue as informative as possible.
--->
\ No newline at end of file