arno
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole
1
0
Fork 0
Code Issues Releases Wiki Activity
2418 Commits
14 Branches
108 Tags
34 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ecde222512'
${ noResults }
Commit Graph

673 Commits (ecde2225122904a89543712ec8f2b0fd1da26ff6)

Author SHA1 Message Date
Dan Schaper ea5ee7b0f9
Execute gravity in same shell as installer, don't subshell it.
8 years ago
DL6ER bc8cf1b2d8
Fixed wrong indentation
8 years ago
DL6ER bb28d94884
Merge branch 'development' into customblockpage
8 years ago
Blayne Campbell 8f402f5c77 Merge pull request #1009 from bcambl/fix_1004
8 years ago
DL6ER 60054da582
Add lighttpd user (OS dependent) to sudoers file
8 years ago
bcambl cbf84c1840 replace subshell with command chain
8 years ago
bcambl c9c28cb59a replace 'git -C' with long version
8 years ago
Dan Schaper 4244f716e0
Create /opt/pihole before trying to install into it.
8 years ago
DL6ER c48e6c91f5 Merge pull request #999 from pi-hole/fix/install_deps_exit
8 years ago
DL6ER 8841bdd252
Reset the if's
8 years ago
DL6ER 58261098fb
We should not call a function that Dan deleted
8 years ago
DL6ER 9432d3035a
Merge branch 'development' into cleanup/remove_legacy_detect
8 years ago
DL6ER 9907fc2770
Merge branch 'development' into fix/install_deps_exit
8 years ago
Dan Schaper 8117ec8e20
Remove v1 legacy detection code.
8 years ago
Dan Schaper ff2783f9fc
Tabs to spaces and formatting.
8 years ago
Dan Schaper 156a51c945
Remove extra display only variable.
8 years ago
Dan Schaper c72ffae4a2
Don't install extra packages (openresolv was installed over resolvconf). No longer need --fix-missing.
8 years ago
Dan Schaper 7f3b0030ea
LF
8 years ago
Dan Schaper 9a626948f8
Use debconf for Deb/Ubu package installations.
8 years ago
Dan Schaper 5c43df66a8
Remove spinner function, masked return values.
8 years ago
Dan Schaper d0e3c546f8
CRLF to CR (Win to Unix line endings)
8 years ago
Dan Schaper 8cb01cdd29
One step to rename variables.
8 years ago
Adam Warner 10982a0f45 Merge pull request #990 from pi-hole/dontkillsetupVars.conf
8 years ago
DL6ER d4c378ed5d Remove PIHOLE_INTERFACE if already set (not PIHOLE_DOMAIN)
8 years ago
DL6ER 7872f68a45 Only try to remove parts inthe file if the file already exists
8 years ago
DL6ER ec8c848106 Don't kill already existing setupVars.conf on update (and fresh install)
8 years ago
Mcat12 3b50ce8c54 Merge pull request #977 from pi-hole/activatewebUIpw
8 years ago
DL6ER 1eeaa01234 Always put the information that we added a password if we did (not only on update but also on fresh install)
8 years ago
DL6ER e2898217d2 Made message shorter
8 years ago
DL6ER f81dadc5d0 Fix final message
8 years ago
Promofaux c10ec5548f remove code that replaces tokens in 01-pihole.conf
8 years ago
Mcat12 92f4824884 Automatically enable IPv6
8 years ago
DL6ER a00034a6a7 Add password to webUI after update if there is none
8 years ago
DL6ER 5374f652dd No need to modify lighttpd config file, since we overwrite it anyways
8 years ago
DL6ER a866c4e388 Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories
8 years ago
DL6ER e7241a989c Include CSS file
8 years ago
DL6ER b246dba7e7 Rename index.html to index.php
8 years ago
trinapicot 870454330d Add check for lighty.conf before trying to move it
8 years ago
Dan Schaper d53a3af191 Merge pull request #899 from diginc/configureFirewall_unittest
8 years ago
Dan Schaper e9475a9739 Merge pull request #887 from brontide/dependancy_cleanup
8 years ago
bcambl 0caa44e979 write ifcfg instead of appending
8 years ago
diginc b9f3493dbc move PH_TRUE to Dockerfiles to DRY
8 years ago
diginc 633095aee1 switch to consistent style
8 years ago
Eric Warnke 71005e1db3 Merge with change of spacing in development
8 years ago
Promofaux c452a4569e .js
8 years ago
Promofaux a182a208dc Tidy up output
8 years ago
Promofaux d273b4b48b Check for missing index.html, replace if missing.
8 years ago
Promofaux b429e890ad move web interface message inside "if not update" block. Check for pi-hole deps AFTER whiptails
8 years ago
Dan Schaper 6d415a7384 Merge pull request #894 from diginc/InstallFixes_UnitTests
8 years ago
Dan Schaper 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Adam Warner 50bd8b4a09 Further tweaks to local repo handling
8 years ago
Dan Schaper 7740e4268c Consistency and standards basic-install start.
8 years ago
Adam Warner 3df2ef8587 Cherry picking f6f6f6d, conflict fix
8 years ago
Adam Warner 354309fcad set QUERY_LOGGING default to true
8 years ago
Adam Warner edd00e8e70 consistency
8 years ago
Adam Warner 82e7de2aaa Account for variable name changes
8 years ago
Adam Warner b723714c0c Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names
8 years ago
Adam Warner a2903b6e63 Consistency
8 years ago
Dan Schaper 9a1876571b Prototype `whiptails` so they don't fall to shell. Need to do this to all functions.
8 years ago
Dan Schaper c07d7165ab Global variables CAP'ed
8 years ago
Dan Schaper d695c5972f `local` variables just to be safe and make sure they stay in this function.
8 years ago
Dan Schaper bbc09ed313 Swap variable names.
8 years ago
Promofaux 617a147706 Wording adjustment
8 years ago
Promofaux d4dccfdb2d Cherry pick 229439c
8 years ago
Dan Schaper d9528dfd09 Bash is funny with returns.
8 years ago
Dan Schaper 12f5f8ba00 Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code.
8 years ago
Dan Schaper db0f3307e0 Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs.
8 years ago
Dan Schaper 7a22471787 New naming convention, and reorder functions as bash would prefer them to be.
8 years ago
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