Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-27 00:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity
5745 commits 8 branches 109 tags 27 MiB
Commit graph

1425 commits

Author SHA1 Message Date
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
Dan Schaper
71072b4beb
Stickler quoting 2022-04-20 10:21:24 -07:00
spmfox
9840148ba9
Update automated install/basic-install.sh 
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-17 14:52:05 -04:00
spmfox
2601162243 Changed ldd binary check from /bin/ls to /usr/bin/bash 
Signed-off-by: spmfox <spmfox@foxwd.com>
 2022-04-16 16:46:07 -04:00
MichaIng
2b124b1c69
Do not pass whole environment for PIHOLE_SKIP_OS_CHECK=true 
With `sudo -E`, the whole environment is passed to the root shell, which is a potential security and/or privacy issue when command overrides/functions, PATH or private user info are passed. To pass `PIHOLE_SKIP_OS_CHECK=true`, it can be passed alone to the bash/script call within the sudo session, so the `-E` flag can be omitted.

Signed-off-by: MichaIng <micha@dietpi.com>
 2022-04-13 21:30:12 +02:00
yubiuser
9356d7bbb1
Remove unnecessary case in uninstall script (#4692) 
* Remove unnecessary case in uninstall script

* Better answer

Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-12 11:36:49 -07:00
yubiuser
b33434d02a
Let uses know how long they need to wait (max) 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2022-04-07 09:11:53 +02:00
Christian König
c0a2ab7b77
Fix indention 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-04 16:59:13 +02:00
Christian König
30ba79f6a0
Let users know what's going on 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-04 16:48:34 +02:00
Christian König
cd3c97f113
Exit installer if dpkg lock is held for more then 30 seconds 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-04-04 16:38:30 +02:00
Adam Warner
fe9031b26f
Merge pull request #4669 from pi-hole/master 
sync: master to development
 2022-04-02 00:05:49 +01:00
Dan Schaper
8a5c7dec71
Ensure existing files are proper owner and mode. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
 2022-04-01 14:08:09 -07:00
Dan Schaper
d45c9fc522
Final touch to install fix. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-04-01 11:08:26 -07:00
Dan Schaper
c2384ecc6f
Change touch that would always fire to install. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-03-31 14:23:39 -07:00
Dan Schaper
2f38452565
Wrap touch calls with if/then guards for Buster docker. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2022-03-31 12:03:17 -07:00
Christian König
c756bcb9d1
Add procps to dependencies 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-03-01 09:07:51 +01:00
yubiuser
c3c5342b48
Fix reviewer's comment 
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
 2022-02-04 21:11:54 +01:00
Christian König
7c60ee8df1 Remove pihole-FTL.conf man page 
Signed-off-by: Christian König <ckoenig@posteo.de>

Remove double https://

Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-02-04 20:43:47 +01:00
DL6ER
e09dd56807
Remove RPM package sqlite as well 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-02-01 07:38:57 +01:00
DL6ER
8cbffa179d
Replace remaining sqlite3 calls by calls to our embedded pihole-FTL sqlite3 engine and remove sqlite3 as dependency in the installer. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-30 11:18:17 +01:00
MichaIng
c2080324b7
Install netcat-openbsd as dependency explicitly 
Since Debian Stretch and Ubuntu Bionic, the "netcat" package is a transitional dummy package which pulls in "netcat-traditional" on Debian Stretch+Buster and Ubuntu Bionic, and "netcat-openbsd" on Debian Bullseye, Ubuntu Focal and up.

On Debian Bookworm (testing), however, the "netcat" package has been removed during the last 3 days at time or writing, so that it fails do be installed. While "netcat-traditional" and "netcat-openbsd" both "Provides: netcat", since it's two alternatives, APT does not automatically pick one but aborts, and the only solution is to install one explicitly.

While this is likely a temporary state of the Debian testing suite, having a closer look at the two alternatives shows that "netcat-openbsd" is a much more actively maintained newer version with additional support for IPv6, proxies, and UNIX sockets, which is likely the reason for the gradual transition via meta package from "netcat-traditional" to "netcat-openbsd". This commit hence consequently follows this aim by skipping the transitional dummy package and installing "netcat-openbsd" explicitly as dependency, to avoid any possible errors like the one which occurs currently on Bookworm.

Both packages can be installed concurrently and do no conflict, but are managed via dpkg's "update-alternatives".

For reference:
- https://packages.debian.org/netcat
- https://packages.ubuntu.com/netcat

Signed-off-by: MichaIng <micha@dietpi.com>
 2022-01-07 18:55:15 +01:00
DL6ER
5823f5e254
Use ss instead of lsof (#4518) 
* Use ss instead of lsof for pihole status checks

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Use ss FILTER instead of piping into bash

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Use ss in debug log generation

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Remove lsof from dependencies

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2022-01-05 16:41:46 +00:00
yubiuser
c6a2a6f739
Install pihole-FTL.conf template on fresh installation (#4496) 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-04 19:09:30 +00:00
yubiuser
0e359a6321
Set dnsmasq interface listening by default to local (#4509) 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2022-01-04 09:40:07 +01:00
WaLLy3K
5bd7cc9c9d
Replace which with command -v (#4499) 
Signed-off-by: WaLLy3K WaLLy3K@users.noreply.github.com
 2022-01-01 18:02:20 +00:00
DL6ER
886f0c7df3
Merge pull request #4485 from pi-hole/tweak/web_status 
Return the port FTL is listening on in pihole status function
 2021-12-29 11:13:12 +01:00
Matthew Nickson
71ed842dfd
Fixed path to 404 file when using custom.php (#4488) 
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
 2021-12-28 19:32:06 +01:00
Christian König
2a869419b4
Add netcat to dependencies 
Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-12-28 12:18:39 +01:00
Chiller Dragon
e485a7b9bb
Some shellchecks in basic-install.sh (#4088) 
* Some shellchecks in basic-install.sh

Signed-off-by: ChillerDragon <ChillerDragon@gmail.com>

* Use more explicit grep (thanks to @MichaIng)

Signed-off-by: ChillerDragon <ChillerDragon@gmail.com>
 2021-12-02 14:44:50 +01:00
jbzdarkid
bc8150adfa Clean up bash script formatting 
Done with the help of beautysh (a python-based bash formatter)

Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
 2021-11-25 14:12:09 -08:00
MichaIng
996a2c74fa
Use a fixed list height for network interface selection 
This solves the issue reported here: https://github.com/pi-hole/pi-hole/issues/4196
It replaces the other suggested solution here: https://github.com/pi-hole/pi-hole/pull/4197

The benefit of using a fixed/limited list height, compared to allowing larger whiptail/dialogue dimension, is that it works on small screens as well, where the screen or console size itself is too small to hold the interface list + text above + whiptail frame.

It the amount of list elements exceeds the defined list height, automatically a visual scroll bar is added and the list can be scrolled with up/down pageup/pagedown buttons, hence it is generally not required to adjust a list height based on the amount of elements. The fixed height of "6" is chosen since all other "--radiolist" calls use this fixed height as well, it fits and looks good within a 20 rows high whiptail dialogue, and in the common Pi-hole use cases there are no more than 6 network interfaces.

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-11-22 13:25:13 +01:00
yubiuser
ac4a975be5
Allow users to skip setting static IP adress (#4419) 
* Allow users to skip setting static IP adresss

Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-11-06 20:32:03 +00:00
yubiuser
996f8fff28
Recommend apt instead of apt-get if updating the package cache failed (#4421) 
* Only change the recommendation to use apt

Signed-off-by: Christian König <ckoenig@posteo.de>
 2021-11-04 15:55:16 -07:00
MichaIng
04f9e92bff
Fix PHP8.0 detection (#4383) 
The phpInsNewer variable is not set anymore, so that the JSON module is now always tried to be installed. Instead of checking for phpInsNewer to derive whether PHP was installed already, phpInsMajor is now checked. If it is set, PHP is installed already, and only if the major version is lower than 8, the JSON module can be installed.

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-10-11 20:43:12 +01:00
Adam Warner
99981b5e66 now that whiptail size is fixed, lose a couple of lines from the final whiptail output 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-10-11 09:55:56 +02:00
yubiuser
9535e2fd6d
Merge pull request #4363 from xanoni/update-upstream-dns-capabilities 
Update upstream DNS server capability descriptions
 2021-10-06 07:18:14 +02:00
Adam Warner
0ea7344c30
add --no-rebase to the git pull command(s) to squelch hint message in newer versions of git (#4226) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-10-06 01:19:28 +01:00