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
b96b257be1
Merge pull request #1281 from pi-hole/remove-PHP_ENV_CONFIG_var
...
Remove the PHP_ENV_CONFIG variable from the Dockerfile
2023-01-18 15:36:14 +00:00
61bd3c756a
I don't know why PHP_ENV_CONFIG is an environment variable. We don't need it to be
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-18 15:26:29 +00:00
91161b7ec6
Merge pull request #1278 from pi-hole/master
...
Sync master back into development
2023-01-17 09:18:42 +00:00
f70e9b37b8
Add note about `external.conf`, tidy up the upgrade notes section
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-17 09:14:49 +00:00
3b29a79f9d
Merge pull request #1272 from pi-hole/master
...
Sync master back into development
2023-01-15 23:56:07 +00:00
45d5fa753a
Merge pull request #1271 from pi-hole/admin-page-redirect
...
[Docker Only] Configure lighttpd to redirect http://VIRTUAL_HOST or http://FTLCONF_LOCAL_IPV4 to /admin
2023-01-15 23:55:08 +00:00
4c240a43d2
Introduce an additional lighttpd config file to redirect the IP address and VIRTUAL_HOST to /admin/
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-15 23:48:34 +00:00
2c04346411
Merge pull request #1269 from pi-hole/fix/PHP_ENV_CONFIG
...
Change `PHP_ENV_CONFIG` and `setup_web_php_env()`
2023-01-15 20:55:01 +00:00
8872c2b393
Fix config filename on the test
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-01-15 17:50:28 -03:00
a58b1c08bd
Change `PHP_ENV_CONFIG` and `setup_web_php_env()`
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-01-15 17:12:05 -03:00
16149d768a
Merge pull request #1270 from pi-hole/master
...
Sync master back into development
2023-01-15 17:46:12 +00:00
a00410a4ae
Merge pull request #1265 from pi-hole/action_close_stale_pr
...
Add action to close stale PR
2023-01-15 17:44:44 +00:00
94a6ed33c5
Add a workflow to build v6-pre-alpha container nightly/on push to that branch
2023-01-14 16:40:43 +00:00
0fc9505643
More detailed comments
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-01-06 18:48:55 -03:00
2771a17148
Add action to close stale PR
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2023-01-06 18:48:55 -03:00
99350c2327
Enable colors for pytest output. This certainly works locally, not sure if it will work on GHA... One way to find out.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-06 18:57:45 +00:00
b723874623
Don't need to see all the images on the system
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-06 18:57:09 +00:00
67d00f3b38
Merge pull request #1267 from pi-hole/master
...
Sync master back into development
2023-01-03 19:46:50 +00:00
203f6f4ea3
Merge pull request #1260 from yubiuser/be_honest
...
Shorten no merge conflict message
2023-01-02 19:04:25 +00:00
7eab50ce29
Merge pull request #1259 from pi-hole/master
...
Sync master back into development
2023-01-02 19:03:31 +00:00
3fe6b9e750
Add a clarifyier to docker compose command, remove the -f, as it is not needed
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-02 19:00:41 +00:00
3eb38a297e
Merge pull request #1262 from pi-hole/dependabot/github_actions/dev/actions/stale-7
...
Bump actions/stale from 6 to 7
2022-12-27 12:27:45 +00:00
62e3af4e60
Bump actions/stale from 6 to 7
...
Bumps [actions/stale](https://github.com/actions/stale ) from 6 to 7.
- [Release notes](https://github.com/actions/stale/releases )
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/stale/compare/v6...v7 )
---
updated-dependencies:
- dependency-name: actions/stale
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-24 10:00:34 +00:00
a4b5122e3e
Shorten no merge conflict message
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-22 22:29:09 +01:00
fa0fb82477
Merge pull request #1258 from pi-hole/dev
...
Dev -> master
2022-12-21 21:43:05 +00:00
842f4eb6c2
Merge pull request #1255 from yubiuser/merge_conflict
...
Add merge conflict workflow
2022-12-19 20:48:52 +00:00
d52df6dfb2
Merge pull request #1256 from pi-hole/master
...
Sync master back into development
2022-12-15 22:34:41 +00:00
6566662bc3
Merge pull request #1254 from yubiuser/sync_back
...
Use github cli to sync master back to development
2022-12-15 21:10:50 +00:00
e734f1fbce
Add merge conflict workflow
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-15 21:54:27 +01:00
6ed70c21a0
Use github cli to sync master back to development
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-15 21:46:58 +01:00
ae4271e80d
Merge pull request #1105 from pi-hole/ADD_PADD
...
Bake latest release (at time of build) of PADD into the container
2022-12-11 16:18:54 +00:00
f20a0d448c
Add to /usr/local/bin and drop the .sh. Can now be called with `padd`
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 16:16:29 +00:00
806829a1b1
add padd to .codespellignore.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 15:51:43 +00:00
fbef9727c1
Update Dockerfile
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-12-11 15:47:26 +00:00
Nathan Gaberel
Adam Warner
RD WebDesign
dependabot[bot]
Christian König