Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1411 commits
Select commit Hold shift + click to select a range
b49db58
Fix spelling mistakes
yubiuser Jul 8, 2022
3d8672b
Clean consecutive mkdir
yubiuser Jul 8, 2022
7d5f6c8
Merge pull request #4804 from pi-hole/mkdir
yubiuser Jul 8, 2022
6aaa446
Merge pull request #4802 from pi-hole/codespell
yubiuser Jul 8, 2022
8e4adb6
Merge pull request #4788 from pi-hole/SKIP_INSTALL
yubiuser Jul 8, 2022
e4444ae
fixes "Set static IP using custom values results in error" (#4807)
PromoFaux Jul 9, 2022
e0baf4c
Merge pull request #4808 from pi-hole/cure/cancer
PromoFaux Jul 9, 2022
ecfb96d
If old log paths exist in logrotate file, replace them with new ones
PromoFaux Jul 10, 2022
59dab6a
Simplifications per @yubiuser's suggestion
PromoFaux Jul 10, 2022
d6c48f8
Merge pull request #4810 from pi-hole/tweak/logrotate
yubiuser Jul 10, 2022
b258053
Print all SELINUX output in lowercase
yubiuser Jul 10, 2022
9f91897
Adjust tests
yubiuser Jul 10, 2022
1313549
Merge pull request #4811 from pi-hole/CAPS
PromoFaux Jul 10, 2022
aefbe1f
Merge pull request #4812 from pi-hole/development
PromoFaux Jul 10, 2022
3dd26b5
Merge pull request #4813 from pi-hole/master
PromoFaux Jul 10, 2022
b486786
Add database healthy checks to debug script
yubiuser May 29, 2022
71d310c
Merge pull request #4745 from pi-hole/tweak/debug
yubiuser Jul 10, 2022
c4f9a47
Debug log - add spinner for long processes
rdwebdesign Jul 11, 2022
cbcd126
Adding the spinner for foreign_key_check too
rdwebdesign Jul 11, 2022
4567f26
Fix errors in README.md
Rauf00 Jul 11, 2022
64d75c0
Merge pull request #4815 from pi-hole/debug_spinner
yubiuser Jul 11, 2022
3a22657
Update README.md
Rauf00 Jul 11, 2022
7ab9664
Update README.md
Rauf00 Jul 11, 2022
c90d828
Update README.md
Rauf00 Jul 12, 2022
a3f1317
Don't fail if Alma or Rocky is detected
yubiuser Jul 15, 2022
bc8fcc7
Fix shellcheck warnings
yubiuser Jul 15, 2022
b025cfe
Merge pull request #4825 from pi-hole/shellcheck_install
yubiuser Jul 16, 2022
c7108a6
Merge pull request #4824 from pi-hole/Alam_Rocky
yubiuser Jul 16, 2022
8d1f286
Only execute spinner function if there is a tty
rdwebdesign Jul 24, 2022
d897203
Address revision requests:
rdwebdesign Jul 24, 2022
2bd3366
Disable fail fast, allowing tests to run despite failures on a partic…
PromoFaux Jul 25, 2022
21af75a
Ubuntu 21 tests are failing entirely. apt-update does not work on an …
PromoFaux Jul 25, 2022
a7a467a
Merge pull request #4837 from pi-hole/dont-fail-fast
PromoFaux Jul 25, 2022
27ef7e5
Merge branch 'development' into fix/spinner
yubiuser Jul 26, 2022
f59749b
Merge pull request #4834 from pi-hole/fix/spinner
yubiuser Jul 26, 2022
6446551
prefers-color-scheme for logo
yubiuser Jul 26, 2022
7b77d99
Move FTL port and PID functions to utils.sh
yubiuser Jul 26, 2022
2651abb
Add tests
yubiuser Jul 26, 2022
c8c4eb5
Add getFTLPID() tests
yubiuser Jul 26, 2022
ab6b37b
Fix stickler and codefactor complaints
yubiuser Jul 26, 2022
14e1eea
Fix spaces in dialog msg
yubiuser Jul 24, 2022
d5c798d
Apply reviewers suggestion
yubiuser Jul 24, 2022
8c778c1
Move linebreaks
yubiuser Jul 26, 2022
cca5c49
Merge pull request #4838 from pi-hole/tweak/readme_logo
yubiuser Jul 26, 2022
aeb9241
Merge pull request #4832 from pi-hole/fix/msg
yubiuser Jul 26, 2022
68eddd2
Add OS_CHECK_DEPS to uninstall script
yubiuser Jul 29, 2022
567a915
Remove unused and outdated files and scripts
yubiuser Jul 29, 2022
2610739
Indent installation/update complete message
yubiuser Jul 29, 2022
b3ba17b
Merge pull request #4846 from pi-hole/uninstall
yubiuser Jul 29, 2022
a45c9f9
Merge pull request #4848 from pi-hole/indent_update
yubiuser Jul 30, 2022
e29aa4e
First things first...
PromoFaux Jul 19, 2022
9c03915
Remove special Centos7 hand holds. Move the unsupported dialog out to…
PromoFaux Jul 19, 2022
b613758
rename select_rpm_php and simplify it to remove code no longer needed…
PromoFaux Jul 30, 2022
fc2a564
remove tests no longer needed
PromoFaux Jul 30, 2022
2c38de2
Merge pull request #4847 from pi-hole/remove/unused_files
yubiuser Jul 30, 2022
313c0dd
Update automated install/basic-install.sh
PromoFaux Jul 30, 2022
0e8c1ec
Flip logic on epel check - if _not_ fedora, then (try to, depending o…
PromoFaux Jul 30, 2022
9028898
Move code from `check_epel_repo_required` into the rpm branch of the …
PromoFaux Jul 30, 2022
aa0a9e2
Merge pull request #4839 from pi-hole/move_getFTLPIDFile
yubiuser Jul 30, 2022
99b7f99
Explicite set minor and patch version on used actions
yubiuser Jul 24, 2022
8f3e6f1
CodeQl does not use .minor.patch version
yubiuser Jul 24, 2022
a3ac1ca
Update actions to latest versions
yubiuser Jul 25, 2022
c6da627
Move release version check inside the else block
PromoFaux Jul 31, 2022
71bc237
Merge pull request #4828 from pi-hole/centos7-can-do-one
PromoFaux Jul 31, 2022
21158cb
Merge pull request #4833 from pi-hole/workflow_versions
PromoFaux Aug 1, 2022
6c7a28a
Dont use bash keywords/programs as variable names
PromoFaux Aug 1, 2022
64dc002
Same per @rdwebdesign suggestion.
PromoFaux Aug 1, 2022
0b81dd3
type -> list_type per @yubiuser suggestion
PromoFaux Aug 1, 2022
3cdaad0
Merge pull request #4851 from pi-hole/keywords
yubiuser Aug 1, 2022
3327df8
Ensure user defined FTL_PID_FILE and FTL_PORT_FILE dirs are created o…
yubiuser Aug 4, 2022
4a58928
Merge pull request #4855 from pi-hole/fix/dir_not_exist
yubiuser Aug 4, 2022
989c52e
Exit with return code if ftl does not start
dschaper Aug 5, 2022
6062df0
Bump actions/stale from 5.1.0 to 5.1.1
dependabot[bot] Aug 6, 2022
e50438d
Bump actions/setup-python from 4.1.0 to 4.2.0
dependabot[bot] Aug 6, 2022
f2641fb
Merge pull request #4861 from pi-hole/dependabot/github_actions/devel…
PromoFaux Aug 6, 2022
aef3d89
Merge pull request #4860 from pi-hole/dependabot/github_actions/devel…
PromoFaux Aug 6, 2022
9e2e001
Bump actions-ecosystem/action-add-labels from 1.1.0 to 1.1.3
dependabot[bot] Aug 6, 2022
a351647
Merge pull request #4859 from pi-hole/dependabot/github_actions/devel…
PromoFaux Aug 6, 2022
f418481
Add security-related headers to Pi-hole web interface
DL6ER Aug 6, 2022
7320c10
Fix git indention
yubiuser Aug 6, 2022
20c561c
Merge pull request #4857 from pi-hole/4856-init-script-ftl
dschaper Aug 6, 2022
c7410b0
Always indent
yubiuser Aug 7, 2022
d38fcb0
Merge pull request #4863 from pi-hole/fix/git_indention
yubiuser Aug 7, 2022
d776773
Extend FTL information in debug log
yubiuser Aug 8, 2022
c78cf82
no need to declare $viewPort
PromoFaux Oct 5, 2021
5d5a85b
X-Pi-hole removed from blocking page...
PromoFaux Oct 5, 2021
5816f49
Fix test_installPiholeWeb_fresh_install_no_errors and test_installPih…
PromoFaux Jul 26, 2022
6c9bd7a
Remove blockingpage.css
yubiuser Jul 26, 2022
b98e331
Only do one curl call in debug when checking the X-Header
yubiuser Jul 26, 2022
27fa284
Fix missing PI_HOLE_BLOCKPAGE_DIR
yubiuser Jul 26, 2022
e668380
Use absolut asset paths
yubiuser Jul 27, 2022
49a9f6f
Reproduce blockpage.css for $splashPage
yubiuser Jul 27, 2022
c67f313
Apply reviewers suggestion for inline CSS
yubiuser Jul 29, 2022
97447b2
Do not remove blockingpage.css from existing installations as some us…
yubiuser Jul 26, 2022
e35a9da
Remove the blockpage-focussed customisations to query.sh
PromoFaux Aug 8, 2022
a0419bc
Merge pull request #4864 from pi-hole/debug_FTL_branch
yubiuser Aug 8, 2022
b3c8045
Skip web server dialog if --disable-install-webserver has been passed
MichaIng Jul 28, 2022
114f562
Merge branch 'development' into removeblockpagefunctionality
PromoFaux Aug 17, 2022
5a98fa1
Merge pull request #4843 from MichaIng/patch-1
yubiuser Aug 17, 2022
37102e5
Merge branch 'development' into removeblockpagefunctionality
yubiuser Aug 17, 2022
9ab5668
Merge pull request #3910 from pi-hole/removeblockpagefunctionality
PromoFaux Aug 17, 2022
8c4a9aa
Remove the email function
yubiuser Aug 17, 2022
4cf3280
Merge pull request #4862 from pi-hole/tweak/lighttpd_headers
yubiuser Aug 18, 2022
eeccfb2
Remove it also from index.php together with more unused variables
yubiuser Aug 20, 2022
5421aad
Store versions as key/value pairs rather than space delimeted values
PromoFaux Aug 22, 2022
a4b899c
Review suggestions (and shellcheck complaints)
PromoFaux Aug 23, 2022
597c045
Merge pull request #4875 from pi-hole/tweak/version-file
PromoFaux Aug 23, 2022
66eeee5
Remove the email function (#4870)
yubiuser Aug 24, 2022
9b5ea13
Use utils.sh in install script
yubiuser Aug 18, 2022
1335c44
Add jq to dependencies
yubiuser Aug 24, 2022
49b9dc8
Remove json_extract function
yubiuser Aug 24, 2022
d6cfa57
Add jq as dependency and remove json_extract (#4878)
yubiuser Aug 26, 2022
53c0982
Set connection timeout for curl
yubiuser Aug 30, 2022
230d6a4
Semi hardcode the connection_timeout value
yubiuser Aug 31, 2022
f998eee
Release 5.12 (#4889)
PromoFaux Sep 2, 2022
46e1a87
Tweak FTL test to ensure we don't get false positives on incompatible…
PromoFaux Sep 3, 2022
0f74165
Drop Ubuntu 18 tests
PromoFaux Sep 3, 2022
711035f
Update FTL Binary test to ensure we catch incompatibility issues earl…
yubiuser Sep 3, 2022
5d913ad
Release 5.12 (#4889) (#4897)
PromoFaux Sep 5, 2022
89b8841
Fix 4898
yubiuser Sep 6, 2022
ef45578
Fix 4898 (#4899)
yubiuser Sep 6, 2022
fe8b0e9
v5.12.1 (#4908)
PromoFaux Sep 14, 2022
8dbe6fc
master-> Dev (#4912)
PromoFaux Sep 14, 2022
bf256aa
If docker version env var is set, store it in /etc/pihole/versions fi…
PromoFaux Sep 14, 2022
760325e
Update piholeDebug to source versions file for DOCKER_VERSION instead…
PromoFaux Sep 14, 2022
c1a927f
Run test workflows on python 3.10
yubiuser Sep 15, 2022
8bc5b16
Set tox envlist to py3
yubiuser Sep 15, 2022
3d53bda
Update advanced/Scripts/updatecheck.sh
PromoFaux Sep 15, 2022
515e5f8
Store docker version in versions file (If `PIHOLE_DOCKER_TAG` variabl…
PromoFaux Sep 15, 2022
5cc317d
Change texts after Block Page removal
rdwebdesign Sep 16, 2022
80c7703
Fixing texts forgotten after Blocking Page removal (#4915)
yubiuser Sep 16, 2022
7e6f81f
Add comment in lighttpd.conf how to change the server port
yubiuser Sep 17, 2022
5fe1706
Bump actions/stale from 5.1.1 to 5.2.0
dependabot[bot] Sep 17, 2022
16640ee
Bump actions/stale from 5.1.1 to 5.2.0 (#4918)
yubiuser Sep 17, 2022
5332b31
Add comment in lighttpd.conf how to change the server port (#4917)
yubiuser Sep 17, 2022
7eff36b
Update workflow python to 3.10 and allow any python3 version in tests…
yubiuser Sep 17, 2022
2ff1fa1
Merge branch 'development' into use_utils
yubiuser Sep 17, 2022
f90fb8b
Change wording in chronometer
yubiuser Sep 14, 2022
00e51f3
Blcked => Block
yubiuser Sep 17, 2022
40f00c6
Fix gravity database integrity check
yubiuser Sep 18, 2022
2c3fea3
Remove FAQ_ULA as it is unused in `core`
yubiuser Sep 18, 2022
60c35cb
Remove unused check_database_integrity()
yubiuser Sep 18, 2022
d581401
Fix gravity database integrity check (#4921)
yubiuser Sep 18, 2022
d88629e
v5.12.2 (#4922)
PromoFaux Sep 19, 2022
da6596e
Master -> Dev (#4925)
PromoFaux Sep 19, 2022
73ca4eb
Update test requirements
yubiuser Sep 19, 2022
0932c5c
Add black python code formatter action
yubiuser Sep 19, 2022
0df38cd
Format all /test files with black
yubiuser Sep 19, 2022
17ec88d
Remove `installed_binary` variable which was leftover from https://gi…
yubiuser Sep 19, 2022
b6d1bd7
Read docker tag from file in root, not the previously set environment…
PromoFaux Sep 19, 2022
d4ce5b1
Fix tabs in dialog boxes
yubiuser Sep 22, 2022
4f4dfe3
Fix tabs in dialog boxes (#4932)
yubiuser Sep 22, 2022
bb57a9e
Handle more than one default gateway in debug script
yubiuser Sep 22, 2022
ba8a50c
Bump actions/stale from 5.2.0 to 6.0.0
dependabot[bot] Sep 24, 2022
54bcf56
Bump actions/stale from 5.2.0 to 6.0.0 (#4938)
PromoFaux Sep 24, 2022
9463c3c
Change wording in chronometer (#4910)
PromoFaux Sep 24, 2022
1c1407e
Use utils.sh in install script (#4872)
PromoFaux Sep 24, 2022
755ec8b
$$ != $
PromoFaux Sep 24, 2022
951b4ed
Remove cronjob that checks local versions every 10 minutes - only che…
jpgpi250 Sep 24, 2022
0a780a9
Fix issue in #4872 missed in review (#4940)
PromoFaux Sep 24, 2022
a8ce135
Set connection timeout for curl (#4884)
dschaper Sep 25, 2022
9debd22
If, after reading /pihole.docker.tag into DOCKER_TAG, it does not mat…
PromoFaux Sep 25, 2022
bf5fffa
Better wording and test with color
yubiuser Sep 25, 2022
22ebf21
Use POSIX
yubiuser Sep 25, 2022
37b45d4
Read docker tag from file in root, not the previously set environment…
dschaper Sep 25, 2022
f8a1291
Handle more than one default gateway in debug script (#4934)
dschaper Sep 25, 2022
e1a2591
Format test.yml
yubiuser Sep 26, 2022
1b0b0ca
Update python tests and add black code formatter action (#4926)
PromoFaux Sep 26, 2022
3d01e4d
No detour - use pihole-FTL.conf to get the API port number
yubiuser Sep 21, 2022
25ba681
Remove last traces
yubiuser Sep 25, 2022
276c480
Return default port if non-numeric characters are set in pihole-FTL.c…
yubiuser Sep 26, 2022
a705fbc
Add Fedora 35 and 36 to the test suite
yubiuser Sep 29, 2022
d48c557
Fix Deepsource warning message for index.php file
rdwebdesign Sep 30, 2022
0749de3
Update Amazon support URL to HTTPS in README
davidjb Sep 30, 2022
6057b13
Add initscripts to Fedora 35 and 36 dockerfile
yubiuser Oct 1, 2022
3731b65
Remoce Fedora 34 from tests
yubiuser Oct 1, 2022
7fd062c
Update Amazon support URL to HTTPS in README (#4954)
PromoFaux Oct 1, 2022
9dd51b7
Remove pihole-FTL.port file (#4945)
PromoFaux Oct 1, 2022
71b5606
Add Fedora 35 and 36, remove 34 to/from the test suite (#4952)
dschaper Oct 1, 2022
34b6600
`leasetime` (local) should have an `h` after it to signify 24h lease,…
PromoFaux Oct 1, 2022
b7b5ffa
remove old code per review from @yubiuser and @dschaper
PromoFaux Oct 1, 2022
77f0012
Fix default DHCPv4 leasetime value (#4956)
PromoFaux Oct 1, 2022
997a771
Fix Deepsource.io warning message for index.php file (#4953)
PromoFaux Oct 1, 2022
56527e5
Add get_remote_version() to updatechecker
yubiuser Oct 5, 2022
18d2853
Update local and remote versions at the same time
yubiuser Oct 6, 2022
888e44e
Add hash functions to updatecheck
yubiuser Oct 6, 2022
d7f7ef9
Only create VERSION_FILE if it does not exist
yubiuser Oct 6, 2022
2dc599f
Simplify version.sh
yubiuser Oct 6, 2022
a478f24
POSIX
yubiuser Oct 6, 2022
79c0b44
Set missing data to N/A
yubiuser Oct 6, 2022
9471c69
Fix spelling
yubiuser Oct 6, 2022
4265bcb
Add initscripts to CentOS8 dockerfile
yubiuser Oct 8, 2022
fae1d13
Add initscripts to CentOS8 dockerfile (#4966)
PromoFaux Oct 9, 2022
cf467db
Bump actions/stale from 6.0.0 to 6.0.1
dependabot[bot] Oct 9, 2022
223ef72
Bump actions/checkout from 3.0.2 to 3.1.0
dependabot[bot] Oct 9, 2022
4f3debc
Bump actions/checkout from 3.0.2 to 3.1.0 (#4964)
PromoFaux Oct 9, 2022
4698671
Bump actions/stale from 6.0.0 to 6.0.1 (#4963)
PromoFaux Oct 9, 2022
c5b3b8d
Fix `pihole -r` dialog exit
rdwebdesign Oct 8, 2022
fed58f0
Fix `pihole -r` dialog exit (#4965)
dschaper Oct 10, 2022
17779ba
Pi-hole v5.13 (#4960)
PromoFaux Oct 10, 2022
9c51050
basic-install.sh: Use `grep -E` instead of `egrep`
a1346054 Sep 13, 2022
e3db5fc
basic-install.sh: Use `command -v` instead of `which`
a1346054 Sep 13, 2022
e5695f8
test_any_automated_install.py: Use `command -v` instead of `which`
a1346054 Oct 11, 2022
89c0706
master -> dev (#4970)
PromoFaux Oct 12, 2022
5c090d2
Fix ldd sh mock in tests
MichaIng Oct 11, 2022
4c0a94d
Don't rely on pihole -v output but query github to get the lastest ve…
yubiuser Oct 13, 2022
5c61f6c
Remove checkout hint
yubiuser Oct 14, 2022
d85982d
Use versions file instead of github api to get latest version
yubiuser Oct 14, 2022
c84be5d
Reorganize by component rather then source
yubiuser Oct 14, 2022
5228347
Run pihole updatechecker if versions file is not found
yubiuser Oct 14, 2022
d737948
Add `versions` file to the REQUIRED_FILES list
rdwebdesign Oct 14, 2022
235673d
Remove unused possibility to obfuscate pihole.log
yubiuser Oct 13, 2022
4c94011
Remove check for latest version
yubiuser Oct 15, 2022
429510e
Update README.md
PromoFaux Oct 15, 2022
bc471cb
Fix errors in README.md (#4818)
PromoFaux Oct 15, 2022
0cf59cf
Bump actions/setup-python from 4.2.0 to 4.3.0
PromoFaux Oct 15, 2022
e773e33
Bump actions/setup-python from 4.2.0 to 4.3.0 (#4980)
PromoFaux Oct 15, 2022
bc6fb0c
sync: master to development (#4981)
PromoFaux Oct 15, 2022
8b98fd0
Remove unused old code
rdwebdesign Oct 16, 2022
528abc9
Adding CentOS Stream 9 tests
rdwebdesign Oct 16, 2022
85ffbcf
Allow replacing conflicting existing packages from testing image
rdwebdesign Oct 17, 2022
090727b
Remove unnecessary return
rdwebdesign Oct 17, 2022
469a267
Adding CentOS Stream 9 tests (#4984)
PromoFaux Oct 19, 2022
21be1bd
Prevent CNAME loop
yubiuser Oct 20, 2022
c322458
Escape dots in local DNS records/CNAMES before removing them
yubiuser Oct 21, 2022
df3e9e5
Disable shellcheck as it suggests a bashism
yubiuser Oct 21, 2022
128a3ab
Go POSIX
yubiuser Oct 22, 2022
c3e8d76
Escape dots in local DNS records/CNAMES before removing them (#4990)
dschaper Oct 24, 2022
7957acf
Remove unused old code from gravity.sh (#4985)
DL6ER Oct 28, 2022
e0c351f
Remove unused possibility to obfuscate pihole.log in debug log (#4974)
DL6ER Oct 28, 2022
f1b15f7
Remove check for latest component version in debug log (#4973)
dschaper Oct 29, 2022
c8c6533
Add small explanation.
yubiuser Oct 29, 2022
01bf9ca
Prevent CNAME loop (#4988)
yubiuser Oct 29, 2022
06cf7af
Fix static IP not set
DarkR0ast Oct 29, 2022
871067a
Fix static IP not set if IP is already present in any way inside dhcp…
dschaper Oct 31, 2022
3491dbf
Check `versions` file on the debug log (#4977)
dschaper Oct 31, 2022
122bc6b
Fix static IP not set because of in-line comment
DarkR0ast Nov 2, 2022
f91606b
Fix static IP not set because of in-line comment in dhcpcd.conf (#4998)
dschaper Nov 2, 2022
2fd5b94
Touch setupVars before writing to it
yubiuser Nov 3, 2022
64e61aa
Simplify versions.sh (#4959)
PromoFaux Nov 9, 2022
67385b7
Touch files before addKey or addOrEditKeyValPair
yubiuser Nov 9, 2022
a8b6eb9
Touch files before addKey or addOrEditKeyValPair (#4999)
PromoFaux Nov 9, 2022
7536c31
Correctly identify process status in debug script on docker
yubiuser Nov 13, 2022
6b8ba3c
Replace deprecated shell commands (#4907)
PromoFaux Nov 14, 2022
ddaa1bf
Correctly identify process status in debug script on docker (#5011)
PromoFaux Nov 14, 2022
3c86af0
Pi-hole core v5.14 (#5012)
PromoFaux Nov 14, 2022
ca04c13
sync: master to development (#5013)
PromoFaux Nov 14, 2022
cdbe4c9
Get only the precise tag number when getting local version, do not sh…
PromoFaux Nov 14, 2022
ba74051
Grab local FTL hash correctly from FTL's own version output, and grab…
PromoFaux Nov 14, 2022
21026d9
Fix odd behaviour introduced into new version checking script (#5016)
PromoFaux Nov 14, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
doubleclick
wan
nwe
28 changes: 5 additions & 23 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# EditorConfig is awesome: http://EditorConfig.org
# EditorConfig is awesome: https://editorconfig.org/

# top-most EditorConfig file
root = true
Expand All @@ -13,26 +13,8 @@ tab_width = 4
charset = utf-8
trim_trailing_whitespace = true

# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,py}]
charset = utf-8

# 4 space indentation
[*.py]
indent_style = space
indent_size = 4

# Tab indentation (no size specified)
[Makefile]
indent_style = tab
[*.yml]
tab_width = 2

# Indentation override for all JS under lib directory
[scripts/**.js]
indent_style = space
indent_size = 2

# Matches the exact files either package.json or .travis.yml
[{package.json,.travis.yml}]
indent_style = space
indent_size = 2
[*.md]
tab_width = 2
4 changes: 0 additions & 4 deletions .github/FUNDING.yml

This file was deleted.

37 changes: 0 additions & 37 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

31 changes: 0 additions & 31 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
day: saturday
time: "10:00"
open-pull-requests-limit: 10
target-branch: development
reviewers:
- "pi-hole/core-maintainers"
7 changes: 7 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
changelog:
exclude:
labels:
- internal
authors:
- dependabot
- github-actions
40 changes: 40 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: "CodeQL"

on:
push:
branches:
- master
- development
pull_request:
branches:
- master
- development
schedule:
- cron: '32 11 * * 6'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

permissions:
actions: read
contents: read
security-events: write

steps:
-
name: Checkout repository
uses: actions/[email protected]
# Initializes the CodeQL tools for scanning.
-
name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: 'python'
-
name: Autobuild
uses: github/codeql-action/autobuild@v2
-
name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
26 changes: 26 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Mark stale issues

on:
schedule:
- cron: '0 8 * * *'
workflow_dispatch:

jobs:
stale:

runs-on: ubuntu-latest
permissions:
issues: write

steps:
- uses: actions/[email protected]
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 30
days-before-close: 5
stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Please comment or update this issue or it will be closed in 5 days.'
stale-issue-label: 'stale'
exempt-issue-labels: 'Internal, Fixed in next release, Bug: Confirmed, Documentation Needed'
exempt-all-issue-assignees: true
operations-per-run: 300
close-issue-reason: 'not_planned'
27 changes: 27 additions & 0 deletions .github/workflows/sync-back-to-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Sync Back to Development

on:
push:
branches:
- master

jobs:
sync-branches:
runs-on: ubuntu-latest
name: Syncing branches
steps:
- name: Checkout
uses: actions/[email protected]
- name: Opening pull request
id: pull
uses: tretuna/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FROM_BRANCH: 'master'
TO_BRANCH: 'development'
- name: Label the pull request to ignore for release note generation
uses: actions-ecosystem/[email protected]
with:
labels: internal
repo: ${{ github.repository }}
number: ${{ steps.pull.outputs.PULL_REQUEST_NUMBER }}
76 changes: 76 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: Test Supported Distributions

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

permissions:
contents: read

jobs:
smoke-tests:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/[email protected]

- name: Check scripts in repository are executable
run: |
IFS=$'\n';
for f in $(find . -name '*.sh'); do if [[ ! -x $f ]]; then echo "$f is not executable" && FAIL=1; fi ;done
unset IFS;
# If FAIL is 1 then we fail.
[[ $FAIL == 1 ]] && exit 1 || echo "Scripts are executable!"

- name: Spell-Checking
uses: codespell-project/actions-codespell@master
with:
ignore_words_file: .codespellignore

- name: Get editorconfig-checker
uses: editorconfig-checker/action-editorconfig-checker@main # tag v1.0.0 is really out of date

- name: Run editorconfig-checker
run: editorconfig-checker

- name: Check python code formatting with black
uses: psf/black@stable
with:
src: "./test"
options: "--check --diff --color"

distro-test:
if: github.event.pull_request.draft == false
runs-on: ubuntu-latest
needs: smoke-tests
strategy:
fail-fast: false
matrix:
distro:
[
debian_10,
debian_11,
ubuntu_20,
ubuntu_22,
centos_8,
centos_9,
fedora_35,
fedora_36,
]
env:
DISTRO: ${{matrix.distro}}
steps:
- name: Checkout repository
uses: actions/[email protected]

- name: Set up Python 3.10
uses: actions/[email protected]
with:
python-version: "3.10"

- name: Install dependencies
run: pip install -r test/requirements.txt

- name: Test with tox
run: tox -c test/tox.${DISTRO}.ini
68 changes: 2 additions & 66 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,70 +7,6 @@ __pycache__
.tox
.eggs
*.egg-info


# Created by https://www.gitignore.io/api/jetbrains+iml

### JetBrains+iml ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# All idea files, with execptions
.idea
!.idea/codeStyles/*
!.idea/codeStyleSettings.xml


# Sensitive or high-churn files:
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml

# Gradle:
.idea/**/gradle.xml
.idea/**/libraries

# CMake
cmake-build-debug/

# Mongo Explorer plugin:
.idea/**/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Ruby plugin and RubyMine
/.rakeTasks

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### JetBrains+iml Patch ###
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023

.idea/
*.iml
.idea/misc.xml
*.ipr

# End of https://www.gitignore.io/api/jetbrains+iml
.vscode/
Loading