Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-23 06:33:44 +00:00
Code Issues Projects Releases Packages Wiki Activity
5482 commits 8 branches 109 tags 27 MiB
Commit graph

5482 commits

This branch
This branch
All branches
Author SHA1 Message Date
Adam Warner
82695aba7d update LOG_DIRECTORY variable in debug script 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-05-15 07:09:27 +02:00
Adam Warner
36dd533ef3 use directory /var/log/pihole/ for log storage 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-05-15 06:46:23 +02:00
Dan Schaper
2735481da8
Logo for light and dark modes. (#4735) 
* Logo for light and dark modes.
 2022-05-14 14:25:57 -07:00
dependabot[bot]
edec1220fc
Bump github/codeql-action from 1 to 2 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-12 07:24:06 +00:00
dependabot[bot]
c5b3f6c27a
Bump actions/stale from 4 to 5 
Bumps [actions/stale](https://github.com/actions/stale) from 4 to 5.
- [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/v4...v5)

---
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-05-12 07:24:01 +00:00
dependabot[bot]
1d033ef441
Bump actions/checkout from 2 to 3 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-12 07:23:57 +00:00
Dan Schaper
83ac2c5005
Merge pull request #4729 from pi-hole/fix/dependabot_action_yaml 
Typo fix on dependabot yaml.
 2022-05-12 00:23:29 -07:00
yubiuser
0decc1252b
Respect user configurable path for pid and port file in pihole-FTL.service (#4680) 
* Use pid file in pihole-FTL.service

Signed-off-by: Christian König <ckoenig@posteo.de>
Co-authored-by: MichaIng <micha@dietpi.com>
 2022-05-11 16:03:44 -07:00
Dan Schaper
f2e1cc9dae
Typo fix on dependabot yaml. 2022-05-11 12:28:32 -07:00
Omoeba
f7c800863e
Remove DHCPv6, use leasetime from interface (#4507) 
Signed-off-by: Omoeba <38597972+Omoeba@users.noreply.github.com>
 2022-05-11 11:57:42 -07:00
yubiuser
6d73454942
Merge pull request #4718 from sed-i/patch-1 
Add example for custom DNS server with port number
 2022-05-09 17:24:26 +02:00
yubiuser
2e2a3aa048
Add port info to explanation text 2022-05-09 17:14:16 +02:00
Leon
e23e291dd4
Merge branch 'development' into patch-1 2022-04-25 19:47:01 -04:00
Leon
6a0c6c4a9b Add example for custom DNS server with port number 
Signed-off-by: sed-i <82407168+sed-i@users.noreply.github.com>
 2022-04-25 19:00:01 -04:00
yubiuser
94cb0d0a7e
Merge pull request #4709 from pi-hole/follow-my-own-rules 
[Housekeeping] Remove alphabetical rule from utils.sh
 2022-04-21 21:07:08 +02:00
Adam Warner
d78c689e55
no more alphabetical order 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-21 19:56:21 +01:00
Adam Warner
3915efbfd5
Merge pull request #4706 from pi-hole/master 
sync: master to development
 2022-04-20 19:43:29 +01:00
Adam Warner
853f6b7da2
Merge pull request #4705 from pi-hole/development 
v5.10 Release
 2022-04-20 19:41:17 +01:00
Adam Warner
73aa43611f
Merge pull request #4700 from spmfox/4697-centos8-container-ftl-arch 
Changed ldd binary check for better compatibility
 2022-04-20 19:27:45 +01:00
Dan Schaper
c19788dd18
Mock which sh to reutrn /bin/sh. 
Check for `/bin/sh` library

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-20 11:22:58 -07:00
Dan Schaper
71072b4beb
Stickler quoting 2022-04-20 10:21:24 -07:00
yubiuser
c9383eab99
Merge pull request #4704 from jpgpi250/remove_trailing_periods 
Update gravity.sh
 2022-04-20 17:35:24 +02:00
Peter Russell
052a1f294e
Update gravity.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
 2022-04-20 10:44:05 +02:00
Peter Russell
325f20d5c2
Update gravity.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
 2022-04-20 10:43:56 +02:00
Peter Russell
1c28da7bbd
Update gravity.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
 2022-04-20 10:43:39 +02:00
jpgpi250
aba5e884eb Update gravity.sh 
Signed-off-by: jpgpi250 <jpgpi250@gmail.com>
 2022-04-20 10:19:44 +02:00
Adam Warner
9ac5690a7d
Merge pull request #4698 from pi-hole/fix-utils-redux 
[utils.sh] Split `addOrEditKeyValuePair` to do `addKey` in a separate function
 2022-04-19 19:00:06 +01:00
Adam Warner
8de814ab34
Split the tests, too. Enhance the descriptions 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-19 18:35:56 +01:00
yubiuser
7929a6c133
Merge pull request #4694 from MichaIng/patch-1 
Do not pass whole environment for PIHOLE_SKIP_OS_CHECK=true
 2022-04-19 19:34:22 +02:00
spmfox
9840148ba9
Update automated install/basic-install.sh 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-17 14:52:05 -04:00
Adam Warner
7e223a2a10
Merge pull request #4699 from turrisxyz/setup-permissions 
Set permissions for GitHub actions
 2022-04-17 13:43:35 +01:00
Adam Warner
c9e76c978e
Update advanced/Scripts/webpage.sh 
Co-authored-by: yubiuser <ckoenig@posteo.de>
 2022-04-17 13:39:55 +01:00
spmfox
2601162243 Changed ldd binary check from /bin/ls to /usr/bin/bash 
Signed-off-by: spmfox <spmfox@foxwd.com>
 2022-04-16 16:46:07 -04:00
naveensrinivasan
37cef84643
Set permissions for GitHub actions 
- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

 Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com>
 2022-04-15 21:26:56 -05:00
Adam Warner
23e6fa1ec5
Replace wrapper function calls with direct utils.sh calls. Leave warpper functions until next release as docker currently uses them, and new changes to utils.sh need to be in the master branch before docker can use them 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-15 09:50:40 +01:00
Adam Warner
db116971ce
I tried to do too many things in one function, vastly overcomplicating what should have been _this_ all along 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-14 22:53:38 +01:00
MichaIng
2b124b1c69
Do not pass whole environment for PIHOLE_SKIP_OS_CHECK=true 
With `sudo -E`, the whole environment is passed to the root shell, which is a potential security and/or privacy issue when command overrides/functions, PATH or private user info are passed. To pass `PIHOLE_SKIP_OS_CHECK=true`, it can be passed alone to the bash/script call within the sudo session, so the `-E` flag can be omitted.

Signed-off-by: MichaIng <micha@dietpi.com>
 2022-04-13 21:30:12 +02:00
yubiuser
9356d7bbb1
Remove unnecessary case in uninstall script (#4692) 
* Remove unnecessary case in uninstall script

* Better answer

Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-12 11:36:49 -07:00
Adam Warner
29a867d5ae
Merge pull request #4690 from pi-hole/utils-sourcing 
Prevent issues cause by declaring `utilsfile` as `readonly`
 2022-04-12 19:17:37 +01:00
Adam Warner
86dd612882
remove readonly directive from declaration of utilsfile, it is unnecassery 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-12 17:13:50 +01:00
yubiuser
42d3368955
Merge pull request #4663 from pi-hole/no_root 
Only use sudo power if needed
 2022-04-10 12:34:05 +02:00
yubiuser
21ae81ffdb
Merge pull request #4682 from pi-hole/loop 
Exit installer if dpkg lock is held for more then 30 seconds
 2022-04-07 15:26:27 +02:00
yubiuser
b33434d02a
Let uses know how long they need to wait (max) 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-07 09:11:53 +02:00
yubiuser
d3e94cbceb
Merge pull request #4653 from pi-hole/refactor-utils-redux 
Tweaks to functions in utils.sh and refactored usages in webpage.sh
 2022-04-04 23:25:54 +02:00
yubiuser
9b4f6c84cd
Minor review comments 2022-04-04 23:14:10 +02:00
Adam Warner
4d31d5ee11
Address review comments 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-04 22:02:26 +01:00
Adam Warner
9878477896
Merge pull request #4681 from pi-hole/adlist 
Rename block lists to adlists within the query list functions
 2022-04-04 16:42:43 +01:00
Christian König
c0a2ab7b77
Fix indention 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-04 16:59:13 +02:00
Christian König
30ba79f6a0
Let users know what's going on 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-04 16:48:34 +02:00
Christian König
cd3c97f113
Exit installer if dpkg lock is held for more then 30 seconds 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-04 16:38:30 +02:00