Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ node_modules/
vendor/bundle/
.bundle/
.npm-cache/
etc-pihole/
1 change: 1 addition & 0 deletions .markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MD013: false
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Changelog

All notable changes to this project will be documented in this file.

## [2026-09-05]

### Changed

- Updated repository to reflect Pi-hole Core v6.1.4, FTL v6.7, Web v6.6, and Docker 2026.07.x.
- Rewrote README for better scannability and inclusion of Docker quickstart.
- Migrated legacy Docker configurations to use modern `FTLCONF_*` environment variables.

### Added

- `docker-compose.yml` and `.env` template in root.
- `MIGRATION.md`, `CONTRIBUTING.md`, and `CHANGELOG.md`.
1 change: 1 addition & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ We as contributors and maintainers pledge to make participation in our project a
## 🚫 Unacceptable Behavior

Examples include:

- Use of sexualized language or imagery
- Trolling, insulting or derogatory comments
- Public or private harassment
Expand Down
13 changes: 13 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Contributing

Thank you for your interest in contributing to the Pi-hole v6 Troubleshooting Hub!

## How to Contribute

1. Fork this repository.
2. Create a feature branch (`git checkout -b feature/your-feature`).
3. Commit your changes (`git commit -m 'Add some feature'`).
4. Push to the branch (`git push origin feature/your-feature`).
5. Open a Pull Request.

Please ensure your changes align with the official Pi-hole documentation and do not introduce unverified workarounds.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2025 TimInTech
Copyright (c) 2026 TimInTech

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
13 changes: 13 additions & 0 deletions MIGRATION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Migrating to Pi-hole v6

Pi-hole v6 introduces significant changes, notably the removal of `lighttpd` in favor of a built-in web server, and a shift to TOML-based configuration (`pihole.toml`).

## Docker Migration

If you are upgrading an existing Docker deployment:

1. **Environment Variables:** `WEBPASSWORD` and other legacy vars are deprecated. Use `FTLCONF_*` prefixes.
- Example: `WEBPASSWORD=secret` becomes `FTLCONF_webserver_api_password=secret`.
2. **Volumes:** `/etc/dnsmasq.d` is no longer strictly required for standard configs, as Pi-hole FTL handles everything internally.

See the root `docker-compose.yml` for a modern working example.
209 changes: 34 additions & 175 deletions README.de.md

Large diffs are not rendered by default.

211 changes: 34 additions & 177 deletions README.md

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
services:
pihole:
container_name: pihole
image: pihole/pihole:2026.07.0
ports:
- "53:53/tcp"
- "53:53/udp"
- "80:80/tcp"
environment:
- TZ=${TZ:-Europe/Berlin}
- FTLCONF_webserver_api_password=${PIHOLE_PASSWORD}
- FTLCONF_dns_upstreams=1.1.1.1;1.0.0.1
volumes:
- './etc-pihole:/etc/pihole'
cap_add:
- NET_ADMIN
restart: unless-stopped
33 changes: 19 additions & 14 deletions docs/docker-v6.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,25 @@ Hinweise:

## Migration v5 -> v6 Schritt für Schritt

1) Backup anlegen (Teleporter oder Volume-Sicherung):
- Web-UI: Settings → Teleporter (recommended)
- Oder Volumes `/etc/pihole` und `/etc/dnsmasq.d` sichern.
2) Container stoppen und entfernen: `docker compose down`
3) Compose-Datei auf v6 aktualisieren (siehe Beispiele):
- `image: pihole/pihole:latest`
- `WEBPASSWORD` setzen
- Ports/Volumes prüfen
4) Container neu starten: `docker compose up -d`
5) Prüfen:
- `docker logs pihole -f` für Fehler
- Admin UI: `http://<host-ip>/admin/` (oder `:8080`)
- `dig @<host-ip> pi.hole`
6) Optional: Unbound-Container hinzufügen und in Pi-hole als Upstream `127.0.0.1#5335` konfigurieren.
1. Backup anlegen (Teleporter oder Volume-Sicherung):
- Web-UI: Settings → Teleporter (recommended)
- Oder Volumes `/etc/pihole` und `/etc/dnsmasq.d` sichern.

2. Container stoppen und entfernen: `docker compose down`

3. Compose-Datei auf v6 aktualisieren (siehe Beispiele):
- `image: pihole/pihole:latest`
- `WEBPASSWORD` setzen
- Ports/Volumes prüfen

4. Container neu starten: `docker compose up -d`

5. Prüfen:
- `docker logs pihole -f` für Fehler
- Admin UI: `http://<host-ip>/admin/` (oder `:8080`)
- `dig @<host-ip> pi.hole`

6. Optional: Unbound-Container hinzufügen und in Pi-hole als Upstream `127.0.0.1#5335` konfigurieren.

## Nützliche Tipps

Expand Down
Loading