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
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
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
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
e0d7e5df85
Install binutils as installer deps (needed to pick correct architecture for FTL)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-06-09 19:30:28 +02:00
913be6c349
Print detected CPU arch
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-06-09 19:01:14 +02:00
1c4e58efe3
Use exact architecture matching binaries where appropriate
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-06-09 15:53:02 +02:00
9c27e4766d
Decide which FTL architecture to pick by by installed architectures rather than by detected processor (this may be wrong in an emulated Docker environment)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-06-08 22:17:14 +02:00
8bf4ab0cd6
Remove option to set static IP address if DHCPCD is installed
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-06-04 22:59:44 +02:00
366345e87e
Fix no_installs
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-06-04 20:31:48 +02:00
667418c71d
Use new FTL binary names
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2023-06-04 20:02:38 +02:00
7da57c6acd
Don't check and install old FTL config file
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-06-02 00:08:50 +02:00
792b0d419b
Test fixes
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-06-01 19:29:47 +01:00
7351a4d3b1
Merge branch 'development' into development-v6
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-06-01 15:45:05 +02:00
f7b9d70054
Remove man page for pihole-FTL
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-05-30 21:39:10 +02:00
7cbe713873
REVISIT: Don't rely on existence of setupVars.conf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:16 +01:00
0e8f285f4f
Always assume that the web interface will be installed.
...
We could revist this again in future if we decide that there should still be a choice to install the interface or not
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:16 +01:00
0568a69d83
Use WEBPORT instead of PRIVACY_LEVEL to set the web port...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:16 +01:00
b8acccde90
Update comments on the move of /etc/dnsmasq.old -> /etc/dnsmasq.old to better reflect why we are doing it
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:16 +01:00
e3ffec5762
Change when old configs are removed
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:15 +01:00
0e558e4c36
Remove some code that installs the blockpage/sets up web directories
...
Remove some code that disables dnsmasq if it is running
Create dnsmasq.d directory if it does not exist
2023-05-27 11:51:15 +01:00
31f16510e2
Clear out some no longer needed ftl/dnsmasq config code
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:15 +01:00
d2d1195928
Needs tweaking, offer chance to change web interface port
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:15 +01:00
31ee15200d
gut the install script of references to web server/lighttpd
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-05-27 11:51:15 +01:00
b74c6d5120
Add support for RISC-V 64-bit installs
...
Signed-off-by: MichaIng <micha@dietpi.com >
2023-05-03 20:52:28 +02:00
c96463bda2
Fix getting 'privacylevel'
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-03-22 23:00:10 +01:00
58275ecd13
Revert "Ignore commented lines when reading PRIVACYLEVEL from config file"
2023-03-22 21:52:39 +00:00
fb032ea6e7
Ignore commented lines when reading PRIVACYLEVEL from config file ( #5177 )
2023-03-22 12:23:40 -07:00
73de49323c
Remove systemd service and optionally override configs on uninstall
...
This has been forgotten when adding the new native systemd service.
Signed-off-by: MichaIng <micha@dietpi.com >
2023-02-27 16:51:32 +01:00
4fd0f15d90
Ignore commented lines when reding PRIVACYLEVEL from config file
...
Create dedicated getVal function in utils.sh as it might be useful somewhere else
Account for tailing comments and $key not being on the first line
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-02-21 21:03:55 +01:00
c65ea9c47c
Adam does not always think things through completly. He will go and sit on the naughty step now.
...
Co-authored-by: Adam Warner <me@adamwarner.co.uk >
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net >
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-02-10 20:49:58 +00:00
3ad8965959
Tweak old pihole lighttpd config warning message to better reflect the consequences of making changes to the file
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-02-01 17:38:21 +00:00
68a03cc877
Ensure that /run/lighttpd exists and is owned by lighttpd user. It is likely that new installs will fail currently
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-01-22 18:05:05 +00:00
50be36400c
Always set lighttpd config dir permissions ( #5038 )
2023-01-22 15:56:29 +00:00
ce7f926e92
Only remove the server.modules+= from new config if lighttpd version is < 1.4.56 ( #5133 )
2023-01-21 23:26:11 +00:00
d30a5f1b95
Get the lighttpd version from dpkg-query instead
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-01-21 13:53:56 +00:00
771b7cfcc7
Run updatechecker after gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2023-01-19 21:41:32 +01:00
7bb86e4118
Add a check for the version number of lighttpd. Only remove the server.modules += section of the new pihole-admin config if the version number is not greater than or equal to 1.4.56
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-01-18 22:12:29 +00:00
634e3b0e46
mod_accesslog was ommited from the list of server modules, which causes a warning to be flashed up in the error log. Enabling this
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2023-01-16 13:36:11 +00:00
f73b965fcd
Create versions file before sourcing it
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-12-29 21:59:23 +01:00
b9ebb05246
Set permission after we know the user wants to install the web server
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-12-28 13:42:57 +01:00
c59e11a332
Always set lighttpd config dir permissions
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-12-22 12:54:15 +01:00
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
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
08c7691d1e
lighttpd pihole-admin.conf for admin interface
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com >
2022-12-19 02:34:29 -05:00
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
c2bb190dce
Explicitly create group pihole on installation ( #5039 )
2022-12-11 14:05:24 +00:00
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
ff5ee29566
Add native systemd service ( #4924 )
2022-11-27 21:41:35 +00:00
33d2163f19
Explicitly create group pihole on installation
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-11-24 22:06:04 +01:00
