1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-12 10:49:04 +00:00
Commit Graph

95 Commits

Author SHA1 Message Date
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
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
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
DL6ER
ea5a3bf0b2
Install RFC6761 config file
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-08-15 11:21:24 +02:00
Adam Warner
1358209a9a
rename distro_check to package_manager_detect, as it is more in keeping with what the function actually does
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-05 19:02:36 +01:00
MichaIng
c901443676 Remove false statement about dependency removal on Raspbian
The statement "All dependencies are safe to remove on Raspbian" has been added at a time where a much smaller list of dependencies were installed, all indeed relatively safe to purge. Nowadays this list has grown and includes important system packages, like iproute2, psmisc, sudo, curl and others, which are often again dependencies of other packages, like network stacks (ifupdown) and others, so that inexperienced users, following that statement, may break their systems network capabilities and more.

This message has hence been removed.

Signed-off-by: MichaIng <micha@dietpi.com>
2021-05-02 13:29:28 +02:00
freddii
7c0c30fb0b fixed typos 2021-01-19 19:33:38 +01:00
Dan Schaper
c76435883b
Merge pull request #3360 from dnicolson/fix-github-capitalisation
Fix GitHub capitalisation
2020-05-13 16:56:36 -07:00
Dave Nicolson
ab753e88a2 Fix GitHub capitalisation
Signed-off-by: Dave Nicolson <david.nicolson@gmail.com>
2020-05-13 12:55:00 +02:00
pvogt09
40ac3e7eb7 remove pihole group during uninstall
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2020-04-04 19:22:37 +02:00
XhmikosR
7b8611ced0
Assorted typo fixes. (#3126)
* Assorted typo fixes.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-03-08 16:53:14 -07:00
Mcat12
974bba4a45
Fix PKG_REMOVE array usage
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:30:26 -07:00
Mcat12
951732fc1b
Use an array for PKG_REMOVE
Fixes shellcheck warning.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:28:55 -07:00
Mcat12
b6700924b2
Fix uninstall causing 403 errors and not removing packages
The 403 lighttpd errors were caused by removing the lighttpd config
directory and not removing lighttpd itself. This caused a subsequent
Pi-hole reinstall to not have all of the required lighttpd config files.

The error while removing packages was caused by combining arguments into
a string instead of listing each argument.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2019-06-17 16:13:31 -07:00
pvogt09
5c575e73c7 Adds world readable attribute to files created by Pi-hole to circumvent #2724
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
2019-04-30 22:41:12 +02:00
Andrei Picus
e9e92368b0 Fix uninstalling lighttpd when it's not installed
Signed-off-by: Andrei Picus <NiGhTTraX@users.noreply.github.com>
2019-03-15 15:05:58 +01:00
Borats Nolan
32b50f8188 Change the word "folder" to "directory" since the pi-hole is intended to run on rpi with Linux on it.
Signed-off-by: Borats Nolan <borats@i.dont.use.email>
2018-07-28 02:35:39 +10:00
Adam Warner
9b1356ad01
Revert #2282
Signed-off-by: Adam Warner <adamw@rner.email>
2018-07-27 00:27:06 +01:00
RamSet
56b04017e7 Port 53 check updated with 4 spaces.
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-16 11:29:12 -06:00
Rob Gill
ed7ebfd58d man page for pihole-FTL
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-03 22:15:26 +10:00
Rob Gill
999e47a26c
Remove manual page
Tests for presence of pihole man page.
If it is present, deletes it and runs man-db to rebuild manual database.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-02 09:50:52 +10:00
Rob Gill
cadd0e4244
move code back to correct location
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-01 14:03:13 +10:00
Rob Gill
f35ea9a3ca
replace code i missed during merge
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-06-01 11:57:59 +10:00
Rob Gill
0971630e01
Merge branch 'development' into uninstall-formatting 2018-06-01 07:17:02 +10:00
Rob Gill
b60a9fa371
merge (#2)
* remove package_check to avoid situations like #1760

Signed-off-by: Adam Warner <adamw@rner.email>

* Prevent redundant entries in to adlists.list

Grep ${args[3]} and only add if grep -c -eq 0

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>

* lan to local

Reduced differences.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>

* Require exact match

Updated to require an exact match to reduce false-positives, as suggested by DL6ER.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>

* fix empty ports on some systems

Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>

* debug user locale; improve function to parse variables and files

Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>

* Split declaration and population for stickler.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

* implement dschapers suggestions--better command, less subshells, and finer formatting

Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>

* flip uninstall compatability check

Signed-off-by: bcambl <blayne@blaynecampbell.com>

* Update index.php

Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* Update index.php

thanks stickler-ci  .......

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* changes as requested 

changes as requested 

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* oh stickler bot...

accidentally a space

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* linting: Double quote to prevent globbing and word splitting

Signed-off-by: bcambl <blayne@blaynecampbell.com>

* unbind resolved on ubuntu 18.04

Stop systemd-resolved from interfering with dnsmasq/ftl
Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* restore resolvd.conf

If dnsmasq is removed, resolved will need to be restored.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* Update uninstall.sh

Signed-off-by: Rob Gill <rrobgill@protonmail.com>>

* Minor correction for double instance of the word "found".

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

* message text

Signed-off-by: Rob Gill <rrobgill@protonmail.com>>

* relocate as function

The check for systemd-resolved DNSStubListener, and disabling as necessary is a new function, called just prior to start_service pihole-FTL.
The check for ubuntu bionic 18.04 specifically is removed.
The check if resolved is enabled is made with check_service_active()
An additional check that the dnsstublistener is enabled is made.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* Regex & case fix

grep & sed regexes  match commented or uncommented

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* Update basic-install.sh

Force reloading of relsolved config where available

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* reload resloved

reload resolved config if possible, restart otherwise

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* user-facing messages

Signed-off-by: Rob Gill <rrobgill@protonmail.com>

* move & clarify comments
2018-06-01 07:14:54 +10:00
Mark Drobnak
8523c0da32
Merge pull request #2180 from rrobgill/resolved/ubuntu-bionic
Disable SystemD's DNS Stub Resolver On Install
2018-05-31 09:32:49 -04:00
Rob Gill
f0dfa4d53d
Stickler-bot...
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-05-31 13:43:49 +10:00
Rob Gill
f2bedddce4
Changes from #2167 converted to spaces
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-05-31 13:37:52 +10:00
Rob Gill
552138e851
Appease stickler-bot.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-31 13:24:09 +10:00
Rob Gill
ff71379a8e
Convert from two to four space indetation
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
2018-05-31 13:14:18 +10:00
Mcat12
34f5db9ed4
Merge branch 'development' into uninstall_compat_check
# Conflicts:
#	automated install/uninstall.sh
2018-05-30 22:08:20 -04:00
Mark Drobnak
87506852d1
Merge pull request #1761 from pi-hole/tweak/Uninstall
Tweak/uninstall
2018-05-30 21:19:59 -04:00
Rob Gill
e6893bc419
Update uninstall.sh
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-29 19:03:00 +10:00
Rob Gill
ebeab06710
Appease Stickler-bot
So... originally no changes were made to the code, but Stickler-bot was unimpressed, so I've followed its suggestions.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-29 18:59:55 +10:00
Rob Gill
1911c3690d
Style/Tabs to spaces
uninstall.sh contains a mix of tabs and spaces for indentation in different parts of the file.

Everywhere that used tabs has been converted to spaces, compatible with the indentation style used in basic_install.sh

No code has been altered, only the use of tabs and spaces in indention.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-29 17:59:39 +10:00
Rob Gill
15f0ba839f
reload resloved
reload resolved config if possible, restart otherwise

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-16 07:35:22 +10:00
Rob Gill
97809277df
Update uninstall.sh
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
2018-05-14 19:50:58 +10:00
Rob Gill
3d3e7a330c
restore resolvd.conf
If dnsmasq is removed, resolved will need to be restored.

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-05-14 19:44:23 +10:00
bcambl
c1ecfbfe63 linting: Double quote to prevent globbing and word splitting
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-05-12 19:39:17 -06:00
bcambl
d3dda443cd flip uninstall compatability check
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-05-04 00:02:47 -06:00
Daniel (Fourdee)
3a483a1b20 install_web_server
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
2018-04-15 02:08:16 +01:00
Adam Warner
2c8dcd86e5
remove package_check to avoid situations like #1760
Signed-off-by: Adam Warner <adamw@rner.email>
2017-11-09 20:47:15 +00:00
WaLLy3K
909bc92c01 Tweak wording to fit on 80 character screen
* Also move colour after $INFO
2017-09-21 00:22:47 +10:00
Adam Warner
774c6e8ac0
Merge branch 'development' into new/UninstallCleanup
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	automated install/uninstall.sh
2017-09-09 18:56:17 +01:00
Adam Warner
939c99cdbf
accidentally an entire group of letters. 2017-08-23 11:48:11 +01:00
Adam Warner
e938132c53
accidentally a space
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 21:02:10 +01:00
Adam Warner
1b34286264
verbiage
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:33:53 +01:00
Adam Warner
54f4f6d2d7
Add "${INSTALLER_DEPS[@]}" to package array
add `-f` to rm commands so that `set -e` is not kicked

Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:23:07 +01:00
Adam Warner
07e5e8e67a
need to include PH_TEST="true" so that the install script isn't run when sourcing it.. doh
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:03:19 +01:00
Adam Warner
3c25094495
No need to declare PKG_MANAGER, as it's already declared in basic-install
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 19:56:36 +01:00