From ec24a1bef9ddcdd17534f9b601ee5035e8afaeee Mon Sep 17 00:00:00 2001
From: jrmbchtl <s8jmbech@stud.uni-saarland.de>
Date: Mon, 18 Oct 2021 21:33:29 +0200
Subject: [PATCH] moved deatiled config into stack

---
 pi-hosted_template/stack/wireguard-easy.yml   | 14 +++++-
 pi-hosted_template/template/portainer-v2.json | 43 -------------------
 2 files changed, 13 insertions(+), 44 deletions(-)

diff --git a/pi-hosted_template/stack/wireguard-easy.yml b/pi-hosted_template/stack/wireguard-easy.yml
index e01e82a..b36a2ac 100644
--- a/pi-hosted_template/stack/wireguard-easy.yml
+++ b/pi-hosted_template/stack/wireguard-easy.yml
@@ -1,6 +1,18 @@
 version: "3.8"
 services:
-  wg-easy:    
+  wg-easy:
+    environment:
+      # ⚠️ Required:
+      # Change this to your host's public address
+      - WG_HOST=raspberrypi.local
+
+      # Optional:
+      - PASSWORD=foobar123
+      - WG_PORT=51820
+      - WG_DEFAULT_ADDRESS=10.8.0.x
+      - WG_DEFAULT_DNS=1.1.1.1
+      - WG_ALLOWED_IPS=192.168.15.0/24, 10.0.1.0/24
+      
     image: weejewel/wg-easy
     container_name: wg-easy
     volumes:
diff --git a/pi-hosted_template/template/portainer-v2.json b/pi-hosted_template/template/portainer-v2.json
index 9bb325d..a532978 100644
--- a/pi-hosted_template/template/portainer-v2.json
+++ b/pi-hosted_template/template/portainer-v2.json
@@ -4304,51 +4304,8 @@
 			"logo": "https://raw.githubusercontent.com/Dschorim/pi-hosted/master/pi-hosted_template/images/wireguard.png",
 			"name": "wg-easy",
 			"platform": "linux",
-			"ports": [
-				"51820:51820/udp",
-				"51821:51821/tcp"
-			],
-			"restart_policy": "unless-stopped",
 			"title": "Wireguard Server",
 			"type": 3,
-			"volumes": [
-				{
-					"bind": "/portainer/Files/AppData/Config/wireguard",
-					"container": "/etc/wireguard"
-				}
-			],
-			"env": [
-				{
-					"default": "raspberrypi.local",
-					"label": "WG_HOST",
-					"name": "WG_HOST"
-				},
-				{
-					"default": "foobar123",
-					"label": "PASSWORD",
-					"name": "PASSWORD"
-				},
-				{
-					"default": "51820",
-					"label": "WG_PORT",
-					"name": "WG_PORT"
-				},
-				{
-					"default": "10.8.0.x",
-					"label": "WG_DEFAULT_ADDRESS",
-					"name": "WG_DEFAULT_ADDRESS"
-				},
-				{
-					"default": "1.1.1.1",
-					"label": "WG_DEFAULT_DNS",
-					"name": "WG_DEFAULT_DNS"
-				},
-				{
-					"default": "192.168.15.0/24, 10.0.1.0/24",
-					"label": "WG_ALLOWED_IPS",
-					"name": "WG_ALLOWED_IPS"
-				}
-			],
 			"repository": {
 				"stackfile": "pi-hosted_template/stack/wireguard-easy.yml",
 				"url": "https://github.com/Dschorim/pi-hosted"