Adam Warner
|
6b13b9bae9
|
Merge pull request #1285 from pi-hole/dev
Dev
|
2023-01-18 17:50:19 +00:00 |
|
Adam Warner
|
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 |
|
Adam Warner
|
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 |
|
Adam Warner
|
5e3555dc6a
|
Merge pull request #1282 from pi-hole/dev
Dev
|
2023-01-18 16:21:18 +00:00 |
|
Adam Warner
|
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 |
|
Adam Warner
|
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 |
|
Adam Warner
|
91161b7ec6
|
Merge pull request #1278 from pi-hole/master
Sync master back into development
|
2023-01-17 09:18:42 +00:00 |
|
Adam Warner
|
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 |
|
Adam Warner
|
3b29a79f9d
|
Merge pull request #1272 from pi-hole/master
Sync master back into development
|
2023-01-15 23:56:07 +00:00 |
|
Adam Warner
|
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 |
|
Adam Warner
|
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 |
|
Adam Warner
|
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 |
|
RD WebDesign
|
8872c2b393
|
Fix config filename on the test
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
|
2023-01-15 17:50:28 -03:00 |
|
RD WebDesign
|
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 |
|
Adam Warner
|
16149d768a
|
Merge pull request #1270 from pi-hole/master
Sync master back into development
|
2023-01-15 17:46:12 +00:00 |
|
Adam Warner
|
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 |
|
Adam Warner
|
94a6ed33c5
|
Add a workflow to build v6-pre-alpha container nightly/on push to that branch
|
2023-01-14 16:40:43 +00:00 |
|
RD WebDesign
|
0fc9505643
|
More detailed comments
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
|
2023-01-06 18:48:55 -03:00 |
|
RD WebDesign
|
2771a17148
|
Add action to close stale PR
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
|
2023-01-06 18:48:55 -03:00 |
|
Adam Warner
|
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 |
|
Adam Warner
|
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 |
|
Adam Warner
|
67d00f3b38
|
Merge pull request #1267 from pi-hole/master
Sync master back into development
|
2023-01-03 19:46:50 +00:00 |
|
Adam Warner
|
203f6f4ea3
|
Merge pull request #1260 from yubiuser/be_honest
Shorten no merge conflict message
|
2023-01-02 19:04:25 +00:00 |
|
Adam Warner
|
7eab50ce29
|
Merge pull request #1259 from pi-hole/master
Sync master back into development
|
2023-01-02 19:03:31 +00:00 |
|
Adam Warner
|
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 |
|
Adam Warner
|
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 |
|
dependabot[bot]
|
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 |
|
Christian König
|
a4b5122e3e
|
Shorten no merge conflict message
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2022-12-22 22:29:09 +01:00 |
|
Adam Warner
|
fa0fb82477
|
Merge pull request #1258 from pi-hole/dev
Dev -> master
|
2022-12-21 21:43:05 +00:00 |
|
Adam Warner
|
842f4eb6c2
|
Merge pull request #1255 from yubiuser/merge_conflict
Add merge conflict workflow
|
2022-12-19 20:48:52 +00:00 |
|
Adam Warner
|
d52df6dfb2
|
Merge pull request #1256 from pi-hole/master
Sync master back into development
|
2022-12-15 22:34:41 +00:00 |
|
Adam Warner
|
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 |
|
Christian König
|
e734f1fbce
|
Add merge conflict workflow
Signed-off-by: Christian König <ckoenig@posteo.de>
|
2022-12-15 21:54:27 +01:00 |
|
Christian König
|
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 |
|
Adam Warner
|
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 |
|
Adam Warner
|
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 |
|
Adam Warner
|
806829a1b1
|
add padd to .codespellignore.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2022-12-11 15:51:43 +00:00 |
|
Adam Warner
|
fbef9727c1
|
Update Dockerfile
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
|
2022-12-11 15:47:26 +00:00 |
|
Adam Warner
|
201303a56a
|
ADD padd.sh to the container root
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2022-12-11 15:47:26 +00:00 |
|
Adam Warner
|
1fe6506e4f
|
Merge pull request #1247 from pi-hole/tweak/ftlrun
Remove unneeded variable reference in FTL run script
|
2022-12-10 16:48:15 +00:00 |
|
Adam Warner
|
2affe3c9cf
|
Merge pull request #1250 from pi-hole/PromoFaux-patch-1
Update README to explain the version numbers slightly more accurately
|
2022-12-10 16:47:25 +00:00 |
|
Adam Warner
|
ad36316060
|
Merge branch 'dev' into PromoFaux-patch-1
|
2022-11-30 22:40:26 +00:00 |
|
Adam Warner
|
41ac2b3aa8
|
Update README to explain the version numbers slightly more accurately
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2022-11-30 22:38:31 +00:00 |
|
Adam Warner
|
a0421789cc
|
CAP_STR will always be empty, since 776bac7b moved the calculation of that variable back out to bash_functions.sh
The capabilities are already set there, so they do not need to be set again here.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2022-11-27 22:35:31 +00:00 |
|
Adam Warner
|
7b80d7de66
|
Merge pull request #1246 from pi-hole/master
sync: master to dev
|
2022-11-27 21:48:26 +00:00 |
|
Adam Warner
|
a787e29aad
|
Merge pull request #1245 from pi-hole/dev
Dev - > master
|
2022-11-27 21:46:10 +00:00 |
|
Adam Warner
|
8aa6623844
|
Merge pull request #1242 from th0r88/patch-1
Added the right public port for pihole config
|
2022-11-21 07:12:18 +00:00 |
|
Jan Ferme
|
91a174f976
|
Added the right public port for pihole config
Otherwise it doesn't work.
Signed-off-by: Jan Ferme <10115360+th0r88@users.noreply.github.com>
|
2022-11-21 01:00:18 +01:00 |
|
Adam Warner
|
41aa699aab
|
Merge pull request #1234 from pi-hole/updatechecktiming
Ensure FTL is running before attempting to run functions/lines that require DNS resolution to be working
|
2022-11-09 18:03:53 +00:00 |
|
Adam Warner
|
f73c92d03b
|
rename _gravityonboot service/script to _postFTL and move updatecheck/version output to this script
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
|
2022-11-09 17:51:07 +00:00 |
|