Przeglądaj źródła

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

Robert Middleswarth 3 lat temu
rodzic
commit
f6b413d8bc

+ 1 - 0
docs/AppList.md

@@ -88,6 +88,7 @@ List of all apps included in this project with info related to it.
 |[Nextcloud](https://nextcloud.com/)|32/64 bit|Stack| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-nextcloud) |  |  |  |  |
 |[Nextcloud](https://nextcloud.com/)|32/64 bit|Stack| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-nextcloud) |  |  |  |  |
 |[NextcloudPi](https://ownyourbits.com/nextcloudpi/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://ownyourbits.com/2017/06/08/nextcloudpi-docker-for-raspberry-pi/) |  |  | [reset_premissions_nextcloud.sh](../tools/reset_premissions_nextcloud.sh) | [![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)](https://www.youtube.com/watch?v=E6IrT3g5Gqc&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=9) |
 |[NextcloudPi](https://ownyourbits.com/nextcloudpi/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://ownyourbits.com/2017/06/08/nextcloudpi-docker-for-raspberry-pi/) |  |  | [reset_premissions_nextcloud.sh](../tools/reset_premissions_nextcloud.sh) | [![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)](https://www.youtube.com/watch?v=E6IrT3g5Gqc&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=9) |
 |[Nginx](https://nginx.org/en/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-nginx) |  |  |  |  |
 |[Nginx](https://nginx.org/en/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-nginx) |  |  |  |  |
+|[]()|32/64 bit|| [![](../build/images/blue_doc_icon.png)]() | [![](../build/images/red_doc_icon.png)](../docs/) | [![](../build/images/script_icon.png)](../tools/) | [](../tools/) | [![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)]() |
 |[Nginx Proxy Manager](https://nginxproxymanager.com/)|32/64 bit|Stack| [![](../build/images/blue_doc_icon.png)](https://nginxproxymanager.com/setup/#using-mysql-mariadb-database) | [![](../build/images/red_doc_icon.png)](../docs/nginx_proxy_manager.md) | [![](../build/images/script_icon.png)](../tools/nginx-proxy-manager.sh) |  | [![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)](https://www.youtube.com/watch?v=yl2Laxbqvo8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=10) |
 |[Nginx Proxy Manager](https://nginxproxymanager.com/)|32/64 bit|Stack| [![](../build/images/blue_doc_icon.png)](https://nginxproxymanager.com/setup/#using-mysql-mariadb-database) | [![](../build/images/red_doc_icon.png)](../docs/nginx_proxy_manager.md) | [![](../build/images/script_icon.png)](../tools/nginx-proxy-manager.sh) |  | [![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)](https://www.youtube.com/watch?v=yl2Laxbqvo8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=10) |
 |[Node Red](https://nodered.org/)|32/64 bit|Stack| [![](../build/images/blue_doc_icon.png)](https://nodered.org/docs/getting-started/docker) |  |  |  |  |
 |[Node Red](https://nodered.org/)|32/64 bit|Stack| [![](../build/images/blue_doc_icon.png)](https://nodered.org/docs/getting-started/docker) |  |  |  |  |
 |[NZBGet](https://nzbget.net/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-nzbget) |  |  |  |  |
 |[NZBGet](https://nzbget.net/)|32/64 bit|Container| [![](../build/images/blue_doc_icon.png)](https://docs.linuxserver.io/images/docker-nzbget) |  |  |  |  |

+ 51 - 0
stack/nginx-proxy-manager-goaccess.yml

@@ -0,0 +1,51 @@
+version: "3"
+services:
+  app:
+    image: jc21/nginx-proxy-manager:latest
+    container_name: nginx-proxy-manager
+    environment:
+      DB_MYSQL_HOST: 'db'
+      DB_MYSQL_PORT: 3306
+      DB_MYSQL_USER: 'npm'
+      DB_MYSQL_PASSWORD: ${DATABASE_PASSWORD}
+      DB_MYSQL_NAME: 'npm'
+    volumes:
+      - /portainer/Files/AppData/Config/nginx-proxy-manager/config.json:/app/config/production.json
+      - /portainer/Files/AppData/Config/nginx-proxy-manager/data:/data
+      - /portainer/Files/AppData/Config/nginx-proxy-manager/letsencrypt:/etc/letsencrypt
+    depends_on:
+      - db
+    ports:
+      - 80:80
+      - 443:443
+      - 81:81
+    restart: unless-stopped
+  db:
+    image: linuxserver/mariadb:latest
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: npm
+      MYSQL_USER: npm
+      MYSQL_PASSWORD: ${DATABASE_PASSWORD}
+      PUID: ${USER_UID}
+      PGID: ${USER_GID}
+      TZ: ${TZ}
+
+    volumes:
+      - /portainer/Files/AppData/Config/nginx-proxy-manager/database:/config
+
+  stats:
+    image: justsky/goaccess-for-nginxproxymanager:latest
+    restart: unless-stopped
+    environment:
+      PUID: ${USER_UID}
+      PGID: ${USER_GID}
+      TZ: ${TZ}
+      SKIP_ARCHIVED_LOGS: ${SKIP_ARCHIVED_LOGS}
+      BASIC_AUTH: ${BASIC_AUTH}
+      BASIC_AUTH_USERNAME: ${BASIC_AUTH_USERNAME}
+      BASIC_AUTH_PASSWORD: ${BASIC_AUTH_PASSWORD}
+
+    volumes:
+      - /portainer/Files/AppData/Config/nginx-proxy-manager/data/logs:/opt/log:ro

+ 80 - 0
template/apps/nginx-proxy-manager-goaccess.json

@@ -0,0 +1,80 @@
+{
+	"categories": [
+		"Proxy",
+		"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.  Please see the install document at https://github.com/pi-hosted/pi-hosted/tree/master/docs installing the template",
+	"env": [
+		{
+			"default": "1000",
+			"label": "PUID",
+			"name": "PUID"
+		},
+		{
+			"default": "1000",
+			"label": "PGID",
+			"name": "PGID"
+		},
+		{
+			"default": "America/New_York",
+			"label": "TZ",
+			"name": "TZ"
+		},
+		{
+			"default": "password",
+			"label": "DATABASE_PASSWORD",
+			"name": "DATABASE_PASSWORD"
+		},
+		{
+			"default": "password",
+			"label": "MYSQL_ROOT_PASSWORD",
+			"name": "MYSQL_ROOT_PASSWORD"
+		},
+		{
+			"default": "False",
+			"label": "SKIP_ARCHIVED_LOGS",
+			"name": "SKIP_ARCHIVED_LOGS"
+			"description": "Defaults to False. Set to True to skip archived logs, i.e. proxy-host*.gz"
+		},
+		{
+			"default": "False",
+			"label": "BASIC_AUTH",
+			"name": "BASIC_AUTH"
+			"description": "Defaults to False. Set to True to enable nginx basic authentication. Docker container needs to stopped or restarted each time this flag is modified. This allows for the .htpasswd file to be changed accordingly."
+		},
+		{
+			"default": "user",
+			"label": "BASIC_AUTH_USERNAME",
+			"name": "BASIC_AUTH_USERNAME"
+			"description": "(Optional) Requires BASIC_AUTH to bet set to True. Username for basic authentication."
+		},
+		{
+			"default": "Password",
+			"label": "BASIC_AUTH_PASSWORD",
+			"name": "BASIC_AUTH_PASSWORD"
+			"description": "(Optional) Requires BASIC_AUTH to bet set to True. Password for basic authentication."
+		}
+	],
+	"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/proxy_mgr.png",
+	"name": "nginx-proxy-manager-goaccess",
+	"officialDoc": "https://nginxproxymanager.com/setup/#using-mysql-mariadb-database",
+	"piHostedDoc": "nginx_proxy_manager.md",
+	"platform": "linux",
+	"ports": [
+		"80:80/tcp",
+		"81:81/tcp",
+		"443:443/tcp"
+		"7880:7880/tcp"
+	],
+	"preInstallScript": "nginx-proxy-manager.sh",
+	"repository": {
+		"stackfile32": "stack/nginx-proxy-manager-goaccess.yml",
+		"stackfile64": "stack/nginx-proxy-manager-goaccess.yml",
+		"url": "https://github.com/pi-hosted/pi-hosted"
+	},
+	"restart_policy": "unless-stopped",
+	"title": "Nginx Proxy Manager with Goaccess Charts",
+	"type": 3,
+	"videoID": 9,
+	"webpage": "https://nginxproxymanager.com/"
+}