DL6ER
58231e55df
Shorten no merge conflict message ( #5085 )
2022-12-22 23:07:50 +01:00
Christian König
12674c0824
Shorten no merge conflict message
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-22 22:27:03 +01:00
Adam Warner
ec1d4c5500
lighttpd: do not overwrite /etc/lighttpd/lighttpd.conf (On new installs) ( #5075 )
2022-12-19 23:36:23 +00:00
Glenn Strauss
34f45d011d
lighttpd: do not install obsolete 404 handler
...
(/var/www/html/pihole/ dir and contents are still removed in uninstall)
(/var/www/html/index.lighttpd.orig is still removed in uninstall)
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2022-12-19 17:53:20 -05:00
Glenn Strauss
539f9d4da0
lighttpd: remove pihole block page error handler
...
remove obsolete pihole block page error handler
x-ref:
Remove the advanced functionality of the 404 page (Blockpage)
https://github.com/pi-hole/pi-hole/pull/3910
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2022-12-19 17:53:14 -05:00
Glenn Strauss
c6342ed84c
lighttpd: do not overwrite /etc/lighttpd/lighttpd.conf
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2022-12-19 16:19:03 -05:00
Adam Warner
9072a6a7f0
add Fedora 37 to distro-test in .github/workflows/test.yml ( #5067 )
2022-12-19 20:08:11 +00:00
Adam Warner
3b5d10d087
Sync master back into development ( #5078 )
2022-12-19 20:07:27 +00:00
Glenn Strauss
0d5d3a1b22
lighttpd: remove obsolete exclusion of letsencrypt.conf
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2022-12-19 14:56:27 -05:00
Adam Warner
8d2e023ec0
Add merge-conflict workflow ( #5071 )
2022-12-19 19:53:19 +00:00
Adam Warner
4a1473aee9
Create new lighttpd pihole-admin.conf for admin interface ( #5065 )
2022-12-19 19:52:28 +00:00
Glenn Strauss
78f9e38425
lighttpd: test for /etc/lighttpd/conf*/pihole-admin.conf
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2022-12-19 02:34:53 -05:00
Glenn Strauss
08c7691d1e
lighttpd pihole-admin.conf for admin interface
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2022-12-19 02:34:29 -05:00
Glenn Strauss
62bf9957dc
lighttpd conf: collect ^/admin/ conditions
...
move a sub-condition to be a nested condition under ^/admin/
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2022-12-18 12:53:05 -05:00
Glenn Strauss
dafc9983f5
lighttpd include external.conf using file glob
...
lighttpd 1.4.40 and later support 'include' using file glob
(The prior code for compatibility was presumably for Debian Jessie
and earlier, now obsolete. Debian Stretch -- currently oldstable --
ships with lighttpd 1.4.45)
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2022-12-18 12:52:58 -05:00
Adam Warner
a44b8e4bfc
Set fixed version requirement for tox ( #5074 )
2022-12-18 13:50:18 +00:00
Christian König
c8e69c6139
Set testenv explicitly
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-18 14:41:18 +01:00
Christian König
da8893f477
Try bandaid
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-18 12:45:14 +01:00
Christian König
7562376373
Add merge-conflict workflow
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-17 21:14:20 +01:00
Dan Schaper
619cebb62c
Bump actions/checkout from 3.1.0 to 3.2.0 ( #5070 )
2022-12-17 11:55:03 -08:00
Dan Schaper
6a2200a8e6
Set X-XSS-Protection headers to 0 in lighttpd.conf ( #5069 )
2022-12-17 11:34:02 -08:00
dependabot[bot]
661433c115
Bump actions/checkout from 3.1.0 to 3.2.0
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 3.1.0 to 3.2.0.
- [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/v3.1.0...v3.2.0 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-17 10:00:40 +00:00
Glenn Strauss
e7e7a817bb
add Fedora 37 to distro-test
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2022-12-17 04:18:38 -05:00
Neill Wolf
d245226053
set X-XSS-Protection headers to 0 in lighttpd.conf
...
Signed-off-by: Neill Wolf <neillawolf@gmail.com>
2022-12-16 16:01:35 -06:00
Adam Warner
a5d10a6256
Sync master back into development ( #5068 )
2022-12-15 20:44:01 +00:00
Adam Warner
c32761e786
Use github cli to sync master back to development ( #5063 )
2022-12-15 20:19:35 +00:00
Christian König
095696ec04
Use github cli to sync master back to development
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-13 23:01:35 +01:00
Adam Warner
7971cf0adc
Only compare OS versions if dig was successful ( #5056 )
2022-12-11 18:00:54 +00:00
Adam Warner
fc83883934
Apply suggestions from code review
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-12-11 17:48:45 +00:00
RD WebDesign
1550f29f06
Use GREEN if dig was successful
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:47 -03:00
RD WebDesign
a206980242
Fix parenthesis color
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:47 -03:00
RD WebDesign
8c2f56b0e6
Imporving the output from os_check() function
...
- add red color to dig errors
- reorder some output lines
- add "Distro and version supported" on success
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:46 -03:00
RD WebDesign
b4349b41ce
Use the correct variable digReturnCode
...
also use INFO instead of CROSS, because it's not an error.
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:46 -03:00
RD WebDesign
67f04787d6
Only compare OS versions if dig was successful
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-12-11 14:42:35 -03:00
Adam Warner
1ee922d16c
Disable a few commands if installed in (official) docker containers ( #5018 )
2022-12-11 17:31:58 +00:00
Christian König
14ab586603
Start counting with 1
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-11 15:12:28 +01:00
Christian König
372070ab39
Improve detection of incorrecr lines during gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-11 15:12:28 +01:00
Christian König
4004a93d1a
Don't double check for lines containing no domains in gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-11 15:12:28 +01:00
Adam Warner
c2bb190dce
Explicitly create group pihole on installation ( #5039 )
2022-12-11 14:05:24 +00:00
Adam Warner
b8eae60fcc
Disable a few commands for Docker. Currently this is done by monkeypatching the the pihole file on Docker install, however if someone was to run pihole checkout, these patches are removed.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 11:39:11 +00:00
Dan Schaper
c86ff5d084
Bump actions/setup-python from 4.3.0 to 4.3.1 ( #5054 )
2022-12-10 12:39:11 -08:00
dependabot[bot]
126da094bd
Bump actions/setup-python from 4.3.0 to 4.3.1
...
Bumps [actions/setup-python](https://github.com/actions/setup-python ) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/actions/setup-python/releases )
- [Commits](https://github.com/actions/setup-python/compare/v4.3.0...v4.3.1 )
---
updated-dependencies:
- dependency-name: actions/setup-python
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-10 10:00:58 +00:00
Christian König
f713b14ba0
Cleanup if startup failed
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-08 09:49:02 +01:00
Dan Schaper
a4e20f79a3
Install wheel before other python packages in Action ( #5048 )
2022-12-05 15:32:04 -08:00
Christian König
6b146ed2d1
Use two-step approach
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-05 23:13:24 +01:00
Christian König
e0e0baf076
Install wheel before other python packages
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-04 09:32:23 +01:00
Dan Schaper
95e799ed6e
Do not require man pages to be present in test script ( #5037 )
...
Skip manpage tests when the manpage directory does not exist.
2022-11-28 13:27:30 -08:00
DL6ER
202aa25c09
Do not setcap FTL binary when systemd is used ( #5043 )
...
All bets on `AmbientCapabilities`
2022-11-28 22:00:27 +01:00
MichaIng
06de172952
Skip setcap on installs with systemd
...
since the systemd unit uses "AmbientCapabilities" to grant capabilities.
Signed-off-by: MichaIng <micha@dietpi.com>
Signed-off-by: MichaIng <micha@dietpi.com>
2022-11-28 21:27:57 +01:00
Adam Warner
ff5ee29566
Add native systemd service ( #4924 )
2022-11-27 21:41:35 +00:00
