Commit Graph

605 Commits (7a1a2dec678c997daff6e6693cdd1d8d4c89d410)

Author SHA1 Message Date
diginc b4524839bb Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests
8 years ago
Eric Warnke fb5ac6d6d7 We should prefer the php metapackage if it's there, falling back on php5 if it's not
8 years ago
Eric Warnke 4e7ca51beb Added dependancy for ping and lsof used in debug scripts
8 years ago
Eric Warnke 65e0fcbf10 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
8 years ago
Dan Schaper e22aca49c8 Merge pull request #813 from das7pad/development
8 years ago
Adam Warner 21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution
8 years ago
Promofaux 794fa21137 install uninstall.sh...
8 years ago
Eric Warnke 977d1d1998 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
8 years ago
Promofaux cde003bc98 \ all the /s!
8 years ago
Adam Warner 3996e11425 Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
8 years ago
Eric Warnke 3a4fe3e391 Wheezy install fix by selecting appropriate deps, made the php check the same
8 years ago
Eric Warnke 4ed6e4d016 Tiny screens get sane minimums
8 years ago
Eric Warnke ac8d24a1ce Even with no detected screen size, it should presume 80x24
8 years ago
Eric Warnke fc776921d5 stty is more compatible and does not require any additional dependancies for busybox
8 years ago
Adam Warner 55a653aca4 clear out /opt/pihole folder before installing scripts
8 years ago
Adam Warner bd0db56ba0 actually fix up logic
8 years ago
Adam Warner 95f0b3710d fix up logic
8 years ago
Adam Warner 86349527e7 replace HOSTNAME tokens in 01-pihole.conf
8 years ago
Adam Warner 911053f63f Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution.
8 years ago
Marcus Hildum 519d731ddd Fix missing newline
8 years ago
Marcus Hildum 21b906e0e0 Consistency
8 years ago
Marcus Hildum 28eeaf201b Standardize function declaration
8 years ago
Jakob Ackermann 8872594ab9 create upload dir for lighttpd
8 years ago
Adam Warner ff5d5b97c3 stash any changes in local repo
8 years ago
Dan Schaper ef3c13fe2b Refire with curl
8 years ago
bcambl fb9664b636 fix typo
8 years ago
bcambl ee114b3075 use an excluded extension for ifcfg backup
8 years ago
Promofaux 5792fc0bef change wording depending on choice
8 years ago
Promofaux 42c93917ef bug I forgot to fix before piholeUpdate was merged to development
8 years ago
Adam Warner df30a4c0d1 Merge pull request #779 from bcambl/fedora_fixes
8 years ago
Adam Warner 9ce13f0035 Merge pull request #790 from pi-hole/piholeUpdate
8 years ago
Promofaux 3884b01503 Forgot a ` `
8 years ago
Promofaux a84c3adeab if uniformity then dan = happy
8 years ago
Promofaux a65b784907 repeat after me: repetition is a bit repetitive.
8 years ago
Promofaux 05dadad2e1 repair sounds better than refresh
8 years ago
Promofaux 3a9b39b842 adjust text in update_dialogs() whiptail
8 years ago
Promofaux e612003293 handle arguments better, convert to flags, echo when they're set to true.
8 years ago
Promofaux a43577fa26 add reconfigure flag to -r command
8 years ago
Promofaux a6fa60868b spacing
8 years ago
Promofaux 99878ae7d6 reflect name change of some of the variables in setupVars
8 years ago
bcambl 26202014a2 stdout formatting
8 years ago
bcambl f4f8b96788 remove systemd selinux rules on init systems
8 years ago
bcambl e5ede16749 update yum/dnf package count grepfu
8 years ago
bcambl fbe3547129 EPEL is not required on Fedora
8 years ago
diginc a03caea549 setupVar tests passing for debian & centos
8 years ago
Promofaux aa23fb1d56 choose*
8 years ago
Dan Schaper 570611fc09 CentOS Firewall fix
8 years ago
Dan Schaper 94dd5b1ebe More CentOS fixes.
8 years ago
Dan Schaper 74524e024d Always check PIHOLE_dependencies.
8 years ago
Dan Schaper e42b6dcc8e create_pihole_user update @diginc.
8 years ago
Dan Schaper d71b799e75 More cleanups, localize variables, clean formatting.
8 years ago
Dan Schaper 87e7121332 Gravity.sh checks for null value for variables, obliging that expectation.
8 years ago
Dan Schaper 94f6354c94 Spinner blocks `set -e` trying to get it in functions that won't crash out...
8 years ago
Dan Schaper b79059ebdb Start to add the spinner back in!
8 years ago
Dan Schaper 4f98c1bebb Boolean operators inside quotes don't work well...
8 years ago
Dan Schaper 2feec01e10 Add `start_service` and `enable_service` functions to handle restating services and setting services to start on reboot.
8 years ago
Dan Schaper 72b95e192e Fix logic bug in `setup_user`, update how setupVars are sourced so they will only be used if the user selects `update` and not if they select `install`.
8 years ago
Dan Schaper 47aad254d8 localized some more variables
8 years ago
Dan Schaper bc14074d2a Tighten up Update Whiptail appearance.
8 years ago
Dan Schaper 5ab5b1a190 Overhaul dnsmasq version 3 way handshake configuration files.
8 years ago
Dan Schaper b055f190f5 Factor out interfaces detection.
8 years ago
Dan Schaper 84b8953352 Remove quiet flags from package managment variables. Set quiets in functions by redirecting output.
8 years ago
Dan Schaper 93a591d487 Linting from ShellCheck
8 years ago
Dan Schaper e6c0f38a7c Monolithic changes in one commit again.
8 years ago
Dan Schaper f107ae4f9b Merge conflict resolution
8 years ago
Dan Schaper bad7a08804 Refactor and rename `create_pihole_user`. Now to actually use the user created...
8 years ago
Dan Schaper 25cbf4cb35 Factor out legacy location script removal.
8 years ago
Dan Schaper 7f179f9a58 Remove sourcing bash completion, would fall off as soon as the subshell terminated.
8 years ago
Dan Schaper 5287ea8537 Refactor `stopServices` into `stop_service` and accept arguments for service to stop. Quiet output from a few other functions.
8 years ago
Dan Schaper 43e2aaebf0 rename `updateDialogs` to `update_dialogs`
8 years ago
Dan Schaper e60eb66283 UpdateDialogs are now a Whiptail Menu, self-explanatory.
8 years ago
Dan Schaper ca59b808d8 Git clone/update now occurs right after installer dependency checks. Allows for inclusion of installer source files in the repo. Passes `set -e`
8 years ago
Dan Schaper 8a15fd44d5 Update `is_repo()` to use `git status` for validity checks.
8 years ago
Dan Schaper dac2b8942e Typo fix to generate commit.
8 years ago
Dan Schaper 54a1c5b63a Revert inadvertent commits
8 years ago
Dan Schaper 61b02bf6d3 Add OR TRUE to PKG_COUNT so that a 0 package to update doesn't grep -c to an exit value of 1.
8 years ago
Dan Schaper 9d048b2fdf Move Pi-hole dependency checks to `main()` and out of duplicated `install` and `update` functions. Bring them up a level in the subshells.
8 years ago
Dan Schaper d9e28a7422 factor out `installer_dependencies`
8 years ago
Dan Schaper 1fecdf42ca Move `git` to installer deps, refactor some functions.
8 years ago
Dan Schaper d4bf85b67c Self contain `package_check` into `package_check_install`. Passes `set -e` test.
8 years ago
Dan Schaper 7131ff27c3 Attempt to `set -e`
8 years ago
Dan Schaper a30f78c1c8 Oneliner php version check, passes `set -e` check.
8 years ago
Dan Schaper 7e0afffca8 Revert inadvertent commits
8 years ago
Dan Schaper 293c60fb9c Exit script on failure to install dependent package.
8 years ago
Dan Schaper f5be8b2a5e Single dependency package check function, will exit if any errors with message to update cache.
8 years ago
Dan Schaper 6772603c15 Relocate cache check to its own function
8 years ago
Jacob Salmela a22904f99b Merge pull request #769 from pi-hole/Fix/PackageCacheFresh
8 years ago
Dan Schaper b157bc5cd7 Fixes #768 Check the staleness of the package index instead of the package cache.
8 years ago
Dan Schaper 10e1a03c76 `runGravity` is called after `finalExports` in the Debian install side.
8 years ago
Dan Schaper d20df92e9f Script will now run as root, removed `sudo` from function calls.
8 years ago
Dan Schaper 44170207ac Add `main` function and fire script from `main` call. Prevents script from running before it is entirely downloaded.
8 years ago
Dan Schaper 33745be745 Merge pull request #753 from pi-hole/feature/RemoveBarePHP
8 years ago
Adam Warner 6a28070017 Too many `-`s
8 years ago
Dan Schaper 91b948332e Merge pull request #754 from pi-hole/fix/bashConditional
8 years ago
Dan Schaper d1a7fe2d44 fix/bashConditional
8 years ago
Dan Schaper c39324d11f Remove bare php package from dependencies
8 years ago
Dan Schaper 8c151c62ce echo's don't need sudo
8 years ago
Dan Schaper 50d16d8215 Finish `install` conversion for installScripts()
8 years ago
Dan Schaper 3bbac9a5f2 `install` pihole
8 years ago
Dan Schaper 3600fd277e Don't need `sudo` to echo to term.
8 years ago
Dan Schaper e8bb4a7e36 Continue migration to `install`
8 years ago
Dan Schaper 36987cb1cc Continue migration to `install`
8 years ago
Dan Schaper 5382b4fa37 Change installScripts to use install
8 years ago
Promofaux c281b47905 Mover {SUDO} mkdir -p /etc/pihole/ back to the beginning.
8 years ago
Promofaux aca5064743 --force seems to light. lets try --i_do_not_follow_recommendations
8 years ago
Promofaux 6f780316c4 remove whiptail dependency from verifyFreeDiskSpace.
8 years ago
Promofaux 4e262d81f0 wrap these vars in {} to matcht he rest of the script
8 years ago
Promofaux 6c2ff950ee remote duplicate ${SUDO} mkdir /etc/pihole
8 years ago
Promofaux 7684069d0b verifyFreeDiskSpace BEFORE installing any dependencies
8 years ago
Promofaux 73c85ae68a remove duplicate calls to installConfigs
8 years ago
Promofaux 6a8bef83b3 Fix the php version check command (Thanks @diginc!)
8 years ago
Adam Warner 3fc3c5cae4 Add iproute2 to fix #653
8 years ago
Adam Warner daa5366b57 Check if php5 is available in apt-cache, if so install it, else just install php
8 years ago
Dan Schaper ac8d295bb9 Merge pull request #668 from bcambl/dns-hostname-fixes
8 years ago
bcambl 21d4199a38 Merge branch 'development' into dns-hostname-fixes
8 years ago
Adam Warner 655c422c3c Add additional instruction.
8 years ago
Dan Schaper 5ca6599ca9 Merge branch 'development' into gravTweak
8 years ago
Promofaux f16574085f remove code made redundant by the existence of /etc/pihole/setupVars.conf
8 years ago
Promofaux a0977af081 remove references to UpdateDashboard.sh
8 years ago
Adam Warner c2cb92a0b0 Add cron to apt-get dependencies
8 years ago
bcambl 6c0c6182e9 fix newline in configureSelinux stdout
8 years ago
bcambl 05ad4445b5 add dns to sysconfig interface configuration
8 years ago
bcambl 1dd9f0747e add gateway to interface configuration
8 years ago
Promofaux 04c60e8a1c Switch fedora and debian install check order
8 years ago
Promofaux 01a9534729 Merge branch 'development' into UpdateMethod
8 years ago
Promofaux 344e63c2dc Add undocumented argument to install script ("pihole") which allows the pihole command to run the update script without prompting the user. Useful for update automation
8 years ago
Promofaux e4295f5d3c Move exporting the setupConf files to a function to be run at the end of the script only. If script is cancelled, then they are not written. Simples.
8 years ago
Daniel (Fourdee) 49ded54306 Minor - Update descriptions
8 years ago
Daniel (Fourdee) 6c0a8a4337 Minor - Corrected var names
8 years ago
Promofaux d217626318 If an existing install is detected, offer the user a choice of Updating or Installing with a radio list whiptail.
8 years ago
Promofaux ed94f4b1df Create directory before trying to create a blank file in it....
8 years ago
Promofaux a57b097afc Change echos at the end of install depending on install or update
8 years ago
Promofaux eb42b894c4 Delete setupVars.conf if user cancels out of install process.
8 years ago
Promofaux 7eb43a0b47 Expand update dialog text
8 years ago
Promofaux fdb104348c Add updatePihole method
8 years ago
Promofaux f54828352d remove spaces from update bool set
8 years ago
Promofaux cc157def63 remove --defaultyes from update whiptail
8 years ago
Promofaux 8fc83655ab correct filename spelling mistake
8 years ago
Promofaux 9fb549293a APPEND
8 years ago
Promofaux e4cc5b5b70 testing a new update method by detecting the existence of vars saved from install
8 years ago
Daniel (Fourdee) 037318e2ff Provide non-zero exit code, as per existing sourcecode.
8 years ago
Daniel (Fourdee) a9a499939e Fourdee - See notes:
8 years ago
Promofaux 9cb4e8bde8 Merge remote-tracking branch 'origin/Debug_Options' into Debug_Options
8 years ago
bcambl fe8d0f8ea8 Merge branch 'development' into sysconfig_gateway
8 years ago
Promofaux 2bc364023a Remove erroneous space in chmod command
8 years ago
Promofaux 57df56dc62 Add version.sh to the install script
8 years ago
Promofaux 66ff9a24c6 Add piholeDebug to the chmod 755 command in install script. Not sure how that went missing...
8 years ago
bcambl 8550b76e23 add gateway to interface configuration
8 years ago
Blayne Campbell c647e27e15 Merge branch 'development' into centos-nc
8 years ago
Adam Warner 73645f299a Merge branch 'development' into bugfix/dhcpcd_comments
8 years ago
bcambl a32ad0dbf2 fix centos nc dependency
8 years ago
Promofaux e106ff0fef Add netcat to dependencies for termbin.com. Should be installed by default, but JUST IN CASE.
8 years ago
Dan Schaper f0a2248c81 Change comment to hash
8 years ago
Daniel 2b0ba281a4 Repairs apt-get incorrect options
8 years ago
Dan Schaper 024b741552 Merge pull request #490 from bcambl/fedora-armhf7
8 years ago
Mcat12 1f130b6550 Fix missing permissions on piholeIP
8 years ago
bcambl fa89bd830a re-order when SELinux gets configured
8 years ago
bcambl 3ba05d0274 configure static IP on Fedora via sysconfig script
8 years ago
bcambl 0d9a8d70bf configureSelinux prior to installPihole
8 years ago
bcambl 5c79184d3b add ifconfig dependency for Fedora install
8 years ago
bcambl 3d619d9ccc fix iptables udp rule
8 years ago
bcambl afdf3ae7a1 add sudo package to PIHOLE_DEPS
8 years ago
bcambl d0b6ff2d08 add udp port 53 to iptables/firewalld configuration
8 years ago
bcambl 97737ee9e3 move SELinux config to installPihole() for logging
8 years ago
bcambl 5e27ccc37c firewalld: specify ports and use default zone
8 years ago
bcambl 682113892a enable SELinux boolean for httpd server side includes (SSI)
8 years ago
bcambl 376eb81181 SELinux Support
8 years ago
bcambl 4fc40d96d9 ensure firewalld is running before configuration
8 years ago
bcambl e6634531c7 basic firewalld/iptables configuration
8 years ago
bcambl 04e375a523 enable lighttpd and dnsmasq via systemd
8 years ago
bcambl 65638973ea correct dhcpcd package name to dhcpcd5
8 years ago
bcambl 9c26bdd676 ensure fastcgi socket directory and permissions
8 years ago
bcambl b31931c907 add epel-release for CentOS support
8 years ago
bcambl c74af2c21f warn if lighty-enable-mod utility is not available
8 years ago
bcambl c160b2e54b fix lighttpd user/group variables
8 years ago
bcambl c4234f4542 ensure ownership/existence of /var/cache/lighttpd/compress
8 years ago
bcambl 62fa9c0f6e fixing whitespace
8 years ago
bcambl 8198f06073 ensure dnsmasq conf-dir is configured for /etc/dnsmasq.d
8 years ago
bcambl 6f2117d786 append '.debian' to lighttpd.conf for compatability
8 years ago
bcambl b3ec3b487c add Fedora dependency: lighttpd-fastcgi
8 years ago
bcambl 94f131a0b7 update deps and package manager variables
8 years ago
bcambl 7af0029175 check for systemctl for systemd service management
8 years ago
bcambl f4228b04f8 additional fedora dependancies
8 years ago
bcambl ffaf243160 split dependency installations into two separate functions
8 years ago
bcambl 29d48bbd9a move IP/route discovery to a function
8 years ago
bcambl 37dda79db2 install dependencies for install script
8 years ago
bcambl 063e3e85e1 Fedora compatibility variables and dependencies
8 years ago
bcambl 42afaa9f66 remove dpkg-query dependency from sudo check
8 years ago
Jacob Salmela 13a479a9f6 tell user to run as root
8 years ago
Jacob Salmela 1194e48bd8 install sudo
8 years ago
Jacob Salmela 1e0666d1ef make folder so file can be deployed
8 years ago
Jacob Salmela 1c53ad6876 mcat is smarter than me
8 years ago
Jacob Salmela dc2a537f6b copy sudoers file
8 years ago
Mcat12 a16cd9aef7 Merge pull request #469 from pi-hole/web-sudo
8 years ago
Mcat12 6cf446032f Show web interface URL after install
8 years ago
Mcat12 d52a8f08ed Merge pull request #501 from davidtorcivia/development
8 years ago
David Torcivia b7e27bf6b4 Fix basic install for Proxmox LXC
8 years ago
Carter Maxwell c0e1772e21 Replace toilet with echo
8 years ago
Jim Liu 00cc480bc1 Update basic-install.sh
8 years ago
Jim Liu 221b72439b Update basic-install.sh
8 years ago
Mcat12 09cdf5081c Install sudoer file
8 years ago
nate 22ea384ac8 Fix whiptail spacing
8 years ago
nate 69e8c014c3 Indentation fix
8 years ago
Promofaux 2d08217173 Tidy up For loops, clean up whitespace
8 years ago
Promofaux 36645d9335 Add check for existing files in /usr/local/bin left over from previous version, as those scripts are replaced with `pihole <command>` script.
8 years ago
Promofaux ad8573c739 Pedantic change, stops my editor from treating all of the code as one long sting in `' '` (as the `'` was escaped with `\`)
8 years ago
nate 71133f6b59 Spelling error fix...
8 years ago
nate 5d5d6c2c70 handle case where parent directories do not exist
8 years ago
nate 37fa462db5 Erraneous call to SUDO removed
8 years ago
nate 1a2046a7eb Added uninstall option to `pihole` command. Minor fixes
8 years ago
nate 3dff7e80fc Fixed path to /etc/bash_completion.d/
8 years ago
nate 6eea9239a7 Merged branch development into PiHoleController
8 years ago
nate 75f1969bd2 Set executable permissions of `pihole` and changed installer to invoke sudo for gravity.sh.
8 years ago
nate 447af208b3 Fixed missing `cp` of `piholeDebug.sh` to /opt/pihole
8 years ago
nate d47fbbbe96 Mcat12 requests. Added bash-completion support
8 years ago
nate 28f2a1309e Merge branch 'development'
8 years ago
nate f8427ab789 Merge remote-tracking branch 'refs/remotes/pi-hole/development'
8 years ago
Nate fb5bc16c83 Call gravity.sh in it's new location
8 years ago
nate 456eee05f2 Added pihole.sh to /usr/local/bin
8 years ago
nate 00b65abd09 Minor changes to reflect new tool usage
8 years ago
nate 80f4bf9475 Bug fixes
8 years ago
nate f444c7d4a5 Merge resolution
8 years ago
nate 8ef4c12f97 Merge branch 'ScriptCleanup'
8 years ago
nate c520c55ff4 Addressed UAT issues and moved scripts to /opt/pihole
8 years ago
Nate 8c45bd32b7 Loop through dependencies for future expansion.
8 years ago
Nate 2b5cee05e6 Check for existing directory before trying to perform operations on it.
8 years ago
Nate 5442954db6 Prompt user to remove each dependent package if they do choose to remove packages at all.
8 years ago
nate 5ee382c8eb Roll back addition of piholeDebug.sh (production master base)
8 years ago
Nate 901cb44f5e Added /etc/.pihole/ and /var/log/*pihole* to uninstall as well as fixed missing call to removeNoPurge.
8 years ago
nate 0b9e78df2c Cleaned code and added prompt for purge on uninstall
8 years ago
Promofaux bc09760c84 Grab changes by @rosskevin. (#386 - lighttpd changes to handle JS files)
8 years ago
Promofaux 1e6ac33ef1 Fix merge conflicts
8 years ago
Adam Warner 02bb5b6742 Revert previous change
8 years ago
Adam Warner fad5fafa32 Increase disk space to verify...
8 years ago
nate 0b5f005a5d Added piholeDebug.sh script for advanced debugging
8 years ago
Kevin Ross 404ea0ce6d copy both the html and js stubs during install
8 years ago
Carter Maxwell 4452f784a8 remove trailing whitespace basic-install.sh
8 years ago
Mcat12 adcd7f10ee Fixed password input
8 years ago
Mcat12 af83936047 Added password to install
8 years ago
Adam Warner a0673c7028 Update basic-install.sh
8 years ago
Promofaux ca2d3a192c add double bracket notation to lines 396, 399, 403 . Fixes error raised by @jacobsalmela
8 years ago
Promofaux 0ebb7eecdb Verify Custom DNS IP is a valid IP address
8 years ago
Promofaux 800d2f0859 Add back in whiptail dialog to verifyFreeDiskSpace()
8 years ago
Promofaux f397844603 Remove conflicted merge markup. Not sure how that got through.
8 years ago
Promofaux 2d895f328c Fix merge conflicts
8 years ago
Promofaux b14b182084 change regex to test for one or more numbers, not 0 or more numbers.
8 years ago
Promofaux 8687d25d88 make prepopulation of freetext on custom DNS provider a bit more intelligent
8 years ago
Promofaux 7001edcd1d Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs.
8 years ago
Mcat12 4a1e88f4bf Fixed Pi-hole user not being created
8 years ago
Promofaux b41608d40b Include fix for regex in verifyFreeDiskSpace()
8 years ago