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
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
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
6d8abc2e30
Don't install which
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-11-18 23:50:34 +01:00
6b8ba3c15e
Replace deprecated shell commands ( #4907 )
2022-11-14 17:52:31 +00:00
64e61aac4a
Simplify versions.sh ( #4959 )
2022-11-09 17:15:51 +00:00
122bc6b927
Fix static IP not set because of in-line comment
...
Signed-off-by: Stephan Pillhofer <43667664+StephanPillhofer@users.noreply.github.com >
2022-11-02 22:35:39 +01:00
06cf7afbc2
Fix static IP not set
...
Signed-off-by: Stephan Pillhofer <43667664+StephanPillhofer@users.noreply.github.com >
2022-10-30 20:19:38 +01:00
81927334f2
Add native systemd service
...
Inspired by: https://github.com/pi-hole/pi-hole/pull/2112
A pre-start and a post-stop script are added to reduce doubled setup and cleanup code.
Since systemd services do not natively support dynamic users, test once whether capabilities are supported during install/update, and remove User=pihole otherwise.
Signed-off-by: MichaIng <micha@dietpi.com >
Co-authored-by: DL6ER <dl6er@dl6er.de >
2022-10-30 19:40:33 +01:00
e3db5fc601
basic-install.sh: Use command -v instead of which
...
`command -v` is the standardized version of `which` and doesn't require
any extra packages
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com >
2022-10-11 14:33:30 +00:00
9c51050283
basic-install.sh: Use grep -E instead of egrep
...
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com >
2022-10-11 14:33:30 +00:00
c5b3b8dd68
Fix pihole -r dialog exit
...
- if an option is selected: Get option (repair/reconfigure);
- if exit or ESC: Get exit code (1/255)
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2022-10-10 00:27:03 -03:00
18d28533eb
Update local and remote versions at the same time
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-10-06 12:36:17 +02:00
755ec8bf2f
$$ != $
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2022-09-24 16:08:45 +01:00
1c1407e083
Use utils.sh in install script ( #4872 )
2022-09-24 14:00:22 +01:00
d4ce5b1c2a
Fix tabs in dialog boxes
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-09-22 14:49:25 +02:00
2ff1fa1b85
Merge branch 'development' into use_utils
2022-09-17 16:14:31 +02:00
1335c44deb
Add jq to dependencies
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-08-25 09:55:42 +02:00
9b5ea13a33
Use utils.sh in install script
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-08-24 08:49:20 +02:00
37102e5a01
Merge branch 'development' into removeblockpagefunctionality
2022-08-17 21:29:58 +02:00
b3c8045b52
Skip web server dialog if --disable-install-webserver has been passed
...
Prior to https://github.com/pi-hole/pi-hole/pull/4772 , the web server dialog was skipped if --disable-install-webserver was passed (INSTALL_WEB_SERVER=false). This commit restores this behaviour.
Signed-off-by: MichaIng <micha@dietpi.com >
2022-08-17 20:48:11 +02:00
97447b2f3b
Do not remove blockingpage.css from existing installations as some users might use them for custom.php
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-08-08 18:20:49 +01:00
27fa284eda
Fix missing PI_HOLE_BLOCKPAGE_DIR
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-08-08 17:21:29 +01:00
6c9bd7a632
Remove blockingpage.css
...
Signed-off-by: Christian König <ckoenig@posteo.de >
2022-08-08 17:20:13 +01:00
