Kaynağa Gözat

Merge branch 'master' of github.com:novaspirit/pi-hosted

Robert Middleswarth 3 yıl önce
ebeveyn
işleme
fa4f88eb3f

+ 2 - 1
build/info.json

@@ -75,7 +75,8 @@
 		{
 		{
 			"ID": 13,
 			"ID": 13,
 			"Title": "Beginners Guide to WireGuard Docker and Installing Pi-OS 64bit",
 			"Title": "Beginners Guide to WireGuard Docker and Installing Pi-OS 64bit",
-			"URL": "https://www.youtube.com/watch?v=yB_jAumIxOg"
+			"URL": "https://www.youtube.com/watch?v=yB_jAumIxOg",
+			"Doc": "wireguard-install.md"
 		},
 		},
 		{
 		{
 			"ID": 14,
 			"ID": 14,

+ 1 - 1
docs/AppList.md

@@ -99,7 +99,6 @@ List of all apps included in this project with info related to it.
 |[NZBHydra 2](https://github.com/theotherp/nzbhydra2)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-nzbhydra2) |  |  |  |  |
 |[NZBHydra 2](https://github.com/theotherp/nzbhydra2)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-nzbhydra2) |  |  |  |  |
 |[Omada EAP Controller](https://www.tp-link.com/us/business-networking/omada-sdn-controller/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/r/mbentley/omada-controller) |  |  |  |  |
 |[Omada EAP Controller](https://www.tp-link.com/us/business-networking/omada-sdn-controller/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/r/mbentley/omada-controller) |  |  |  |  |
 |[Ombi](https://ombi.io/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-ombi) |  |  |  |  |
 |[Ombi](https://ombi.io/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-ombi) |  |  |  |  |
-|[OpenVPN Access Server](https://openvpn.net/access-server/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/r/linuxserver/openvpn-as/) |  |  |  |  |
 |[Organizr v2](https://organizr.app/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/r/organizr/organizr) |  |  |  |  |
 |[Organizr v2](https://organizr.app/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/r/organizr/organizr) |  |  |  |  |
 |[OScam](https://trac.streamboard.tv/oscam/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-oscam) |  |  |  |  |
 |[OScam](https://trac.streamboard.tv/oscam/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-oscam) |  |  |  |  |
 |[Paperless](https://github.com/jonaswinkler/paperless-ng)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-paperless-ng) |  |  |  |  |
 |[Paperless](https://github.com/jonaswinkler/paperless-ng)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-paperless-ng) |  |  |  |  |
@@ -124,6 +123,7 @@ List of all apps included in this project with info related to it.
 |[Reactive-Resume](https://rxresu.me/)|64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/r/martadinata666/reactive-resume) |  |  |  |  |
 |[Reactive-Resume](https://rxresu.me/)|64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/r/martadinata666/reactive-resume) |  |  |  |  |
 |[Redmine](https://www.redmine.org/)|32/64 bit|Stack| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/_/redmine) |  |  |  |  |
 |[Redmine](https://www.redmine.org/)|32/64 bit|Stack| [![](../build/images/blue_doc_icon.png)](https://hub.docker.com/_/redmine) |  |  |  |  |
 |[Resilio Sync](https://www.resilio.com/individuals/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-resilio-sync) |  |  |  |  |
 |[Resilio Sync](https://www.resilio.com/individuals/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-resilio-sync) |  |  |  |  |
+|[RestDesk](https://rustdesk.com/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://github.com/rustdesk/rustdesk-server) |  |  |  |  |
 |[ruTorrent](https://github.com/Novik/ruTorrent)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://github.com/crazy-max/docker-rtorrent-rutorrent) |  |  |  |  |
 |[ruTorrent](https://github.com/Novik/ruTorrent)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://github.com/crazy-max/docker-rtorrent-rutorrent) |  |  |  |  |
 |[SABnzbd](https://sabnzbd.org/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-sabnzbd) |  |  |  |  |
 |[SABnzbd](https://sabnzbd.org/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-sabnzbd) |  |  |  |  |
 |[Samba](https://www.samba.org/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://github.com/dperson/samba) |  |  |  | [![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)](https://www.youtube.com/watch?v=2zZ3_1GRWrM&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=11) |
 |[Samba](https://www.samba.org/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://github.com/dperson/samba) |  |  |  | [![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)](https://www.youtube.com/watch?v=2zZ3_1GRWrM&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=11) |

+ 1 - 1
docs/DocumentList.md

@@ -15,5 +15,5 @@ List of all Documents used within this project with related Apps and Videos.
 |[searxng.md](../docs/searxng.md)|Install and Setup Instructions for SearXNG Meta Search|SearXNG||
 |[searxng.md](../docs/searxng.md)|Install and Setup Instructions for SearXNG Meta Search|SearXNG||
 |[throttled.md](../docs/throttled.md)|Install and Setup Instructions for the Throttled Script|||
 |[throttled.md](../docs/throttled.md)|Install and Setup Instructions for the Throttled Script|||
 |[UnPoller-Monitor.md](../docs/UnPoller-Monitor.md)|Install and setup instructions for the RPI Unifi (UnPoller) Monitor|UnPoller Monitor||
 |[UnPoller-Monitor.md](../docs/UnPoller-Monitor.md)|Install and setup instructions for the RPI Unifi (UnPoller) Monitor|UnPoller Monitor||
-|[wireguard-install.md](../docs/wireguard-install.md)|Install and setup instructions for the WireGuard VPN Server|Wireguard Server||
+|[wireguard-install.md](../docs/wireguard-install.md)|Install and setup instructions for the WireGuard VPN Server|Wireguard Server|[![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)]("https://www.youtube.com/watch?v=yB_jAumIxOg")|
 |[wordpress_installation.md](../docs/wordpress_installation.md)|WORDPRESS + SSL SETUP|Wordpress||
 |[wordpress_installation.md](../docs/wordpress_installation.md)|WORDPRESS + SSL SETUP|Wordpress||

+ 1 - 1
docs/README.md

@@ -75,7 +75,7 @@ You're done! Now just click App Templates and deploy applications!
 |11|[How to Install Whoogle to replace using Google and repo notes](https://www.youtube.com/watch?v=j3ZGxo3ibUs&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=12)||
 |11|[How to Install Whoogle to replace using Google and repo notes](https://www.youtube.com/watch?v=j3ZGxo3ibUs&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=12)||
 |12|[Checking out Windows 2000 Docker](https://www.youtube.com/watch?v=57Gnp0424Qc&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=13)||
 |12|[Checking out Windows 2000 Docker](https://www.youtube.com/watch?v=57Gnp0424Qc&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=13)||
 |Extra2|[3 Huge Announcements!! Discord Giveaway! Pi-Hosted!! & SBC Garage Sale!](https://www.youtube.com/watch?v=Ppv1cUomwn0)||
 |Extra2|[3 Huge Announcements!! Discord Giveaway! Pi-Hosted!! & SBC Garage Sale!](https://www.youtube.com/watch?v=Ppv1cUomwn0)||
-|13|[Beginners Guide to WireGuard Docker and Installing Pi-OS 64bit](https://www.youtube.com/watch?v=yB_jAumIxOg)||
+|13|[Beginners Guide to WireGuard Docker and Installing Pi-OS 64bit](https://www.youtube.com/watch?v=yB_jAumIxOg)|[Install Doc](../docs/wireguard-install.md)|
 |14|[My Most used container! Snippet Box](https://www.youtube.com/watch?v=v-jUyB3fvAo)||
 |14|[My Most used container! Snippet Box](https://www.youtube.com/watch?v=v-jUyB3fvAo)||
 
 
 ### Aditional Documentation
 ### Aditional Documentation

BIN
images/openvpn-as-banner.png


BIN
images/openvpn-as-icon.png


BIN
images/openvpn-as.png


BIN
images/rustdesk.png


+ 43 - 42
pi-hosted_template/template/portainer-v2.json

@@ -3766,48 +3766,6 @@
 			],
 			],
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://ombi.io/\" target=\"_blank\">https://ombi.io/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-ombi\" target=\"_blank\">https://docs.linuxserver.io/images/docker-ombi</a><br><br><br>"
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://ombi.io/\" target=\"_blank\">https://ombi.io/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-ombi\" target=\"_blank\">https://docs.linuxserver.io/images/docker-ombi</a><br><br><br>"
 		},
 		},
-		{
-			"categories": [
-				"Other"
-			],
-			"description": "OpenVPN Access Server is a full featured secure network tunneling VPN software solution that integrates OpenVPN server capabilities, enterprise management capabilities, simplified OpenVPN Connect UI, and OpenVPN Client software packages that accommodate Windows, MAC, Linux, Android, and iOS environments.",
-			"env": [
-				{
-					"default": "eth0",
-					"label": "INTERFACE",
-					"name": "INTERFACE"
-				},
-				{
-					"default": "1000",
-					"label": "PUID",
-					"name": "PUID"
-				},
-				{
-					"default": "1000",
-					"label": "PGID",
-					"name": "PGID"
-				}
-			],
-			"image": "linuxserver/openvpn-as:latest",
-			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/openvpn-as-icon.png",
-			"name": "openvpn-as",
-			"platform": "linux",
-			"ports": [
-				"943:943/tcp",
-				"9443:9443/tcp",
-				"1194:1194/udp"
-			],
-			"restart_policy": "unless-stopped",
-			"title": "OpenVPN Access Server",
-			"type": 1,
-			"volumes": [
-				{
-					"bind": "/portainer/Files/AppData/Config/OpenVPN-AS",
-					"container": "/config"
-				}
-			],
-			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://openvpn.net/access-server/\" target=\"_blank\">https://openvpn.net/access-server/</a><br><b>Official Docker Documentation: </b><a href=\"https://hub.docker.com/r/linuxserver/openvpn-as/\" target=\"_blank\">https://hub.docker.com/r/linuxserver/openvpn-as/</a><br><br><br>"
-		},
 		{
 		{
 			"categories": [
 			"categories": [
 				"Other",
 				"Other",
@@ -4660,6 +4618,49 @@
 			],
 			],
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://www.resilio.com/individuals/\" target=\"_blank\">https://www.resilio.com/individuals/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-resilio-sync\" target=\"_blank\">https://docs.linuxserver.io/images/docker-resilio-sync</a><br><br><br>"
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://www.resilio.com/individuals/\" target=\"_blank\">https://www.resilio.com/individuals/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-resilio-sync\" target=\"_blank\">https://docs.linuxserver.io/images/docker-resilio-sync</a><br><br><br>"
 		},
 		},
+		{
+			"categories": [
+				"Other",
+				"Tools"
+			],
+			"description": "A remote desktop software, the open source TeamViewer alternative, works out of the box, no configuration required. You have full control of your data, with no concerns about security.",
+			"env": [
+				{
+					"default": "rustdesk.example.com:21117",
+					"description": "Use your domain with the default 21117 port",
+					"label": "RELAY",
+					"name": "RELAY"
+				},
+				{
+					"default": "1",
+					"description": "if set to \"1\" unencrypted connection will not be accepted",
+					"label": "ENCRYPTED_ONLY",
+					"name": "ENCRYPTED_ONLY"
+				}
+			],
+			"image": "rustdesk/rustdesk-server-s6:latest",
+			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/rustdesk.png",
+			"name": "rustdesk",
+			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://rustdesk.com/\" target=\"_blank\">https://rustdesk.com/</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/rustdesk/rustdesk-server\" target=\"_blank\">https://github.com/rustdesk/rustdesk-server</a><br><br><br>Don't forget to open ports 21115 to 21119 in your router.",
+			"platform": "linux",
+			"ports": [
+				"21115:21115/tcp",
+				"21116:21116/tcp",
+				"21116:21116/udp",
+				"21117:21117/tcp",
+				"21118:21118/tcp",
+				"21119:21119/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "RestDesk",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/rustdesk",
+					"container": "/data"
+				}
+			]
+		},
 		{
 		{
 			"categories": [
 			"categories": [
 				"Downloaders"
 				"Downloaders"

+ 0 - 44
template/apps/openvpn-access-server.json

@@ -1,44 +0,0 @@
-{
-	"categories": [
-		"Other"
-	],
-	"description": "OpenVPN Access Server is a full featured secure network tunneling VPN software solution that integrates OpenVPN server capabilities, enterprise management capabilities, simplified OpenVPN Connect UI, and OpenVPN Client software packages that accommodate Windows, MAC, Linux, Android, and iOS environments.",
-	"env": [
-		{
-			"default": "eth0",
-			"label": "INTERFACE",
-			"name": "INTERFACE"
-		},
-		{
-			"default": "1000",
-			"label": "PUID",
-			"name": "PUID"
-		},
-		{
-			"default": "1000",
-			"label": "PGID",
-			"name": "PGID"
-		}
-	],
-	"image32": "linuxserver/openvpn-as:latest",
-	"image64": "linuxserver/openvpn-as:latest",
-	"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/openvpn-as-icon.png",
-	"name": "openvpn-as",
-	"officialDoc": "https://hub.docker.com/r/linuxserver/openvpn-as/",
-	"platform": "linux",
-	"ports": [
-		"943:943/tcp",
-		"9443:9443/tcp",
-		"1194:1194/udp"
-	],
-	"restart_policy": "unless-stopped",
-	"title": "OpenVPN Access Server",
-	"type": 1,
-	"volumes": [
-		{
-			"bind": "/portainer/Files/AppData/Config/OpenVPN-AS",
-			"container": "/config"
-		}
-	],
-	"webpage": "https://openvpn.net/access-server/"
-}

+ 46 - 0
template/apps/rustdesk.json

@@ -0,0 +1,46 @@
+{
+	"categories": [
+		"Other",
+		"Tools"
+	],
+	"description": "A remote desktop software, the open source TeamViewer alternative, works out of the box, no configuration required. You have full control of your data, with no concerns about security.",
+	"env": [
+		{
+			"default": "rustdesk.example.com:21117",
+			"description": "Use your domain with the default 21117 port",
+			"label": "RELAY",
+			"name": "RELAY"
+		},
+		{
+			"default": "1",
+			"description": "if set to \"1\" unencrypted connection will not be accepted",
+			"label": "ENCRYPTED_ONLY",
+			"name": "ENCRYPTED_ONLY"
+		}
+	],
+	"image32": "rustdesk/rustdesk-server-s6:latest",
+	"image64": "rustdesk/rustdesk-server-s6:latest",
+	"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/rustdesk.png",
+	"name": "rustdesk",
+	"note": "Don't forget to open ports 21115 to 21119 in your router.",
+	"officialDoc": "https://github.com/rustdesk/rustdesk-server",
+	"platform": "linux",
+	"ports": [
+		"21115:21115/tcp",
+		"21116:21116/tcp",
+		"21116:21116/udp",
+		"21117:21117/tcp",
+		"21118:21118/tcp",
+		"21119:21119/tcp"
+	],
+	"restart_policy": "unless-stopped",
+	"title": "RestDesk",
+	"type": 1,
+	"volumes": [
+		{
+			"bind": "/portainer/Files/AppData/Config/rustdesk",
+			"container": "/data"
+		}
+	],
+	"webpage": "https://rustdesk.com/"
+}

+ 43 - 42
template/portainer-v2-arm32.json

@@ -3766,48 +3766,6 @@
 			],
 			],
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://ombi.io/\" target=\"_blank\">https://ombi.io/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-ombi\" target=\"_blank\">https://docs.linuxserver.io/images/docker-ombi</a><br><br><br>"
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://ombi.io/\" target=\"_blank\">https://ombi.io/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-ombi\" target=\"_blank\">https://docs.linuxserver.io/images/docker-ombi</a><br><br><br>"
 		},
 		},
-		{
-			"categories": [
-				"Other"
-			],
-			"description": "OpenVPN Access Server is a full featured secure network tunneling VPN software solution that integrates OpenVPN server capabilities, enterprise management capabilities, simplified OpenVPN Connect UI, and OpenVPN Client software packages that accommodate Windows, MAC, Linux, Android, and iOS environments.",
-			"env": [
-				{
-					"default": "eth0",
-					"label": "INTERFACE",
-					"name": "INTERFACE"
-				},
-				{
-					"default": "1000",
-					"label": "PUID",
-					"name": "PUID"
-				},
-				{
-					"default": "1000",
-					"label": "PGID",
-					"name": "PGID"
-				}
-			],
-			"image": "linuxserver/openvpn-as:latest",
-			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/openvpn-as-icon.png",
-			"name": "openvpn-as",
-			"platform": "linux",
-			"ports": [
-				"943:943/tcp",
-				"9443:9443/tcp",
-				"1194:1194/udp"
-			],
-			"restart_policy": "unless-stopped",
-			"title": "OpenVPN Access Server",
-			"type": 1,
-			"volumes": [
-				{
-					"bind": "/portainer/Files/AppData/Config/OpenVPN-AS",
-					"container": "/config"
-				}
-			],
-			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://openvpn.net/access-server/\" target=\"_blank\">https://openvpn.net/access-server/</a><br><b>Official Docker Documentation: </b><a href=\"https://hub.docker.com/r/linuxserver/openvpn-as/\" target=\"_blank\">https://hub.docker.com/r/linuxserver/openvpn-as/</a><br><br><br>"
-		},
 		{
 		{
 			"categories": [
 			"categories": [
 				"Other",
 				"Other",
@@ -4660,6 +4618,49 @@
 			],
 			],
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://www.resilio.com/individuals/\" target=\"_blank\">https://www.resilio.com/individuals/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-resilio-sync\" target=\"_blank\">https://docs.linuxserver.io/images/docker-resilio-sync</a><br><br><br>"
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://www.resilio.com/individuals/\" target=\"_blank\">https://www.resilio.com/individuals/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-resilio-sync\" target=\"_blank\">https://docs.linuxserver.io/images/docker-resilio-sync</a><br><br><br>"
 		},
 		},
+		{
+			"categories": [
+				"Other",
+				"Tools"
+			],
+			"description": "A remote desktop software, the open source TeamViewer alternative, works out of the box, no configuration required. You have full control of your data, with no concerns about security.",
+			"env": [
+				{
+					"default": "rustdesk.example.com:21117",
+					"description": "Use your domain with the default 21117 port",
+					"label": "RELAY",
+					"name": "RELAY"
+				},
+				{
+					"default": "1",
+					"description": "if set to \"1\" unencrypted connection will not be accepted",
+					"label": "ENCRYPTED_ONLY",
+					"name": "ENCRYPTED_ONLY"
+				}
+			],
+			"image": "rustdesk/rustdesk-server-s6:latest",
+			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/rustdesk.png",
+			"name": "rustdesk",
+			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://rustdesk.com/\" target=\"_blank\">https://rustdesk.com/</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/rustdesk/rustdesk-server\" target=\"_blank\">https://github.com/rustdesk/rustdesk-server</a><br><br><br>Don't forget to open ports 21115 to 21119 in your router.",
+			"platform": "linux",
+			"ports": [
+				"21115:21115/tcp",
+				"21116:21116/tcp",
+				"21116:21116/udp",
+				"21117:21117/tcp",
+				"21118:21118/tcp",
+				"21119:21119/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "RestDesk",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/rustdesk",
+					"container": "/data"
+				}
+			]
+		},
 		{
 		{
 			"categories": [
 			"categories": [
 				"Downloaders"
 				"Downloaders"

+ 43 - 42
template/portainer-v2-arm64.json

@@ -4140,48 +4140,6 @@
 			],
 			],
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://ombi.io/\" target=\"_blank\">https://ombi.io/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-ombi\" target=\"_blank\">https://docs.linuxserver.io/images/docker-ombi</a><br><br><br>"
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://ombi.io/\" target=\"_blank\">https://ombi.io/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-ombi\" target=\"_blank\">https://docs.linuxserver.io/images/docker-ombi</a><br><br><br>"
 		},
 		},
-		{
-			"categories": [
-				"Other"
-			],
-			"description": "OpenVPN Access Server is a full featured secure network tunneling VPN software solution that integrates OpenVPN server capabilities, enterprise management capabilities, simplified OpenVPN Connect UI, and OpenVPN Client software packages that accommodate Windows, MAC, Linux, Android, and iOS environments.",
-			"env": [
-				{
-					"default": "eth0",
-					"label": "INTERFACE",
-					"name": "INTERFACE"
-				},
-				{
-					"default": "1000",
-					"label": "PUID",
-					"name": "PUID"
-				},
-				{
-					"default": "1000",
-					"label": "PGID",
-					"name": "PGID"
-				}
-			],
-			"image": "linuxserver/openvpn-as:latest",
-			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/openvpn-as-icon.png",
-			"name": "openvpn-as",
-			"platform": "linux",
-			"ports": [
-				"943:943/tcp",
-				"9443:9443/tcp",
-				"1194:1194/udp"
-			],
-			"restart_policy": "unless-stopped",
-			"title": "OpenVPN Access Server",
-			"type": 1,
-			"volumes": [
-				{
-					"bind": "/portainer/Files/AppData/Config/OpenVPN-AS",
-					"container": "/config"
-				}
-			],
-			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://openvpn.net/access-server/\" target=\"_blank\">https://openvpn.net/access-server/</a><br><b>Official Docker Documentation: </b><a href=\"https://hub.docker.com/r/linuxserver/openvpn-as/\" target=\"_blank\">https://hub.docker.com/r/linuxserver/openvpn-as/</a><br><br><br>"
-		},
 		{
 		{
 			"categories": [
 			"categories": [
 				"Other",
 				"Other",
@@ -5213,6 +5171,49 @@
 			],
 			],
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://www.resilio.com/individuals/\" target=\"_blank\">https://www.resilio.com/individuals/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-resilio-sync\" target=\"_blank\">https://docs.linuxserver.io/images/docker-resilio-sync</a><br><br><br>"
 			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://www.resilio.com/individuals/\" target=\"_blank\">https://www.resilio.com/individuals/</a><br><b>Official Docker Documentation: </b><a href=\"https://docs.linuxserver.io/images/docker-resilio-sync\" target=\"_blank\">https://docs.linuxserver.io/images/docker-resilio-sync</a><br><br><br>"
 		},
 		},
+		{
+			"categories": [
+				"Other",
+				"Tools"
+			],
+			"description": "A remote desktop software, the open source TeamViewer alternative, works out of the box, no configuration required. You have full control of your data, with no concerns about security.",
+			"env": [
+				{
+					"default": "rustdesk.example.com:21117",
+					"description": "Use your domain with the default 21117 port",
+					"label": "RELAY",
+					"name": "RELAY"
+				},
+				{
+					"default": "1",
+					"description": "if set to \"1\" unencrypted connection will not be accepted",
+					"label": "ENCRYPTED_ONLY",
+					"name": "ENCRYPTED_ONLY"
+				}
+			],
+			"image": "rustdesk/rustdesk-server-s6:latest",
+			"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/rustdesk.png",
+			"name": "rustdesk",
+			"note": "<h3>Template created by Pi-Hosted Series</h3><b>Check our Github page: <a href=\"https://github.com/pi-hosted/pi-hosted\" target=\"_blank\">https://github.com/pi-hosted/pi-hosted</a></b><br><br><b>Official Webpage: </b><a href=\"https://rustdesk.com/\" target=\"_blank\">https://rustdesk.com/</a><br><b>Official Docker Documentation: </b><a href=\"https://github.com/rustdesk/rustdesk-server\" target=\"_blank\">https://github.com/rustdesk/rustdesk-server</a><br><br><br>Don't forget to open ports 21115 to 21119 in your router.",
+			"platform": "linux",
+			"ports": [
+				"21115:21115/tcp",
+				"21116:21116/tcp",
+				"21116:21116/udp",
+				"21117:21117/tcp",
+				"21118:21118/tcp",
+				"21119:21119/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "RestDesk",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/rustdesk",
+					"container": "/data"
+				}
+			]
+		},
 		{
 		{
 			"categories": [
 			"categories": [
 				"Downloaders"
 				"Downloaders"