Commit Graph

558 Commits (763b51fe22dc2320115c614e368613840976903e)

Author SHA1 Message Date
DL6ER 01bf1ae92d Compute double hashes to avoid rainbow table vulnerability
8 years ago
DL6ER 9193c71cff Minor change
8 years ago
DL6ER db278d81e4 Added webpage.sh
8 years ago
Adam Warner b191cd73a7 Update piholeDebug.sh
8 years ago
Jacob Salmela ca56ca5bd8 promo-tweak
8 years ago
Jacob Salmela a0f0dff88e replace hardcoded interface with var
8 years ago
Dan Schaper 8c08e9e473 Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
8 years ago
Adam Warner 4300759287 Fix logic. If both v6 and v4 divide by two, else dont.
8 years ago
Promofaux d7d6d6f991 Update to use new Var name
8 years ago
Promofaux 2f976504e8 switch out -eq for ==
8 years ago
Dan Schaper 4b7b859db9 Gotta catch 'em all...'
8 years ago
Dan Schaper f7d0de53bb Compare string to string.
8 years ago
Dan Schaper 603ec997ba Remove testing block.
8 years ago
Dan Schaper f7266ef4c8 Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user.
8 years ago
Dan Schaper 3d43e1568c Use explicit calls for function to self-document
8 years ago
Dan Schaper c1a3f003e8 Rename the only utilty function left that didn't say `repo`
8 years ago
Dan Schaper 3f61aea7fc Utility functions fully quiet now. Calling functions have the echos.
8 years ago
Dan Schaper bd68db51e0 ShellCheck split local declaration and assignment.
8 years ago
Dan Schaper b8a5ed710e Take echos out of utility functions and move up a level.
8 years ago
Dan Schaper 34be601dd7 Test for lexicographically less than tag version.
8 years ago
Dan Schaper 1d64ad1ccd Stash all changed files, clean directory and pull updates.
8 years ago
Dan Schaper f2d7a3d26d Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Adam Warner ee37c37cab fix update output logic. version number variables should not be read only!
8 years ago
Dan Schaper b636c1e1f8 Whitespace.
8 years ago
Dan Schaper 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Dan Schaper ece1667fb0 Refactor and move some bits.
8 years ago
Adam Warner 50bd8b4a09 Further tweaks to local repo handling
8 years ago
Dan Schaper 93d91353a1 All tabs now spaced
8 years ago
Dan Schaper 8dc9143b34 Just delete, no need to cd there first.
8 years ago
Dan Schaper a0d9a1133c Factoring and combining functions
8 years ago
Dan Schaper 035e4bf727 Move value checks to `if` calls.
8 years ago
Dan Schaper 9ec5bbd560 Actually get `is_repo` to return a value and have it expected.
8 years ago
Dan Schaper 34482c5ed6 Modified `is_repo`
8 years ago
Dan Schaper 7d414b5628 Move version messages to main function, check for repos.
8 years ago
Dan Schaper d9528dfd09 Bash is funny with returns.
8 years ago
Dan Schaper 9c83825cb8 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Dan Schaper 7a22471787 New naming convention, and reorder functions as bash would prefer them to be.
8 years ago
diginc c30478bf4a cleanup and use sentintel in is_repo
8 years ago
diginc d986746ef9 missing quote added
8 years ago
diginc a8fa061f2e quote all the assignments prevent accidental glob splitting
8 years ago
Jacob Salmela f8e9726922 source setupVars and check for the correct variable
8 years ago
Jacob Salmela 884363bd05 remove ipv6 check since it's already in setupVars
8 years ago
Dan Schaper bdd240ecb6 Shellcheck catch for always true expansion.
8 years ago
Dan Schaper 04da292df9 Missed one spinner, updated and exit script if github is unreachable.
8 years ago
Dan Schaper 85b8676b8e Remove spinner, no functions here should last that long, and it masks a few potential exit avenues.
8 years ago
Dan Schaper 114bc13c23 Specify path, cron may not know where the files are located.
8 years ago
Dan Schaper 5fef5f1ed4 Break down `is_repo` to make sure it does what is expected.
8 years ago
Dan Schaper 807b60b0e6 Missed the second reinstaller....
8 years ago
Dan Schaper fbc800e556 If unattened reinstall fails, notify user and exit script immediately.
8 years ago
Dan Schaper 1991ee7a7d Google Style Guide. `readonly` and cap constants.
8 years ago
Dan Schaper ffbfadbccf Detail what the script does.
8 years ago
Dan Schaper c3e2bce956 Variables declared as strings, make sure they are strings when we use them in functions.
8 years ago
Dan Schaper 0c9520d7e3 Protect against unexepcted return values (GitHub not responding as we'd expect.) And make sure bash doesn't maul the variables and cause firing of unattended reinstall of application when values returned aren't as expected.
8 years ago
Dan Schaper 1e7e5230cc Clarify what exactly is being called and the expected returned value format
8 years ago
Dan Schaper f1efc97357 Clairfy condition to make sure they operate as per the specs of the logic flow layout.
8 years ago
Adam Warner d6fe48112c Merge pull request #857 from pi-hole/feature/debugUpdate
8 years ago
Dan Schaper dcf6e6b14d Clarify user action required to end the scripts.
8 years ago
Dan Schaper 908697a963 User token instructions, and small bugfix for missing separator.
8 years ago
Dan Schaper fad2d6b1d1 Return values start showin up now. Logic operators too...
8 years ago
Dan Schaper 9cd830b6aa Start to refine tests and clean up code.
8 years ago
Dan Schaper d9a16b0ff4 Clear up bottom half of script with fewer redundenicies.
8 years ago
Dan Schaper cb5c94ef5e Sorry, left that gravity.list parser in. Big debug files. Cleared that up.
8 years ago
Dan Schaper 85fbd66871 Good commit point, number of changes
8 years ago
Eric Warnke 3da75d6125 Grep was leaking a file not found if blacklist didn't exist
8 years ago
Dan Schaper d4a3a5c180 Trying to implement The Brontide Idiom for design.
8 years ago
Dan Schaper 71e3a473d6 Fix = underbar
8 years ago
Dan Schaper c2cfc09f63 Clean up more of the UX and log. Lots to go.
8 years ago
Dan Schaper 01f10b56e8 Refactor out some more reudndant code.
8 years ago
Dan Schaper 90ec0a610e Tricorder is introduced.
8 years ago
Dan Schaper 42bff1ce1b Move parse utility to be near other parsing functions.
8 years ago
Dan Schaper e3c7a1f31f Top half user output updated.
8 years ago
Dan Schaper 0debbffa70 Add a couple of parsing utility functions.
8 years ago
Jacob Salmela 473b58d26d Merge pull request #704 from stonedbovines/development
8 years ago
Dan Schaper 300001e766 Remove `listen-address` directive
8 years ago
Adam Warner 21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution
8 years ago
Dan Schaper f9570a82cc Remove glitchy daemon detection.
8 years ago
Dan Schaper 36285ead57 Just becuase this is bugging me, but I'll fix it later.
8 years ago
Dan Schaper 13e488dace Daemon check for lighttpd and dnsmasq.
8 years ago
Dan Schaper f169da8fd0 Set for quiet temporarily.
8 years ago
Dan Schaper 60741298b7 Cut more verbosity. Prep for `lsof` parsing and daemon tests.
8 years ago
Dan Schaper f73734acb0 Only check IPv6 Gateway if it exists.
8 years ago
Dan Schaper fc360abe43 Only check IPv6 if system is enabled.
8 years ago
Adam Warner 3996e11425 Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
8 years ago
Dan Schaper 98db002770 Tighten IP test reponse to user.
8 years ago
Eric Warnke f1c1caf7bd url.rewrite does not work in $HTTP block lighttpd bug #2526
8 years ago
Eric Warnke e2997b8135 Due to lighttpd bug 2526 the url.rewrite for javascript must be placed
8 years ago
Adam Warner 0d6a6b97f9 remove whitelist and blacklist scripts
8 years ago
Adam Warner 469ff45f01 create list.sh. Combines whitelist and blacklist scripts in an effort to reduce code duplication.
8 years ago
Dan Schaper 4269626f5d Attribute source for bashism.
8 years ago
Dan Schaper 8fa897aadb Add back in sourcing files (setupVars.conf) and tweak `ip_check`
8 years ago
Dan Schaper f549618d12 Move environment IPv6 interface check to `ip_check` and fix IPv6 source routing issue.
8 years ago
Dan Schaper 2fa47aaf31 Source routing is deprecated by RFC5095
8 years ago
Dan Schaper b0874fb23a Temporarily get rid of gateway sourcing from setupVars, temporarily.
8 years ago
Dan Schaper fb70fd77e8 Prototype version_check, add helper functions for logging and echo.
8 years ago
Dan Schaper 01f17f9cbb Reduce header verbosity. New header writer.
8 years ago
Adam Warner 18005ceee8 add hostname lines in 01-pihole.conf
8 years ago
Adam Warner eb52f81a5c add pi.hole entries to 01-pihole.conf
8 years ago
Adam Warner aba0d93fda Merge pull request #814 from pi-hole/promoTweaksTheSecond
8 years ago
Promofaux b49384ffe4 intent
8 years ago
Promofaux 7fb622638b flip reload logic. Do not reload if there are not changes made to blacklist.txt
8 years ago
Promofaux bd0cc134bf MERGE FAIL :ashamed_face:
8 years ago
Promofaux 476fd1f695 indentation
8 years ago
Promofaux 96053d13be Flip reload logic. Do not reload lists if no changes made to whitelist.txt
8 years ago
Promofaux c958bed418 Consistency changes. Replace MOST uses of `echo >> ${DebugLog}` with usage of `log_write` function
8 years ago
Promofaux 2b2c240d39 Fix shebang line broken in #831
8 years ago
Promofaux b79392ba2c exit after displaying white/blacklist
8 years ago
Promofaux d0826b2c33 Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
8 years ago
Marcus Hildum 5d6072524c Consistency
8 years ago
Marcus Hildum 07a66a70fc Consistency
8 years ago
Marcus Hildum 69ba8a3c2f Consistency
8 years ago
Marcus Hildum a30c75ef71 Consistency
8 years ago
Marcus Hildum d0b3727c5d Consistency
8 years ago
Marcus Hildum 6e94bf5b6d Consistency
8 years ago
Marcus Hildum 0f04e270a7 consistency
8 years ago
Adam Warner 44a36368a2 Merge pull request #822 from pi-hole/ChangeWarning
8 years ago
Promofaux c0012540ed Re-add shebang
8 years ago
Promofaux 9ab6df0e54 Merge branch 'development' into promoTweaksTheSecond
8 years ago
Adam Warner 3623183072 Remove reference to non-existent script
8 years ago
Dan Schaper e6bd979aeb Can't spell
8 years ago
Dan Schaper b5b6350cc7 Add file change warning to header
8 years ago
Marcus Hildum 0efda04920 Use heredocs instead of multiple calls to echo
8 years ago
Marcus Hildum 28eeaf201b Standardize function declaration
8 years ago
Promofaux a64f4cd871 whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
8 years ago
Promofaux a41eff1276 Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument
8 years ago
Adam Warner b66f23cfd0 account for new update script
8 years ago
Adam Warner 27d6e5d8cf Complete overhaul of update logic. Moved to seperate script
8 years ago
Adam Warner ce46c4dec4 remove prematurely added code
8 years ago
Adam Warner 013d77488a complete overhaul of version script. Now with optional arguments!
8 years ago
Adam Warner 29ad2496b6 don't output "elevating with sudo" in pihole script, just do it.
8 years ago
Adam Warner 97a013b2b7 Add direction to change upstream servers in setupVars.conf
8 years ago
Adam Warner 77808223dc remove stock comments from 01-pihole.conf and add warning to the top
8 years ago
Promofaux 8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq
8 years ago
Promofaux 7e10dcdcf0 update pihole bash-completion
8 years ago
Promofaux 090fbd04af Remove ${SUDO} usages and root checks from scripts called by `pihole` command as they should not be called directly.
8 years ago
Jakob Ackermann 28ef8068c8 add mimetype for .svg
8 years ago
Dan Schaper 9a421d510a Ignore comments in adlists.list section.
8 years ago
Dan Schaper a9c3e2c7ba Add log_write function. Update version_check to use logical conditionals.
8 years ago
Dan Schaper 7fcb40739d Close IF statement
8 years ago
Dan Schaper 5a3d319677 Add fail check to dig local and remote.
8 years ago
Dan Schaper 8466d0b681 Change NSLOOKUP to dig for resolver tests, add dnsmasq specific records check
8 years ago
Dan Schaper 5de179f1eb Remove blacklist comparison.
8 years ago
Dan Schaper 36e10595cc Change netstat to lsof.
8 years ago
Dan Schaper edd7f28104 Add internet checks to IP section
8 years ago
Dan Schaper dba1ab3fc0 Remove compareWhitelist
8 years ago
Dan Schaper 3df9c48012 Include ping statistics in default gateway checks.
8 years ago
Dan Schaper ac1c299369 Revert overzealous renaming of Pi-hole in pihole.log detection.
8 years ago
Dan Schaper 5bbb3ac49a Standardize Pi-hole naming.
8 years ago
Dan Schaper 014bdf911a Add open port detection
8 years ago
Dan Schaper 874853fe18 Add lighttpd to version check
8 years ago
Dan Schaper 274b71f8bc Relocate hostname checks
8 years ago
Dan Schaper c41d543d81 Handle lack of IPv6 gracefully.
8 years ago
Dan Schaper 7729ddab30 Mode code realignment. Handle lack of IPv6 gateway gracefully.
8 years ago
Dan Schaper 60c0e59a83 Add IPv6 intelligence to debug
8 years ago
Steve Dobinson 737b510116 Update lighttpd.conf.fedora
8 years ago
Steve Dobinson 47cba83450 Update lighttpd.conf.debian
8 years ago
Adam Warner dcedf6bfd0 Merge branch 'development' into PromoFaux-patch-1
8 years ago
Promofaux 3d5140458b Change cron job
8 years ago
Adam Warner b1a7b0a186 Update piholeDebug.sh
8 years ago
Promofaux a3ef9efd2f remove updateDashboard script
8 years ago
Promofaux 95ee3216c4 Add the newer pihole command tags to the bash auto complete!
8 years ago
Adam Warner eb201b614a Change log flush time to 00:00
8 years ago
Adam Warner 8cb2f85a08 Replace `truncate` command with `echo " " >`
8 years ago
Promofaux 01a9534729 Merge branch 'development' into UpdateMethod
8 years ago
Promofaux b3e7619048 curly brackets all the variables!
8 years ago
Victor Marquez 0121136498 Added window.close() to index.html
8 years ago
Adam Warner 95edb49bb8 Add option for uploading debug log to termbin
8 years ago
Promofaux e11ef5a7f0 Add version display script. Also checks current version on web and reports version.
8 years ago
diginc 5fb6c5b012 Making the whitelist re-block echo consistent with other WL/BL echos
8 years ago
diginc 3affa73257 Only re-block whitelist deletions if in adlists
8 years ago
Dan Schaper ce8f07750f Remove trailing slash on os-release check
8 years ago
Promofaux 61ff12e8d4 Change header to match the rest of the scripts.
8 years ago
Promofaux e942440bb7 Dan forgot this : `}`
8 years ago
Promofaux 6f068e0b9c Replace sprunge.us with termbin, which appears to be more reliable.
8 years ago
Sander 11f2524b9b Instead of an or, cat *release
8 years ago
Dan Schaper b011e5f838 Add os-release check
8 years ago
Dan Schaper f45eb84d6b Add distribution Check
8 years ago
Daniel 9b8efe1b27 Upload log to sprunge.us
8 years ago
bcambl 27a9642090 check for sudo via 'command -v' instead of dkpg-query
8 years ago
bcambl 376eb81181 SELinux Support
8 years ago
bcambl 66724826f5 moved php-fastcgi.socket to /tmp on Fedora
8 years ago
bcambl 62fa9c0f6e fixing whitespace
8 years ago
bcambl 6f2117d786 append '.debian' to lighttpd.conf for compatability
8 years ago
bcambl d67957d015 add fedora lighttpd.conf template
8 years ago
Mcat12 a16cd9aef7 Merge pull request #469 from pi-hole/web-sudo
8 years ago
Mcat12 3fda2d9ac3 Fix helpfunc not found error
8 years ago
Carter Maxwell c0e1772e21 Replace toilet with echo
8 years ago
Mcat12 f03303e5aa Add X-Pi-hole header
8 years ago
Mcat12 7bc2844b9d Remove X-Pi-hole header
8 years ago
Jim Liu 08e6f60941 Update blacklist.sh
8 years ago
Jim Liu 10066209e7 Update whitelist.sh
8 years ago
Jim Liu 81fdfcba22 Update whitelist.sh
8 years ago
Mcat12 619082dbed Merge branch 'development' into BugFix463
8 years ago
Mcat12 d7abbbfac4 Change mode of sudoer file
8 years ago
Mcat12 c714196647 Add Sudoer file for WebUI
8 years ago
Mayur Raiturkar 56ac04c48e fixed helpFunc 2
8 years ago
Mayur Raiturkar b58519b974 fixed helpFunc 1
8 years ago
Promofaux ad574f5e90 Replace kill with killall
8 years ago
Promofaux 4941a657bf remove -s switch, as it turns out it worked afterall.
8 years ago
Promofaux 3d4bff9414 Add -s switch to kill command to increase compatability
8 years ago
Adam Warner 77f4126f9b add root check to whitelist script
8 years ago
Adam Warner 4c890ab202 Add root check to blacklist script
8 years ago
Adam Warner d10e9b1b6e add pihole/webui version numbers
8 years ago
Adam Warner a6bee76581 add location of debug log output file!
8 years ago
nate 2f4f5a6ad2 Added lighttpd error.log to debug output
8 years ago
Promofaux 48fa83c9ac Fix whitespace
8 years ago
Promofaux 05e0003555 Fixes issue #453
8 years ago
Promofaux 107e0404de Move `exit 1` outside of `if` block on verbose check to stop dnsmasq reloading
8 years ago
Promofaux ab99e80333 indent
8 years ago
Promofaux 3154a378a6 Remove clear in DisplayWlist and force verbose to false to tidy up output.
8 years ago
Promofaux 8e04f1c03e Remove clear in DisplayBlist and forse verbose to false to tidy up output.
8 years ago
Promofaux c0aadeab3d fix spelling in name of variable ($versbose -> $verbose)
8 years ago
Promofaux 6c87698f1a fix spelling in name of variable ($versbose -> $verbose)
8 years ago
Justin Theberge 9a4c5cef86 fix indentations
8 years ago
Justin Theberge bdfc86f850 fix formatting
8 years ago
Justin Theberge 70dadfba28 add list options requested from issue#442
8 years ago
Adam Warner 391dea445a Move help output to function, add -h argument
8 years ago
Adam Warner e074c72130 Move help output to function helpFunc, add -h argument.
8 years ago
Promofaux 9c94af04cc Fixes #432. Thanks to @VDRrulez and @jradwan for pointing it out...
8 years ago
Promofaux 849185d3c9 Fix incorrect echo
8 years ago
Promofaux 47cc757ed0 Fix incorrect echo
8 years ago
Promofaux 0bbfb323b1 make whitelist honour pihole.conf file
8 years ago
Promofaux 4f08359786 Make blacklist honour pihole.conf file
8 years ago
nate 7e06769d44 Double quoting
8 years ago
nate 5347ee4896 Write verbose status of processes to debug log & Minor UI Fixes
8 years ago
Promofaux 97d3aedba1 Add some output to the log flush
8 years ago
nate 7f9410fd34 Added uninstall option to bash-completion
8 years ago
nate 1a2046a7eb Added uninstall option to `pihole` command. Minor fixes
8 years ago
nate 6eea9239a7 Merged branch development into PiHoleController
8 years ago
Mcat12 e97755eb91 Fix missing cats
8 years ago
nate d47fbbbe96 Mcat12 requests. Added bash-completion support
8 years ago
nate b80821c4b7 Merged branch development into PiHoleController
8 years ago
nate cf01b5a002 Readded `cat` calls to fix permission issue
8 years ago
nate bb66d559e7 Merge branch 'development'
8 years ago
nate 7b8fa3b922 Permissions changed for /etc/pihole and cleaned up some output
8 years ago
nate 28f2a1309e Merge branch 'development'
8 years ago
nate 2625d9f7fe Made piholeDebug.sh +x
8 years ago
nate 5f7c11f495 Sudo added to ifconfig to ensure it runs if debug not run as root
8 years ago
nate ec4d2d65a6 PromoFaux request: Detailed adlists.list output
8 years ago
nate f8427ab789 Merge remote-tracking branch 'refs/remotes/pi-hole/development'
8 years ago
nate fee55fa642 Added gravity.sh to the list of options
8 years ago
nate 76ea1962be Controller script, pihole.sh added
8 years ago
nate f2150ee7e1 Merge conflict resolution
8 years ago
nate 2311b42bca Merge branch 'ScriptCleanup-Dev'
8 years ago
nate a4fbccac9b Merge conflict resolution
8 years ago
nate a0cf93a7ca Merge branch 'PiholeDebug'
8 years ago
nate 8ef4c12f97 Merge branch 'ScriptCleanup'
8 years ago
nate 6145748bfb Change single echo to printf to forrect \t interpretation
8 years ago
nate 1a1026b367 Consistent stdout to match basic-install.sh and uninstall.sh
8 years ago
nate 5ee382c8eb Roll back addition of piholeDebug.sh (production master base)
8 years ago
nate 0b9e78df2c Cleaned code and added prompt for purge on uninstall
8 years ago