4ec50469c7
!!!BREAKING!!! Use this as an oppurtunity to tidy up/uniform the environment variables. Most things can be set directly in pihole.toml these days, so will convert variables in the format of FTLCONF_key or FTLCONF_key_subkey etc into key or key.subkey respectively and apply them to the config
...
This also takes away a lot of the error handling - but that should likely be in FTL if anywhere, anyway. Vastly simplifies startup in docker
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:01:19 +00:00
7d93b94a53
Allow setting custom WEB_PORT to 80 (todo: Look at a new catchall for FTL config settings)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:00:54 +00:00
d0790440cd
What setupVars?
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:00:54 +00:00
87c0103c56
set ownership of pihole.toml in start up
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:00:54 +00:00
a6a7914a2b
update macvendor setting
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:00:54 +00:00
626237a92d
Switch to `devel-v6` branch on the web interface
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:00:54 +00:00
09ccd44c54
Remove some lighttpd related functions
...
Setting web password now works
Setting DHCP should work?
Setting conditional forwarders should work
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:00:54 +00:00
99ccda1e7f
use PADD from the PADD_FTLv6 branch
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:00:54 +00:00
a27bd400c2
Oh yeah, we don't need these lighttpd files any more...
2023-02-10 23:00:54 +00:00
45f2d2dad6
switch out the base image for debian with for now - fewer packages pre-installed than the pihole base image
2023-02-10 23:00:54 +00:00
18609ec80e
VERY rough starting point for a v6 container.
...
Lots of stuff removed/commented out just to make the container start - things will need revisiting once we are settled on how we will configure FTL from the CLI
Tests will fail for sure. Can't seem to make it work without host-mounting /etc/pihole at the moment
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-02-10 23:00:54 +00:00
ab4b7ffff6
Merge pull request #1309 from pi-hole/master
...
Sync master back into development
2023-02-10 19:27:37 +00:00
113ef002f1
Merge pull request #1317 from pi-hole/dev
...
Dev -> Master
2023-02-10 19:08:46 +00:00
4debb9da75
Merge pull request #1313 from pi-hole/dependabot/github_actions/dev/docker/build-push-action-4
...
Bump docker/build-push-action from 3 to 4
2023-02-10 19:08:07 +00:00
8fb0344f4c
Bump docker/build-push-action from 3 to 4
...
Bumps [docker/build-push-action](https://github.com/docker/build-push-action ) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases )
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-02-04 10:00:30 +00:00
79f96060b6
Clarify TEMPERATUREUNIT usage
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-26 19:39:36 +00:00
9612689cf2
Merge pull request #1308 from pi-hole/master
...
Sync master back into development
2023-01-25 21:33:28 +00:00
843b3ff071
Merge pull request #1307 from pi-hole/dev
...
Dev -> Master
2023-01-25 21:28:55 +00:00
bb33b4d0ab
Merge pull request #1306 from pi-hole/master
...
Sync master back into development
2023-01-25 15:58:19 +00:00
db6f9b80b5
Update README.md
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-25 15:55:41 +00:00
08cd3ef8f2
Merge pull request #1303 from pi-hole/master
...
Sync master back into development
2023-01-23 23:31:03 +00:00
3a12526e05
Merge pull request #1304 from pi-hole/virtualhost
...
Don't declare VIRTUAL_HOST as an empty string in Dockerfile
2023-01-23 23:26:29 +00:00
d7ff34fd74
Instead of including a static config file for redirecting it - dynamically create this file on container start.
...
This gets rid of what was probably a hack to have the VIRTUAL_HOST declared as an empty string in the Dockerfile (lighttpd would not start if env.VIRTUAL_HOST was not set
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-23 23:20:30 +00:00
36d0161cf9
Merge pull request #1302 from pi-hole/dev
...
Dev-> Master
2023-01-23 19:01:49 +00:00
ad6b8a6f0e
Merge pull request #1301 from pi-hole/ln-fallback
...
Configure FTL's MACVENDORDB setting to "/macvendor.db" on startup
2023-01-23 18:00:33 +00:00
846805aeb7
Configure FTL to use /macvendor.db instead of /etc/pihole/macvendor.db. If user is passing in their own location, then we honour that.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-23 17:52:39 +00:00
2c516ccd7d
Merge pull request #1300 from pi-hole/revert-1298-fix/503
...
Revert "Ensure that the directory `/run/lighttpd` exists
2023-01-23 17:25:35 +00:00
a1f5c6b530
Revert "Ensure that the directory `/run/lighttpd` exists, and that it is owned by www-data"
2023-01-23 17:22:54 +00:00
a8ac8322d5
Merge pull request #1297 from pi-hole/master
...
Sync master back into development
2023-01-22 17:54:04 +00:00
4256d62a1e
Merge pull request #1298 from pi-hole/fix/503
...
Ensure that the directory `/run/lighttpd` exists, and that it is owned by www-data
2023-01-22 17:53:17 +00:00
90df84553a
Ensure that the directory `/run/lighttpd` exists, and that it is owned by www-data. How did this work before?!
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-22 17:51:09 +00:00
c9881798c0
Merge pull request #1296 from pi-hole/dev
...
Dev
2023-01-22 17:23:09 +00:00
13cdfda3ee
Merge pull request #1293 from n6g7/lighttpd-bind-config
...
Add support for changing admin bind address indepentendly of $FTLCONF_LOCAL_IPV4
2023-01-22 17:22:38 +00:00
d2637c3a02
Rewrite WEB_PORT log.
...
Signed-off-by: Nathan Gaberel <nathan@gnab.fr>
2023-01-21 18:06:14 -08:00
010644af5e
Add $WEB_BIND_ADDR to docs.
...
Signed-off-by: Nathan Gaberel <nathan@gnab.fr>
2023-01-21 18:06:14 -08:00
54d179c24b
Bind lighttpd to $WEB_BIND_ADDR by default.
...
Signed-off-by: Nathan Gaberel <nathan@gnab.fr>
2023-01-21 18:06:05 -08:00
005b6495ec
Merge pull request #1292 from pi-hole/master
...
Sync master back into development
2023-01-21 14:36:36 +00:00
b5b7d8aed6
Merge pull request #1291 from pi-hole/dev
...
Dev
2023-01-21 14:27:23 +00:00
460f65e933
Merge pull request #1290 from pi-hole/provenance
...
Disable provenance in the `build-push-action`
2023-01-21 12:54:21 +00:00
e6df02c637
Disable provenence per https://github.com/docker/buildx/issues/1513#issuecomment-1398340039
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-21 12:39:54 +00:00
52ee954167
Merge pull request #1288 from pi-hole/allow_empty_ftconf
...
Allow for empty strings to be passed into FTLCONF_ environment variables
2023-01-20 18:26:33 +00:00
7efb80f988
Allow for empty strings to be passed into FTLCONF_ environment variables.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-20 18:22:32 +00:00
637ce654c5
Merge pull request #1283 from pi-hole/master
...
Sync master back into development
2023-01-18 23:08:30 +00:00
3be4ac6b5a
Merge pull request #1287 from pi-hole/dev
...
Dev-> master
2023-01-18 23:07:45 +00:00
312419b33b
Merge pull request #1286 from pi-hole/fix/duplicate_env
...
lighttpd does not like it if VIRTUAL_HOST and FTLCONF_LOCAL_IPV4 are duplicate values...
2023-01-18 22:42:31 +00:00
cbf5d6620c
lighttpd does not like it if VIRTUAL_HOST and FTLCONF_LOCAL_IPV4 are the same value - but that makes sense. Instead we set VIRTUAL_HOST to HOSTNAME if it is not already set by the user
...
Also goes back to making the modifications to 15-pihole-admin.conf in conf-available - as otherwise it overwrites the symlink. Not a big deal, but I think we got confused earlier on
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-18 22:41:54 +00:00
6b13b9bae9
Merge pull request #1285 from pi-hole/dev
...
Dev
2023-01-18 17:50:19 +00:00
671f988b45
Merge pull request #1284 from pi-hole/remove-PHP_ENV_CONFIG_var
...
Modify the `15-pihole-admin.conf` file in the correct path....
2023-01-18 17:49:55 +00:00
d588dba28e
Modify the `15-pihole-admin.conf` file in the correct path.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-18 17:47:40 +00:00
5e3555dc6a
Merge pull request #1282 from pi-hole/dev
...
Dev
2023-01-18 16:21:18 +00:00
Adam Warner
dependabot[bot]
Adam Warner
Nathan Gaberel