71133f6b59
Spelling error fix...
2016-04-02 19:42:33 -05:00
5d5d6c2c70
handle case where parent directories do not exist
2016-04-02 19:31:26 -05:00
37fa462db5
Erraneous call to SUDO removed
2016-04-02 19:24:19 -05:00
1a2046a7eb
Added uninstall option to `pihole` command. Minor fixes
2016-04-02 19:20:54 -05:00
3dff7e80fc
Fixed path to /etc/bash_completion.d/
2016-04-02 18:52:03 -05:00
6eea9239a7
Merged branch development into PiHoleController
2016-04-02 18:41:36 -05:00
75f1969bd2
Set executable permissions of `pihole` and changed installer to invoke sudo for gravity.sh.
...
Note: We invoke gravity.sh with sudo in other places, so ignore the removed comment.
2016-04-02 18:39:09 -05:00
447af208b3
Fixed missing `cp` of `piholeDebug.sh` to /opt/pihole
2016-04-02 17:59:59 -05:00
d47fbbbe96
Mcat12 requests. Added bash-completion support
2016-04-02 17:58:10 -05:00
777676b525
Made uninstall.sh and pihole.sh executable.
2016-03-31 20:33:15 -05:00
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
4b0a7c2252
Added 01-pihole.conf to be removed on uninstall regardless of removing dnsmasq
2016-03-30 20:23:24 -05:00
f8427ab789
Merge remote-tracking branch 'refs/remotes/pi-hole/development'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-29 12:57:22 -05:00
fb5bc16c83
Call gravity.sh in it's new location
2016-03-29 00:14:56 -05:00
456eee05f2
Added pihole.sh to /usr/local/bin
...
Uninstall.sh will handle removing the file
2016-03-28 18:55:37 -05:00
00b65abd09
Minor changes to reflect new tool usage
...
Removed symlink of scripts to u/l/b
Added copy for setupLCD to /opt/pihole/
New spinner added to gravity.sh to reflect new spinner in basic-install.sh and uninstall.sh
2016-03-28 18:44:54 -05:00
32dd594f06
Check if lighttpd has been uninstalled before removing conf files
...
If is still installed, then restore the original lighttpd.conf file.
2016-03-28 17:08:19 -05:00
660e71f032
Added blacklist.sh to be removed on uninstall from u/l/b
2016-03-28 16:32:42 -05:00
138aeaf8c7
Added uninstall.sh and updateDashboard.sh to be removed on uninstall from u/l/b
2016-03-28 16:25:12 -05:00
80f4bf9475
Bug fixes
...
Fixed DONE! to done!
Fixed symlinking user scripts
Fixed /n to \n
2016-03-28 16:20:23 -05:00
f444c7d4a5
Merge resolution
2016-03-28 12:21:49 -05:00
8ef4c12f97
Merge branch 'ScriptCleanup'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:21:18 -05:00
c520c55ff4
Addressed UAT issues and moved scripts to /opt/pihole
...
Symlinks now include the /etc/pihole scripts in the user's PATH.
2016-03-28 10:24:13 -05:00
8c45bd32b7
Loop through dependencies for future expansion.
...
Syntax of uninstall script now matches basic-install.sh.
More error handling of missing default files.
Force user prompt for removing packages when uninstalling.
2016-03-27 12:31:05 -05:00
2b5cee05e6
Check for existing directory before trying to perform operations on it.
2016-03-27 10:59:09 -05:00
5442954db6
Prompt user to remove each dependent package if they do choose to remove packages at all.
2016-03-27 10:58:48 -05:00
5ee382c8eb
Roll back addition of piholeDebug.sh (production master base)
2016-03-26 17:00:52 -05:00
901cb44f5e
Added /etc/.pihole/ and /var/log/*pihole* to uninstall as well as fixed missing call to removeNoPurge.
2016-03-26 16:57:34 -05:00
7388461ede
Modularized uninstall for cleanliness and robust usability.
2016-03-26 16:57:27 -05:00
5223627b71
read locks echos... reordered to warn user
2016-03-26 16:57:22 -05:00
646c4a3ccc
Newline not read correctly in prompt
2016-03-26 16:57:17 -05:00
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
2016-03-26 16:57:01 -05:00
bc09760c84
Grab changes by @rosskevin. ( #386 - lighttpd changes to handle JS files)
2016-03-24 23:19:44 +00:00
1e6ac33ef1
Fix merge conflicts
2016-03-24 23:18:14 +00:00
02bb5b6742
Revert previous change
...
Reopens #384
2016-03-20 20:50:31 +00:00
fad5fafa32
Increase disk space to verify...
...
.. was missing a couple of zeros, and not verifying enough space!
Fixes #384
2016-03-20 13:26:02 +00:00
0b5f005a5d
Added piholeDebug.sh script for advanced debugging
...
Script piholeDebug.sh added to /usr/local/bin to generate a detailed log file for debugging/troubleshooting.
2016-03-19 20:32:11 -05:00
404ea0ce6d
copy both the html and js stubs during install
2016-03-14 22:54:45 -05:00
4452f784a8
remove trailing whitespace basic-install.sh
2016-03-05 21:16:23 -08:00
adcd7f10ee
Fixed password input
2016-02-28 15:24:38 -05:00
af83936047
Added password to install
...
Saves in password.txt
2016-02-28 15:18:48 -05:00
a0673c7028
Update basic-install.sh
...
Increase required free bytes.
2016-02-21 20:38:05 +00:00
ca2d3a192c
add double bracket notation to lines 396, 399, 403 . Fixes error raised by @jacobsalmela
2016-02-21 18:38:34 +00:00
0ebb7eecdb
Verify Custom DNS IP is a valid IP address
2016-02-20 17:33:20 +00:00
800d2f0859
Add back in whiptail dialog to verifyFreeDiskSpace()
2016-02-20 16:17:29 +00:00
f397844603
Remove conflicted merge markup. Not sure how that got through.
2016-02-20 16:08:02 +00:00
2d895f328c
Fix merge conflicts
2016-02-20 15:38:39 +00:00
b14b182084
change regex to test for one or more numbers, not 0 or more numbers.
2016-02-20 15:17:57 +00:00
8687d25d88
make prepopulation of freetext on custom DNS provider a bit more intelligent
2016-02-20 15:12:13 +00:00
7001edcd1d
Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs.
2016-02-20 15:00:03 +00:00
4a1e88f4bf
Fixed Pi-hole user not being created
2016-02-20 09:48:06 -05:00
b41608d40b
Include fix for regex in verifyFreeDiskSpace()
2016-02-20 14:44:56 +00:00
3e7ecda80f
Merge pull request #242 from ChadBHowell/CBH---pihole-system-user-v2
...
Add user pihole if user does not exsist
2016-02-19 09:31:41 +00:00
8e289215b4
Account for CHIP pc not having root on '/'
2016-02-17 10:00:36 -06:00
c3c051385c
Update basic-install.sh
...
Corrected mistake in previous commit
2016-02-17 12:42:31 +00:00
c396aeed52
Correct miss-spelled variables on lines 398 and 403
2016-02-17 00:07:14 +00:00
40f541bc31
update verifyFreeDiskSpace()...
...
addresses #322 . Will now check free space on the first file system output by 'df- lkP`, as opposed to `/` to make pi-hole more compatible with other distros.
2016-02-16 23:00:48 +00:00
432e6d5395
Cleaned up output, Fixed Cancel button
2016-02-16 16:47:36 -06:00
fdf805bc7b
Merged with @slamanna212 code to add 3 new DNS providers.
2016-02-16 16:38:06 -06:00
da959e1296
Increased Size Of Whiptail Dialog
...
Increased Size of Whiptail Dialog to 5 to show all 5 DNS choices
2016-02-15 17:55:14 -05:00
94600c54cb
Added Default State for New DNS Options
...
Added default state of off for 3 new DNS options to better match existing code
2016-02-15 17:54:17 -05:00
06444c1c27
Add 3 More DNS Server Choices Durring Install
...
Added Level 3 , Norton, and Comodo DNS Choices
2016-02-15 17:31:31 -05:00
4d0b4cfb36
Update basic-install.sh
...
Do not stop dnsmasq when installing. Instead run `service dnsmasq restart` once installation is complete.
This may have been the cause of issues outlined in #218
2016-02-14 23:44:23 +00:00
3c801e5b91
Merge pull request #301 from fayetted/Issue_163-2
...
Check for 25mb of free disk space before install
2016-02-14 13:29:07 +00:00
ecd46f8560
Allow installer to specify own DNS servers
...
Offers "other" option.
Gives Installer chance to review settings before continuing.
2016-02-13 22:36:24 -06:00
b5406240c6
Fixes IPv6 surviving a reinstall
2016-02-10 19:07:48 -05:00
46d7bfecdb
Check for 25mb of free disk space before install
...
Function will check the free space of / (root)
If the free space is less than 25MB it will give directions
on how to expand the disk.
Fixes #163
2016-02-10 09:34:06 -06:00
255706e173
Bring dev branch up to date with master bug fixes
2016-02-09 20:44:49 +00:00
beb6b950f7
Replaced 'sudo' with
2016-02-08 22:26:41 +01:00
2d1c0be24e
fix reference to install log location. #282
2016-02-06 13:04:54 +00:00
9941651b3c
Addresses changes as requested by @jacobsalmela in #282
2016-02-06 13:02:21 +00:00
c93c4cc5e6
Update basic-install.sh
...
ahem
2016-02-01 22:28:35 +00:00
06cba7defd
Fix script output around new changes
2016-02-01 22:25:28 +00:00
8b76bbe51d
Merge github.com:pi-hole/pi-hole
2016-02-01 22:19:37 +00:00
aa1d3a4c2e
Fix logic in versionCheckDNSmasq, as dnsmasq.conf was being overwritten every time install was run. Fixes @kmr2319 's concern in #98
2016-02-01 22:19:17 +00:00
38e73a188a
Fix array selection
2016-02-01 02:11:55 +00:00
3fdf588cc9
Costmetic fixes, change DynDNS to OpenDNS
2016-02-01 02:09:11 +00:00
70e4104c17
Merge remote-tracking branch 'origin/development'
2016-01-31 20:47:10 +00:00
29e0e1760b
Fixes #154 #269 . No need for PR #214 any more.
2016-01-31 20:39:12 +00:00
5060ed8970
Add error checking for grep and correct typos
2016-01-30 20:51:28 -05:00
d18e064d21
Remove no longer needed change to config file
...
Config file moved, no longer needed command removed.
2016-01-30 16:30:38 -08:00
0cfb3c7ab4
Fixed config issue
2016-01-30 19:21:31 -05:00
48f9a61ff0
Updated License
2016-01-30 15:12:40 -05:00
0042e3ae02
Merge branch 'development' into CBH/UpstreamDNS
...
Conflicts:
automated install/basic-install.sh
2016-01-30 13:28:01 -05:00
b93e46de14
Update basic-install.sh
2016-01-30 14:55:02 +00:00
9e0c7ed29a
Merging from CBH bugfix
2016-01-30 14:34:12 +00:00
21a07e7419
Merge pull request #263 from pi-hole/newVersioning
...
New versioning system
2016-01-29 20:47:10 +00:00
6b50ea6504
Merge pull request #249 from pi-hole/OperationBlockListFromGravity
...
Seperate blocklist sources from gravity.sh to allow users to manage their own list of blocklists that persists through installs/upgrades
2016-01-29 19:39:11 +00:00
895647b908
Don't copy version to install dir
2016-01-29 12:32:58 -05:00
0ece58b9cb
Add version
2016-01-29 12:23:03 -05:00
49a56cf131
Start on new versioning
2016-01-29 08:25:35 -05:00
cadc506aa5
Remove extraneous whitespace from basic-install.sh
2016-01-28 09:25:00 +00:00
eee0ccef8c
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---pihole-system-user-v2
2016-01-27 22:44:14 -05:00
088bd632ab
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Descrition-for-pi-hole-v1-back-function
...
# Conflicts:
# automated install/basic-install.sh
2016-01-27 22:43:43 -05:00
60bf14d4dd
Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix
...
Force apt-get update if it has not been run today. This will stop dependency errors on a fresh install.
2016-01-27 23:43:38 +00:00
c00fb44cee
Do not force apt-get upgrade on the user. Instead, advise them. We only need to make sure apt-get update has been run
2016-01-27 23:28:36 +00:00
3d78b44a8e
Changes as in #253 , but with less commits to keep the repo tidy
2016-01-27 22:32:08 +00:00
701ae06e4a
Move copying of adlists.default to gravity.sh
2016-01-27 21:14:06 +00:00
98a0d17431
Update basic-install.sh
...
Emergency Bug fix. I take the blame for this one, it got lost in a merge!
2016-01-27 15:28:40 +00:00
ae336da7a1
Fix formatting, use consistent style, add comments
...
Fix formatting, use consistent style, add comments
2016-01-27 01:11:38 -05:00
ef99fe2d18
Add line to copy default ad list into /etc/pihole
2016-01-26 20:33:49 +00:00
80bec9c5cf
Delete install
...
Not sure how this got in here... :)
2016-01-25 16:28:26 +00:00
2b99fa81f3
Tidy up output lines around new code
2016-01-25 16:08:48 +00:00
354a42dd00
close quotes on line 318!!!
2016-01-25 12:49:04 +00:00
4cedca3427
add in a prompt to give users the option to quit installation or continue
2016-01-25 12:47:03 +00:00
e99be28a73
Variable missing $
2016-01-25 02:31:03 -08:00
32389e4ab8
Terminate string with missing quote
2016-01-25 02:27:44 -08:00
01d7fc0ac9
Removed apt-get update/upgrade, instead checking for updates availible and advising user to update/upgrade after installation of pi-hole. Addresses issue #218
2016-01-25 10:07:12 +00:00
d74c8261aa
dnsFile2="/etc/dnsmasq.conf.orig"
...
added .orig
2016-01-25 01:38:41 -05:00
ac373545d0
versionCheckDNSmasq() fixups
...
versionCheckDNSmasq() fixups per dschaper's suggestions.
2016-01-25 01:27:10 -05:00
a21948d2c6
Typo fix
...
Typo fix
2016-01-25 01:09:45 -05:00
940480effe
Revert "Fix backup to use new 01-pihole.conf location"
...
This reverts commit 0c444e6f2b
2016-01-25 00:57:36 -05:00
29c593b8b0
Add user pihole if user does not exsist
...
Check if user pihole exist and add if not. This will give pihole its
own system user without a login or home directory that is not system
dependent.
2016-01-25 00:28:53 -05:00
0c444e6f2b
Fix backup to use new 01-pihole.conf location
...
Fix backup to use new 01-pihole.conf location
2016-01-25 00:12:51 -05:00
6cf6e16d22
Add ability to choose upstream DNS servers
...
Give the user the ability to choose between Google and DynDNS upstream
servers. Then insert the chosen DNS servers in to
/etc/dnsmasq.d/01-pihole.conf. Todo: extend choices to include manually
entered DNS servers.
2016-01-25 00:11:00 -05:00
e5f9663a0e
Move dnsmasq.conf to dnsmasq.d/01-pihole.conf
...
Check if /etc/dnsmasq.conf is from pihole. If so, replace with an
original and install new in .d directory. Add and unmolested version of
dnsmasq.conf to the ./advanced directory.
2016-01-25 00:04:02 -05:00
eec14be10d
add $SUDO into spinner control.
2016-01-24 21:19:23 +00:00
c179936b54
add $SUDO
2016-01-24 20:49:37 +00:00
649a565801
run apt-get install as sudo when resolving dependencies
2016-01-24 20:35:24 +00:00
2d4ebf5eb5
FIX CONFLICTS
2016-01-24 20:29:22 +00:00
754beed3a1
Bring up to date with master
2016-01-24 20:22:41 +00:00
9f0927351d
Merge from #236
2016-01-24 18:49:25 +00:00
736edf44e4
Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today
2016-01-24 17:53:27 +00:00
8a74942da7
Cleaned up output before running gravity.sh
2016-01-24 16:41:11 +00:00
2fe42138c7
removed a space
2016-01-24 16:37:15 +00:00
1563146918
improvements to git functions (passing parameters). Added >/dev/null to attempt to supress output from apt-get upgrade
2016-01-24 16:33:53 +00:00
cf3aea8075
uncomment the apt-get update/upgrade!
2016-01-24 15:27:40 +00:00
6cea480210
Huge update! Base files now cloned from github (or updated if already existing) and copied out to the correct directories. Web admin interface is now cloned from hithub (or updated if already existing). Packages are checked before we go ahead and try to install them anyway.
2016-01-24 03:31:12 +00:00
206717828b
Improve spinner function.
2016-01-23 22:25:30 +00:00
316d26ede2
Add unzip to the dependencies
...
unzip is required for the install script to complete. Some distros do
not have it installed by default.
2016-01-23 16:29:52 -05:00
e8b8fb0835
s
2016-01-23 00:23:32 +00:00
6663ced38d
Initial commit
2016-01-23 00:13:16 +00:00
c99a8a9b15
initial commit
2016-01-22 20:30:32 +00:00
ea0fb15ff2
Move creation of pihole directory out of IPv6 function
2016-01-22 19:48:55 +00:00
05a59b17be
Changed URLs in installScripts() to match new organisation links
2016-01-22 16:50:01 +00:00
ce578534fe
Fixing minor typos in basic-install.sh
2016-01-21 11:33:49 -06:00
3f40a95929
Whoops, should probably commit more often. Massive overhaul. Cleaned up output, less verbose (will still output errors, but gets rid of anything not needed) Added a spinner so users don't think it has stalled
2016-01-20 23:34:18 +00:00
5c25c42da8
Make installPiholeWeb() more inteliigent. Checks for existence of /var/www/html/pihole, and only downloads from repo if it does not exist. Will stop install script from overwriting any tweaks users have made to index.html
2016-01-20 22:14:17 +00:00
96011bc2ae
make InstallWebAdmin() a bit more intelligent, and less verbose. Checks if installing over an existing installation, and if so, will remove existing webadmin folder.
2016-01-20 22:02:54 +00:00
4f59577fd1
Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root
2016-01-20 21:20:52 +00:00
bc51f88805
Check if any list.* files exist from previous installation, if they do delete them.
2016-01-19 22:52:29 +00:00
0a0f00da3b
fixes #169
...
exits if sudo is not installed when run as a regular user
2016-01-16 14:10:03 -06:00
bee109c784
better uninstall
...
More from JoshKastang. This closes #153 as it is the last step from
his ideas.
2016-01-16 13:56:08 -06:00
5d608a2db5
leave system cron alone
...
Taking JoshKastang’s idea from #153 , the system cron file will be left
alone and the pihole.cron gets its own.
2016-01-16 13:48:29 -06:00
7c6ef0cfd0
privileged install
...
This puts sudo in a variable if run as a regular user. If already
running as root, the script proceeds as normal. Not a perfect fix, but
should help for install on other systems.
2016-01-16 13:40:09 -06:00
0cf859344a
Merge pull request #176 from xd1936/patch-1
...
Install Figlet Fonts with Toilet
2016-01-16 13:19:15 -06:00
6125b2520b
install git for updateDashboard.sh
...
I also download and chmod the script
2016-01-16 13:15:44 -06:00
bd5ed2bcf0
move webinterface.sh into scripts folder
...
I also renamed it to make it is easier to identify.
2016-01-16 13:12:55 -06:00
665dfdfe8e
Install Figlet Fonts with Toilet
...
Some OS' don't have Figlet Fonts, which causes `chronometer.sh` to have `error: font small not found` instead of the pretty "Pi-hole" display
2016-01-15 18:50:32 -05:00
6b1f14647c
add reference to blacklist.sh
2016-01-15 15:52:27 +00:00
nate
Promofaux
Adam Warner
Kevin Ross
Carter Maxwell
Mcat12
Daniel Fayette
slamanna212
Sergio G
Dan Schaper
Chad Howell
Dan Schaper
Adam Warner
Kenneth Koski
jacobsalmela
Leo