Commit Graph

361 Commits

Author SHA1 Message Date
Jacob Salmela 464003d674 uninstall script
This should remove the Pi-hole.
2015-11-25 13:36:39 -08:00
Cole Turner 03bbef07b5 pinholeIP should only use one IP
Updated piholeIP because if there are multiple network adapters, the gravity list will populate incorrectly with both IP addresses. Only one address should be used.
2015-11-25 13:36:39 -08:00
Jacob Salmela ecb514dd0a pihole in the cloud link 2015-11-25 13:36:39 -08:00
Jacob Salmela 04f6c478cc Updated install instructions
Also a screenshot of the dialog-based installer
2015-11-25 13:36:39 -08:00
Dan Schaper 20399b8262 Build array of active domains to concatenate
Fix #86 Builds an array of active domains, and then loops through that list to pick files to concatenate after truncating Matter.
2015-11-23 13:12:11 -08:00
Dan Schaper e2b518568e Forgot to start the directory check function 2015-11-23 12:39:47 -08:00
Dan Schaper 100cbd4032 Merge pull request #7 from dschaper/upstream
Upstream
2015-11-23 04:56:40 -08:00
Dan Schaper 673113cb98 Merge pull request #6 from jacobsalmela/master
Upstream sync
2015-11-23 04:55:57 -08:00
Dan Schaper a5d29a1048 Fix function ordering
Unique is now called after the comments are scrubbed from the unified domain list.
2015-11-23 03:26:10 -08:00
Dan Schaper 4f1bb12d36 More functions
Splitting into more functions
2015-11-23 03:11:16 -08:00
Dan Schaper 3d22e3bb7d Merge pull request #5 from dschaper/refactor
Code refactoring
2015-11-23 02:55:49 -08:00
Dan Schaper af909e0ee6 Copyright issues
Some of the blocklists are copyright and need to be pulled and stored as is. They can be processed further in the script to remove comments.
2015-11-23 02:52:12 -08:00
Dan Schaper fe46afd08d More functions
More refactoring
2015-11-23 01:47:24 -08:00
Dan Schaper a1e609d005 Ugly hack permissions
Temporary hack for /etc/pihole directory and file permissions to pull out sudo requirement. (Irony is that is requires sudo.) This will be fixed later, but for now it's needed for existing installs so they don't break.
2015-11-23 01:16:00 -08:00
Dan Schaper 668d14e32d Add functions
Start to add functions for code reuse
2015-11-23 00:36:01 -08:00
Dan Schaper f02c37ec07 Start code refactor, eliminate some repetitive code
Begin code refactor prepatation, prevent DRY where possible.
2015-11-22 23:49:38 -08:00
Jacob Salmela 4e50a03dfc uninstall script
This should remove the Pi-hole.
2015-11-21 13:29:03 -06:00
Jacob Salmela a3a244c4af Merge pull request #82 from colepatrickturner/master
pinholeIP should only use one IP
2015-11-21 12:56:25 -06:00
Cole Turner d0e9e90ebe pinholeIP should only use one IP
Updated piholeIP because if there are multiple network adapters, the gravity list will populate incorrectly with both IP addresses. Only one address should be used.
2015-11-20 22:53:43 -05:00
Jacob Salmela 1578a28363 pihole in the cloud link 2015-11-19 19:36:34 -06:00
Dan Schaper 9c13d2d88b Merge pull request #3 from jacobsalmela/master
Upstream sync
2015-11-18 02:17:11 -08:00
Jacob Salmela b005da395f Updated install instructions
Also a screenshot of the dialog-based installer
2015-11-15 20:54:15 -06:00
Jacob Salmela 1b47a42792 Merge pull request #74 from dschaper/CherryPick
Cherry pick from PR73
2015-11-15 08:40:09 -06:00
Jacob Salmela d477021532 Merge pull request #75 from dschaper/ConflictBreaker
Resolve merge conflicts
2015-11-15 08:39:38 -06:00
Dan Schaper b895235ec1 Merge pull request #2 from dschaper/ConflictBreaker
Resolve merge conflicts
2015-11-15 06:02:27 -08:00
Dan Schaper 3a01b370d3 Merge pull request #1 from dschaper/CherryPick
Cherry pick
2015-11-15 06:01:58 -08:00
dschaper 689426180a Resolve merge conflicts 2015-11-15 13:59:51 +00:00
Jacob Salmela d0d165ad16 chmod the log flusher 2015-11-15 13:14:56 +00:00
Jacob Salmela 0cb20fc080 typo 2015-11-15 13:14:46 +00:00
Jacob Salmela dee3df4e11 download master gravity 2015-11-15 13:14:33 +00:00
Jacob Salmela 814873c643 reboot logic 2015-11-15 13:14:22 +00:00
Jacob Salmela 0936e394d4 reboot only if new IP was set 2015-11-15 13:14:07 +00:00
Jacob Salmela ad91eb44fb choose an interface
also fixing ipv6 logic
2015-11-15 13:13:21 +00:00
Jacob Salmela 76c217d9cc moving to functions
Also download the whitelist script.  Ask for donations for IPv6 support.
2015-11-15 13:13:07 +00:00
Jacob Salmela 46b4000e75 reboot works better 2015-11-15 13:12:55 +00:00
Jacob Salmela 8ac8aa72ce Closing dialog
Also starting the Pi-hole and restarting networking.
2015-11-15 13:12:41 +00:00
Jacob Salmela 8df376860c simple function to run install commands
The arrays were cool, but I think this just works easier.
2015-11-15 13:12:30 +00:00
Jacob Salmela eec0a31216 trying text output
I commented out the whiptail dialog at the end in place of text so you
can see what is going on.  I also install the crontab.
2015-11-15 13:12:16 +00:00
Jacob Salmela fb3fde3d19 testing with no reboot 2015-11-15 13:12:04 +00:00
Jacob Salmela 1482b9563c does gravity use static IP?
The changes to the gravity script check for a temp file containing the
static address set during the install.  I need to verify it works so I
have to change the URL.  I will change it back before merging with
master.
2015-11-15 13:11:49 +00:00
Jacob Salmela 6d989f9160 overwrite html folder
If the files already exist, the installer stalls out because it asks if
you want to replace the existing files.  the -o option forces an
overwrite.
2015-11-15 13:11:29 +00:00
Jacob Salmela f37990351e dumb mistake
fixed the variable name
2015-11-15 13:11:21 +00:00
Jacob Salmela a44591ca6b fix permission denied for log file
Just use a temporary file and then move it over once the install is
complete.
2015-11-15 13:11:03 +00:00
Jacob Salmela 37f255d761 save output to log file instead
Since the progress bar hides the output now.  Instead of destroying it,
send it to a log file instead so users who want to see it still can.
2015-11-15 13:10:43 +00:00
Jacob Salmela 72cf5c91a5 set static ip and suppress more output
Created a function to set a static IP address.

I also sent STDOUT and STDERR to /dev/null so it doesn't mangle the
progress bar.  When the device reboots, it still gets mangled a bit
(via ssh).
2015-11-15 13:10:26 +00:00
Jacob Salmela dfe1b126c4 progress dialog working
The ellipses cause errors, so they were removed.

I was on the right track with the associate array, but it would
previously execute the commands out of order.  Following directions
from the URL in the comments, I made another array that helps keep the
array in the order.
2015-11-15 13:10:09 +00:00
Jacob Salmela 4229a3e5e9 whiptail revamp of install script
This is a large update that helps users install the Pi-hole a bit
easier by using some dialog windows and also letting the user set a
static IP (I still need to figure out how to actually set the address
in the system, but everything else having to do with the install script
works).
2015-11-15 13:07:03 +00:00
Jacob Salmela 7a3add3a2e Merge pull request #72 from dschaper/master
Change shell path to environment
2015-11-14 20:02:28 -06:00
Dan Schaper 3992c0fba8 Merge pull request #5 from dschaper/dschaper-patch-1
Change shebang to environment
2015-11-14 15:09:22 -08:00
Dan Schaper 763aa6aa5c Change shebang to environment
Find bash in the environment, not hard coded to path
2015-11-11 00:43:00 -08:00