Browse Source

Merge branch 'npm' of github.com:rmiddle/pi-hosted into npm

Robert Middleswarth 3 years ago
parent
commit
1717d615d0

+ 1 - 5
docs/README.md

@@ -33,7 +33,6 @@ You're done! Now just click App Templates and deploy applications!
 
 
 [![Pi-Hosted Playlist](https://i.ytimg.com/vi/cO2-gQ09Jj0/hqdefault.jpg?sqp=-oaymwEXCNACELwBSFryq4qpAwkIARUAAIhCGAE=&rs=AOn4CLAfgdX8HlHas2CddSmgwJzergnTzQ)](https://www.youtube.com/watch?v=cO2-gQ09Jj0&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc)
 [![Pi-Hosted Playlist](https://i.ytimg.com/vi/cO2-gQ09Jj0/hqdefault.jpg?sqp=-oaymwEXCNACELwBSFryq4qpAwkIARUAAIhCGAE=&rs=AOn4CLAfgdX8HlHas2CddSmgwJzergnTzQ)](https://www.youtube.com/watch?v=cO2-gQ09Jj0&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc)
 
 
-
 |   | Episode                                                                                                                                                                       |
 |   | Episode                                                                                                                                                                       |
 |---|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 |---|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | 1 | [Raspberry Pi 4 Server Setup, Docker Install, Portainer Install, Shell In A Box](https://www.youtube.com/watch?v=cO2-gQ09Jj0&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=1) |
 | 1 | [Raspberry Pi 4 Server Setup, Docker Install, Portainer Install, Shell In A Box](https://www.youtube.com/watch?v=cO2-gQ09Jj0&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=1) |
@@ -44,13 +43,10 @@ You're done! Now just click App Templates and deploy applications!
 | 6 |     [Portainer.io App Template for Raspberry Pi arm/arm64 I Need Your Help!](https://www.youtube.com/watch?v=Zn-VELlaIN4&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=6)     |
 | 6 |     [Portainer.io App Template for Raspberry Pi arm/arm64 I Need Your Help!](https://www.youtube.com/watch?v=Zn-VELlaIN4&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=6)     |
 | 7 |                   [Upgrading Portainer and Updating Containers](https://www.youtube.com/watch?v=q3wKqk8qVS8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=7)                  |
 | 7 |                   [Upgrading Portainer and Updating Containers](https://www.youtube.com/watch?v=q3wKqk8qVS8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=7)                  |
 | 8 |                         [Raspberry Pi Docker Monitoring](https://www.youtube.com/watch?v=IoD3vFuep64&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=8)                         |
 | 8 |                         [Raspberry Pi Docker Monitoring](https://www.youtube.com/watch?v=IoD3vFuep64&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=8)                         |
-=======
-### Addition Documentation can be found in the Docs Folder
 
 
+### Addition Documentation can be found in the Docs Folder
 https://github.com/novaspirit/pi-hosted/tree/master/docs
 https://github.com/novaspirit/pi-hosted/tree/master/docs
 
 
-
-
 ### Contributors
 ### Contributors
 
 
 See the list of [contributors](https://github.com/novaspirit/pi-hosted/graphs/contributors) who participated in this project.
 See the list of [contributors](https://github.com/novaspirit/pi-hosted/graphs/contributors) who participated in this project.

BIN
docs/images/nginx-proxy-manager-AppTemplates-Deploy.png


BIN
docs/images/nginx-proxy-manager-AppTemplates.png


BIN
docs/images/nginx-proxy-manager-Edit-User.png


BIN
docs/images/nginx-proxy-manager-Login.png


BIN
docs/images/nginx-proxy-manager-Menu-Add-Proxy-Host.png


BIN
docs/images/nginx-proxy-manager-New-Proxy-Host-SSL.png


BIN
docs/images/nginx-proxy-manager-New-Proxy-Host.png


BIN
docs/images/nginx-proxy-manager-Password-Change.png


BIN
docs/images/nginx-proxy-manager-Stack-Details.png


+ 1 - 0
rpi_nginx-proxy-manager.sh → nginx-proxy-manager.sh

@@ -12,3 +12,4 @@ sudo mkdir -p /portainer/Files/AppData/Config/nginx-proxy-manager/database || er
 echo "Creating a blank nginx-proxy-manager config files"
 echo "Creating a blank nginx-proxy-manager config files"
 sudo touch /portainer/Files/AppData/Config/nginx-proxy-manager/config.json || error "Failed to touch config.json file!"
 sudo touch /portainer/Files/AppData/Config/nginx-proxy-manager/config.json || error "Failed to touch config.json file!"
 echo "Setup complete. You can now install the stack using the App Template."
 echo "Setup complete. You can now install the stack using the App Template."
+

+ 1 - 1
pi-hosted_template/template/portainer-v2.json

@@ -1344,7 +1344,7 @@
 				"Proxy",
 				"Proxy",
 				"Tools"
 				"Tools"
 			],
 			],
-			"description": "Nginx Proxy Manager enables you to easily forward to your websites running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt.",
+			"description": "Nginx Proxy Manager enables you to easily forward to your websites running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt.  Requires running the script rpi_nginx-proxy-manager.sh before installing the template",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/pi-hosted_template/images/proxy_mgr.png",
 			"logo": "https://raw.githubusercontent.com/novaspirit/pi-hosted/master/pi-hosted_template/images/proxy_mgr.png",
 			"name": "nginx-proxy-manager",
 			"name": "nginx-proxy-manager",
 			"platform": "linux",
 			"platform": "linux",