Compare commits
2 Commits
22730685f1
...
8e7e0ee937
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e7e0ee937 | ||
|
|
6b56615eba |
@@ -31,32 +31,22 @@ dns:
|
||||
ratelimit_whitelist: []
|
||||
refuse_any: true
|
||||
upstream_dns:
|
||||
- '##'
|
||||
- '# Google'
|
||||
- '##'
|
||||
- '############# Google'
|
||||
- 1.1.1.1
|
||||
- 1.0.0.1
|
||||
- '#https://dns.google/dns-query'
|
||||
- '#tls://dns.google'
|
||||
- '##'
|
||||
- '# Cloudflare'
|
||||
- '##'
|
||||
- '############# Cloudflare'
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
- '#https://dns.cloudflare.com/dns-query'
|
||||
- '#tls://1dot1dot1dot1.cloudflare-dns.com'
|
||||
- '##'
|
||||
- '# Lokal'
|
||||
- '##'
|
||||
- '############# Lokal'
|
||||
- '[/fritz.box/]192.168.0.1'
|
||||
- '[/168.192.in-addr.arpa/]192.168.0.1'
|
||||
- '[/192.in-addr.arpa/]192.168.0.1'
|
||||
upstream_dns_file: ""
|
||||
bootstrap_dns:
|
||||
- 1.1.1.1
|
||||
- 1.0.0.1
|
||||
- 8.8.8.8
|
||||
- 8.8.4.4
|
||||
all_servers: false
|
||||
all_servers: true
|
||||
fastest_addr: false
|
||||
fastest_timeout: 1s
|
||||
allowed_clients: []
|
||||
@@ -93,8 +83,9 @@ dns:
|
||||
blocked_services: []
|
||||
upstream_timeout: 10s
|
||||
private_networks: []
|
||||
use_private_ptr_resolvers: false
|
||||
local_ptr_upstreams: []
|
||||
use_private_ptr_resolvers: true
|
||||
local_ptr_upstreams:
|
||||
- 192.168.0.1
|
||||
serve_http3: false
|
||||
use_http3_upstreams: false
|
||||
tls:
|
||||
@@ -198,7 +189,6 @@ user_rules:
|
||||
- '@@||app-measurement.com^$important'
|
||||
- '@@||www.googletagmanager.com^$important'
|
||||
- '@@||www.google-analytics.com^$important'
|
||||
- ""
|
||||
dhcp:
|
||||
enabled: false
|
||||
interface_name: eth0
|
||||
|
||||
@@ -13,7 +13,7 @@ services:
|
||||
- 53:53/tcp
|
||||
- 53:53/udp
|
||||
- 3000:3000/tcp
|
||||
- 3080:80/tcp
|
||||
# - 3080:80/tcp
|
||||
environment:
|
||||
- TZ=Europe/Berlin
|
||||
restart: unless-stopped
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
version: "3.4"
|
||||
services:
|
||||
broker:
|
||||
image: redis:6.0
|
||||
image: redis:7
|
||||
container_name: paperless_redis
|
||||
volumes:
|
||||
- ./redis:/data
|
||||
@@ -47,7 +47,6 @@ services:
|
||||
POSTGRES_PASSWORD: paperless
|
||||
|
||||
webserver:
|
||||
# image: jonaswinkler/paperless-ng:latest
|
||||
image: ghcr.io/paperless-ngx/paperless-ngx
|
||||
container_name: paperless_app
|
||||
restart: unless-stopped
|
||||
@@ -68,8 +67,6 @@ services:
|
||||
- ./consume:/usr/src/paperless/consume
|
||||
env_file: docker-compose.env
|
||||
environment:
|
||||
PUID: 1000
|
||||
PGID: 1001
|
||||
PAPERLESS_REDIS: redis://broker:6379
|
||||
PAPERLESS_DBHOST: db
|
||||
|
||||
|
||||
Reference in New Issue
Block a user