Adam Warner
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
Adam Warner
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
Christian König
771b7cfcc7
Run updatechecker after gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-01-19 21:41:32 +01:00
Adam Warner
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
Adam Warner
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
Christian König
f73b965fcd
Create versions file before sourcing it
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-29 21:59:23 +01:00
Christian König
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
Christian König
c59e11a332
Always set lighttpd config dir permissions
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-22 12:54:15 +01: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
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
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
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
c2bb190dce
Explicitly create group pihole on installation ( #5039 )
2022-12-11 14:05:24 +00: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
Christian König
33d2163f19
Explicitly create group pihole on installation
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-11-24 22:06:04 +01:00
Christian König
6d8abc2e30
Don't install which
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-11-18 23:50:34 +01:00
Adam Warner
6b8ba3c15e
Replace deprecated shell commands ( #4907 )
2022-11-14 17:52:31 +00:00
Adam Warner
64e61aac4a
Simplify versions.sh ( #4959 )
2022-11-09 17:15:51 +00:00
Stephan Pillhofer
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
Stephan Pillhofer
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
MichaIng
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
a1346054
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
a1346054
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
RD WebDesign
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
Christian König
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
Adam Warner
755ec8bf2f
$$ != $
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-24 16:08:45 +01:00
Adam Warner
1c1407e083
Use utils.sh in install script ( #4872 )
2022-09-24 14:00:22 +01:00
Christian König
d4ce5b1c2a
Fix tabs in dialog boxes
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-09-22 14:49:25 +02:00
yubiuser
2ff1fa1b85
Merge branch 'development' into use_utils
2022-09-17 16:14:31 +02:00
Christian König
1335c44deb
Add jq to dependencies
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-25 09:55:42 +02:00
Christian König
9b5ea13a33
Use utils.sh in install script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-24 08:49:20 +02:00
yubiuser
37102e5a01
Merge branch 'development' into removeblockpagefunctionality
2022-08-17 21:29:58 +02:00
MichaIng
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
Christian König
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
Christian König
27fa284eda
Fix missing PI_HOLE_BLOCKPAGE_DIR
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08 17:21:29 +01:00
Christian König
6c9bd7a632
Remove blockingpage.css
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08 17:20:13 +01:00
Adam Warner
c78cf82fc6
no need to declare $viewPort
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-08 17:12:09 +01:00
Christian König
c7410b0be9
Always indent
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-07 15:50:05 +02:00
Christian König
7320c10dd3
Fix git indention
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-06 21:44:19 +02:00
Adam Warner
c6da627b7d
Move release version check inside the else block
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-31 18:55:05 +01:00
Adam Warner
9028898ba7
Move code from check_epel_repo_required
into the rpm branch of the if check on package_manager_detect(), adjust tests to accommodate
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-30 19:27:00 +01:00
Adam Warner
0e8c1ec023
Flip logic on epel check - if _not_ fedora, then (try to, depending on supported OS) install EPEL.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-30 19:03:46 +01:00
Adam Warner
313c0ddf28
Update automated install/basic-install.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-07-30 18:59:57 +01:00
Adam Warner
b613758419
rename select_rpm_php and simplify it to remove code no longer needed (discussed internally removing the unsupported dialog here to match behaviour on non rpm distros)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-30 16:27:31 +01:00
Adam Warner
9c03915cb0
Remove special Centos7 hand holds. Move the unsupported dialog out to a further if block so that a user may still continue to install on centos7 (provided they have the pre-requisites installed)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-30 16:27:31 +01:00
yubiuser
a45c9f9f50
Merge pull request #4848 from pi-hole/indent_update
...
Indent installation/update complete message
2022-07-30 07:41:04 +02:00
Christian König
2610739624
Indent installation/update complete message
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-29 23:43:20 +02:00
Christian König
68eddd2377
Add OS_CHECK_DEPS to uninstall script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-29 22:47:40 +02:00
Christian König
8c778c14dc
Move linebreaks
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-26 23:43:49 +02:00
yubiuser
d5c798d1a9
Apply reviewers suggestion
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-26 23:39:02 +02:00
Christian König
14e1eea22d
Fix spaces in dialog msg
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-26 23:39:02 +02:00
yubiuser
c7108a632c
Merge pull request #4824 from pi-hole/Alam_Rocky
...
Don't fail if Alma or Rocky are detected
2022-07-16 09:59:22 +02:00
Christian König
bc8fcc744c
Fix shellcheck warnings
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-15 20:43:42 +02:00
Christian König
a3f1317add
Don't fail if Alma or Rocky is detected
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-15 20:04:37 +02:00
Adam Warner
13135498c1
Merge pull request #4811 from pi-hole/CAPS
...
Print all SELINUX output in lowercase
2022-07-10 13:43:29 +01:00
Christian König
b25805348f
Print all SELINUX output in lowercase
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-10 14:33:24 +02:00
Adam Warner
59dab6a568
Simplifications per @yubiuser's suggestion
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-10 11:50:09 +01:00
Adam Warner
ecfb96d339
If old log paths exist in logrotate file, replace them with new ones
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-10 10:06:55 +01:00
Adam Warner
e4444ae6a5
fixes "Set static IP using custom values results in error" ( #4807 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-09 19:02:40 +01:00
yubiuser
8e4adb6e39
Merge pull request #4788 from pi-hole/SKIP_INSTALL
...
Rename PH_TEST to SKIP_INSTALL
2022-07-09 00:01:48 +02:00
yubiuser
6aaa446354
Merge pull request #4802 from pi-hole/codespell
...
Fix spelling mistakes
2022-07-08 23:51:20 +02:00
Christian König
3d8672bc59
Clean consecutive mkdir
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-08 23:20:30 +02:00
Christian König
b49db58ec2
Fix spelling mistakes
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-08 22:00:36 +02:00
Dan Schaper
56a32047b8
Logic fix
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-07 13:50:41 -07:00
Dan Schaper
48d5d6bed2
Always create the log target directory before any movements
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-07 13:23:13 -07:00
Adam Warner
04abc4dacd
Merge pull request #4792 from pi-hole/fix/mkdir_logs
...
Create new log directory
2022-07-07 20:18:18 +01:00
Dan Schaper
fd41801977
Create new log directory
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-07 12:12:53 -07:00
Christian König
518cbd10e0
Rename also in docker files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06 22:58:14 +02:00
Christian König
0a8761ee68
Rename PH_TEST to SKIP_INSTALL
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06 22:53:09 +02:00
Christian König
5c564e53ca
Fix indention in install script output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-07-06 12:29:03 +02:00
Dan Schaper
853cd9670a
Merge pull request #4772 from pi-hole/tweak/dialog
...
Convert installer whiptail to dialog
2022-07-05 20:56:02 -07:00
Dan Schaper
cfbc731eab
Apply suggestions from code review
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-05 20:25:27 -07:00
Dan Schaper
46f991f578
Apply suggestions from code review
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-05 20:11:00 -07:00
RD WebDesign
ad70ece73e
Fixing dialog line breaks
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-07-05 23:10:40 -03:00
Dan Schaper
39cb1029e9
Clarify button labels
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-05 14:23:59 -07:00
Dan Schaper
a39c470f2d
Requested changes.
...
Co-authored-by: MichaIng <micha@dietpi.com>
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-05 00:06:12 -07:00
Dan Schaper
72fcdb128a
Rework cenos7 functions
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-04 23:14:02 -07:00
Dan Schaper
44667b5ffb
Add dialog to RPM installer requirements.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-04 12:35:08 -07:00
yubiuser
696d1c4ec3
Merge pull request #4777 from pi-hole/tweak/default_log_path
...
Change default FTL log file path to /var/log/pihole/FTL.log
2022-07-03 22:19:14 +02:00
Dan Schaper
1ed5ff306d
Align dialog texts.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-03 11:08:56 -07:00
Dan Schaper
bf57a786e6
Convert whiptail to dialog.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-03 11:08:56 -07:00
Dan Schaper
80bef5f6b6
Direct pull for epel-release
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-07-03 10:47:05 -07:00
DL6ER
bd8288d6ef
Special renaming for pihole-FTL.* to pihole/FTL.log.*
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-07-03 18:54:13 +02:00
Adam Warner
0be987239e
Adds spellcheck action to the smoke-tests (also moves editorconfig-checker to smoketests away from it's own action)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-07-02 14:04:08 +01:00
Christian König
ed8c6c04d4
Use PHP_VERSION
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-14 23:04:31 +02:00
Christian König
4b674ecfe3
Fix first install
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-14 00:58:10 +02:00
Christian König
5818f3f997
Check for validity first
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-14 00:05:27 +02:00
Christian König
7d731870e5
Fix stickler
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-13 16:06:59 +02:00
Christian König
1f26e85399
Exit installer if no valid PHP version is found
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-13 15:50:51 +02:00
Christian König
2c07d27ad7
Forgot two places
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-04 22:42:41 +02:00
Christian König
0b9d4a47ad
Remove IPv4 and IPv6 adresses from setupVars.conf
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-06-04 22:38:00 +02:00
yubiuser
ae9d16baf2
Merge pull request #3732 from pi-hole/tweak/moveloglocation
...
Utilise /var/log/pihole/ for log storage
2022-05-31 22:59:32 +02:00
Christian König
b7742ddb9b
Always install pihole-FTL.service file
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-05-19 06:17:46 +02:00
Christian König
60615e60aa
Make sure FTL is stopped before old logfiles are moved
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-05-18 21:11:38 +02:00
Christian König
110e752552
Move existing log files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-05-15 22:30:17 +02:00
Christian König
9b9acfd4a7
Remove log files from new location during uninstalling
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-05-15 20:22:06 +02:00
yubiuser
2e2a3aa048
Add port info to explanation text
2022-05-09 17:14:16 +02: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
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