Mirror/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-09-20 17:11:17 +08:00
Code Issues Projects Releases Wiki Activity
5,860 Commits 17 Branches 121 Tags
3c693c1da54b15869d7d612bdf20153234911073
Commit Graph

5860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian König
3c693c1da5 Apply suggestions from code review 
Co-authored-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-06 12:04:55 +02:00
Christian König
7bb0ca59d1 Remove traces of /run/pihole 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-05 14:54:09 +02:00
Christian König
587a2a1c04 # allow all users to enter der directories 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-04 23:52:53 +02:00
Christian König
c360743d41 Re-add file/folder permissions 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-04 21:12:40 +02:00
Christian König
a3ea2cd8c3 User pihole should be allowed to edit all its files 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-04 19:32:19 +02:00
Christian König
5ae0405446 Ensure pihole-FTL can write custom.list 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-08-03 20:46:01 +02:00
Adam Warner
eda83a4141 If ${USER} variable is blank, then populate it with whoami (#5341) 2023-07-18 09:12:25 +01:00
Adam Warner
03a1f4370a Merge development -> development-v6 (#5345) 2023-07-18 09:11:55 +01:00
Adam Warner
f270642d67 Merge branch 'development' into development-v6-merge-dev 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-18 08:15:40 +01:00
Adam Warner
6edd6a4d55 if ${USER} variable is blank, then populate it with whoami 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-18 08:11:48 +01:00
Adam Warner
aec852fa51 Update test dependencies (v6) (#5344) 2023-07-18 08:11:37 +01:00
Adam Warner
e42c692ec7 Drop docker-compose from requirements.txt, it's not used. This was the only thing preventing us from using pyyaml 6.0.1 which fixes issues we were seeing with tests not running (https://github.com/yaml/pyyaml/pull/702) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-18 08:04:33 +01:00
Adam Warner
ab2aea7bbf Bump tox from 4.6.2 to 4.6.4 in /test (#5339) 2023-07-16 22:52:26 +01:00
dependabot[bot]
8dd8f989ab Bump tox from 4.6.2 to 4.6.4 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.2 to 4.6.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.6.2...4.6.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-16 21:44:31 +00:00
Adam Warner
762256a71b Bump pytest from 7.3.2 to 7.4.0 in /test (#5340) 2023-07-16 22:43:43 +01:00
Adam Warner
78cd440a61 Bump actions/setup-python from 4.6.1 to 4.7.0 (#5338) 2023-07-16 22:42:53 +01:00
Adam Warner
30661fedcb Sync master back into development (#5337) 2023-07-16 22:36:32 +01:00
dependabot[bot]
a3955a7ebb Bump pytest from 7.3.2 to 7.4.0 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.2 to 7.4.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.3.2...7.4.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-16 21:36:15 +00:00
dependabot[bot]
e295997d51 Bump actions/setup-python from 4.6.1 to 4.7.0 
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4.6.1...v4.7.0)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-16 21:36:02 +00:00
Adam Warner
8495565a6f Update dependabot.yml (#5334) 2023-07-16 22:35:34 +01:00
Adam Warner
cefbfdf2a4 Bump actions/setup-python from 4.6.1 to 4.7.0 (#5336) 2023-07-16 22:24:01 +01:00
dependabot[bot]
91dabc574d Bump actions/setup-python from 4.6.1 to 4.7.0 
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4.6.1...v4.7.0)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-15 10:30:37 +00:00
Adam Warner
924de1d9ed Update dependabot.yml 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-11 23:51:28 +01:00
yubiuser
60a7c50120 Bump tox from 4.6.3 to 4.6.4 in /test (#5332) 2023-07-08 14:55:31 +02:00
dependabot[bot]
a01d31e25d Bump tox from 4.6.3 to 4.6.4 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.3 to 4.6.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.6.3...4.6.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-08 10:15:54 +00:00
DL6ER
2d4d9078c4 Add /var/log/pihole/webserver.log to the logrotate scripts (#5329) 2023-07-06 19:27:49 +02:00
DL6ER
64319fa96e Add /var/log/pihole/webserver.log to the logrotate scripts. While it may be empty for most, it can grow quickly if either API or TLS debugging is enabled (it can quickly reach several hundreds of MB per day when debugging TLS) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-07-05 22:11:56 +01:00
Adam Warner
047017dc6a Set new gravity database version to 16 (#5328) 2023-07-04 08:32:50 +01:00
Adam Warner
c557f29db2 Set new gravity database version to 16, which was missed in 5459daa 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-07-03 23:01:27 +01:00
yubiuser
1eb4ad8238 Bump pytest from 7.3.2 to 7.4.0 in /test (#5325) 2023-06-25 11:46:08 +02:00
dependabot[bot]
5490625d8d Bump pytest from 7.3.2 to 7.4.0 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.2 to 7.4.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.3.2...7.4.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-24 16:03:56 +00:00
yubiuser
5389ef1a70 Bump tox from 4.6.2 to 4.6.3 in /test (#5324) 2023-06-24 18:03:17 +02:00
dependabot[bot]
198ca65f7d Bump tox from 4.6.2 to 4.6.3 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.2 to 4.6.3.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.6.2...4.6.3)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-24 10:57:28 +00:00
Adam Warner
04c3f7a603 Development -> development-v6 (#5321) 2023-06-18 22:21:11 +01:00
Adam Warner
85d256d53c Switch to new branch name for FTL v6 development (#5319) 2023-06-18 22:17:39 +01:00
Adam Warner
ca66c1ea9c Switch to new branch name for FTL v6 development 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-18 22:05:18 +01:00
Adam Warner
0fa5c62450 Add code to remove old lighttpd config files left over from v5. (#5314) 2023-06-18 21:53:07 +01:00
Adam Warner
a3bb3872bf adlist table now contains 11 columns, not 10. 
Co-authored-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-18 21:10:12 +01:00
Adam Warner
d637d2a7a5 Simplify nested if statements. 
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-18 21:10:06 +01:00
Adam Warner
001f2012a2 Update automated install/basic-install.sh 
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
 2023-06-18 15:45:30 +01:00
Adam Warner
c39cb8cfe0 Escape the sed command for removing a line in fed/centos lighttpd.conf 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-18 15:45:30 +01:00
Adam Warner
d5013bfd6c Add code to remove old lighttpd config files left over from v5. Web config is all dealt with by FTL now 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2023-06-18 15:45:30 +01:00
yubiuser
7bc1126978 Bump tox from 4.6.0 to 4.6.2 in /test (#5317) 2023-06-17 19:46:04 +02:00
dependabot[bot]
7a66083e68 Bump tox from 4.6.0 to 4.6.2 in /test 
Bumps [tox](https://github.com/tox-dev/tox) from 4.6.0 to 4.6.2.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.6.0...4.6.2)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-17 11:35:38 +00:00
yubiuser
17fffa4e49 Bump pytest from 7.3.1 to 7.3.2 in /test (#5318) 2023-06-17 13:35:00 +02:00
dependabot[bot]
3fd7b4ee24 Bump pytest from 7.3.1 to 7.3.2 in /test 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.1 to 7.3.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.3.1...7.3.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-17 10:59:42 +00:00
DL6ER
5459daa03d Add abp_entries column (default 0) to the adlist table for newly created gravity databases. This updates the gravity database version to 16 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2023-06-15 09:36:17 +02:00
DL6ER
306df56203 Add tests for Debian 12 (#5312) 2023-06-11 08:46:59 +02:00
Christian König
117c15319d Add tests for Debian 12 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2023-06-10 23:03:43 +02:00
yubiuser
b8419ba3c5 Bump tox from 4.5.2 to 4.6.0 in /test (#5311) 2023-06-10 14:14:59 +02:00