From 58466b1ce51c745e17c50c47ff09629e635ebfb3 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Fri, 23 Sep 2022 18:10:47 +0200 Subject: [PATCH 1/5] refactor(n8n) random db password and bump version --- apps/n8n/config.json | 14 +++++++++++--- apps/n8n/docker-compose.yml | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/apps/n8n/config.json b/apps/n8n/config.json index 5fa04fe7..ed9f4549 100644 --- a/apps/n8n/config.json +++ b/apps/n8n/config.json @@ -4,13 +4,21 @@ "available": true, "port": 8094, "id": "n8n", - "tipi_version": 1, - "version": "0.186.1", + "tipi_version": 2, + "version": "0.195.5", "categories": ["automation"], "description": "n8n is an extendable workflow automation tool. With a fair-code distribution model, n8n will always have visible source code, be available to self-host, and allow you to add your own custom functions, logic and apps. n8n's node-based approach makes it highly versatile, enabling you to connect anything to everything.", "short_desc": "Workflow Automation Tool. Alternative to Zapier", "author": "n8n.io", "source": "https://github.com/n8n-io/n8n", "website": "https://n8n.io/", - "form_fields": [] + "form_fields": [ + { + "type": "random", + "label": "Database password", + "min": 30, + "max": 30, + "env_variable": "DB_PASSWORD" + } + ] } diff --git a/apps/n8n/docker-compose.yml b/apps/n8n/docker-compose.yml index 86743c25..efb85ae8 100644 --- a/apps/n8n/docker-compose.yml +++ b/apps/n8n/docker-compose.yml @@ -8,7 +8,7 @@ services: volumes: - ${APP_DATA_DIR}/data/db:/var/lib/postgresql/data environment: - - POSTGRES_PASSWORD=tipi + - POSTGRES_PASSWORD=${DB_PASSWORD} - POSTGRES_USER=tipi - POSTGRES_DB=n8n networks: @@ -16,7 +16,7 @@ services: n8n: container_name: n8n - image: n8nio/n8n:0.186.1 + image: n8nio/n8n:0.195.5 restart: unless-stopped ports: - ${APP_PORT}:5678 From fb3ec734811db27ca23e5e38805315f4c4879332 Mon Sep 17 00:00:00 2001 From: dextreem Date: Fri, 23 Sep 2022 10:46:43 +0200 Subject: [PATCH 2/5] Added form field for network interface to adguard --- apps/adguard/config.json | 9 ++++++++- apps/adguard/docker-compose.yml | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/adguard/config.json b/apps/adguard/config.json index 943a9eb9..3bfecb35 100644 --- a/apps/adguard/config.json +++ b/apps/adguard/config.json @@ -14,5 +14,12 @@ "requirements": { "ports": [53] }, - "form_fields": [] + "form_fields": [ + { + "type": "ip", + "label": "Network Interface (use 0.0.0.0 for all)", + "required": true, + "env_variable": "NW_INTERFACE" + } + ] } diff --git a/apps/adguard/docker-compose.yml b/apps/adguard/docker-compose.yml index f5aeb613..b1d911ef 100644 --- a/apps/adguard/docker-compose.yml +++ b/apps/adguard/docker-compose.yml @@ -11,6 +11,6 @@ services: networks: - tipi_main_network ports: - - 53:53/tcp - - 53:53/udp + - ${NW_INTERFACE}:53:53/tcp + - ${NW_INTERFACE}:53:53/udp - ${APP_PORT}:80 From 678f9e41d6cc9fa243639d520b46f85249e5d20b Mon Sep 17 00:00:00 2001 From: dextreem Date: Fri, 23 Sep 2022 10:46:50 +0200 Subject: [PATCH 3/5] Added form field for network interface to pihole --- apps/pihole/config.json | 6 ++++++ apps/pihole/docker-compose.yml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/pihole/config.json b/apps/pihole/config.json index 1441e402..7150e147 100644 --- a/apps/pihole/config.json +++ b/apps/pihole/config.json @@ -22,6 +22,12 @@ "min": 3, "required": true, "env_variable": "APP_PASSWORD" + }, + { + "type": "ip", + "label": "Network Interface (use 0.0.0.0 for all)", + "required": true, + "env_variable": "NW_INTERFACE" } ] } diff --git a/apps/pihole/docker-compose.yml b/apps/pihole/docker-compose.yml index e3d47d26..dbcb773a 100644 --- a/apps/pihole/docker-compose.yml +++ b/apps/pihole/docker-compose.yml @@ -21,8 +21,8 @@ services: - 127.0.0.1 # - 10.21.21.200 # Points to unbound ports: - - 53:53/tcp - - 53:53/udp + - ${NW_INTERFACE}:53:53/tcp + - ${NW_INTERFACE}:53:53/udp - ${APP_PORT}:80 volumes: - ${APP_DATA_DIR}/data/pihole:/etc/pihole From c630f6c56e34aae9d6c36c16c3c7678a8460b547 Mon Sep 17 00:00:00 2001 From: dextreem Date: Fri, 23 Sep 2022 15:13:04 +0200 Subject: [PATCH 4/5] Renamed NW_INTERFACE and assigned a default value of 0.0.0.0 --- apps/adguard/config.json | 6 +++--- apps/adguard/docker-compose.yml | 4 ++-- apps/pihole/config.json | 6 +++--- apps/pihole/docker-compose.yml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/adguard/config.json b/apps/adguard/config.json index 3bfecb35..7925c34d 100644 --- a/apps/adguard/config.json +++ b/apps/adguard/config.json @@ -17,9 +17,9 @@ "form_fields": [ { "type": "ip", - "label": "Network Interface (use 0.0.0.0 for all)", - "required": true, - "env_variable": "NW_INTERFACE" + "label": "Network Interface (default: 0.0.0.0)", + "required": false, + "env_variable": "NETWORK_INTERFACE" } ] } diff --git a/apps/adguard/docker-compose.yml b/apps/adguard/docker-compose.yml index b1d911ef..e44038c9 100644 --- a/apps/adguard/docker-compose.yml +++ b/apps/adguard/docker-compose.yml @@ -11,6 +11,6 @@ services: networks: - tipi_main_network ports: - - ${NW_INTERFACE}:53:53/tcp - - ${NW_INTERFACE}:53:53/udp + - ${NETWORK_INTERFACE:-0.0.0.0}:53:53/tcp + - ${NETWORK_INTERFACE:-0.0.0.0}:53:53/udp - ${APP_PORT}:80 diff --git a/apps/pihole/config.json b/apps/pihole/config.json index 7150e147..28fd7ab0 100644 --- a/apps/pihole/config.json +++ b/apps/pihole/config.json @@ -25,9 +25,9 @@ }, { "type": "ip", - "label": "Network Interface (use 0.0.0.0 for all)", - "required": true, - "env_variable": "NW_INTERFACE" + "label": "Network Interface (default: 0.0.0.0)", + "required": false, + "env_variable": "NETWORK_INTERFACE" } ] } diff --git a/apps/pihole/docker-compose.yml b/apps/pihole/docker-compose.yml index dbcb773a..b16e86ec 100644 --- a/apps/pihole/docker-compose.yml +++ b/apps/pihole/docker-compose.yml @@ -21,8 +21,8 @@ services: - 127.0.0.1 # - 10.21.21.200 # Points to unbound ports: - - ${NW_INTERFACE}:53:53/tcp - - ${NW_INTERFACE}:53:53/udp + - ${NETWORK_INTERFACE:-0.0.0.0}:53:53/tcp + - ${NETWORK_INTERFACE:-0.0.0.0}:53:53/udp - ${APP_PORT}:80 volumes: - ${APP_DATA_DIR}/data/pihole:/etc/pihole From e1d790c1b3d7d207bd066b4a71eb81e481b0ce6e Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Fri, 23 Sep 2022 18:19:15 +0200 Subject: [PATCH 5/5] chore: bump versions --- apps/adguard/config.json | 4 ++-- apps/adguard/docker-compose.yml | 2 +- apps/pihole/config.json | 6 +++--- apps/pihole/docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/adguard/config.json b/apps/adguard/config.json index 7925c34d..c7b1e9d6 100644 --- a/apps/adguard/config.json +++ b/apps/adguard/config.json @@ -2,8 +2,8 @@ "$schema": "../schema.json", "name": "Adguard", "available": true, - "tipi_version": 1, - "version": "0.107.7", + "tipi_version": 2, + "version": "0.107.13", "port": 8104, "id": "adguard", "categories": ["network", "security"], diff --git a/apps/adguard/docker-compose.yml b/apps/adguard/docker-compose.yml index e44038c9..bfcd7331 100644 --- a/apps/adguard/docker-compose.yml +++ b/apps/adguard/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: adguard: - image: adguard/adguardhome:v0.107.7 + image: adguard/adguardhome:v0.107.13 container_name: adguard volumes: - "${APP_DATA_DIR}/data/work:/opt/adguardhome/work" diff --git a/apps/pihole/config.json b/apps/pihole/config.json index 28fd7ab0..7246b6f1 100644 --- a/apps/pihole/config.json +++ b/apps/pihole/config.json @@ -7,8 +7,8 @@ "ports": [53] }, "id": "pihole", - "tipi_version": 1, - "version": "2022.07.1", + "tipi_version": 2, + "version": "2022.09.4", "categories": ["network", "security"], "description": "The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.", "short_desc": "A black hole for Internet advertisements", @@ -22,7 +22,7 @@ "min": 3, "required": true, "env_variable": "APP_PASSWORD" - }, + }, { "type": "ip", "label": "Network Interface (default: 0.0.0.0)", diff --git a/apps/pihole/docker-compose.yml b/apps/pihole/docker-compose.yml index b16e86ec..d0bd5550 100644 --- a/apps/pihole/docker-compose.yml +++ b/apps/pihole/docker-compose.yml @@ -14,7 +14,7 @@ services: pihole: # depends_on: [unbound] container_name: pihole - image: pihole/pihole:2022.07.1 + image: pihole/pihole:2022.09.4 restart: unless-stopped hostname: pihole dns: