Mel
3460f96495
Merge remote-tracking branch 'refs/remotes/jacobsalmela/master' into patch-1
...
Conflicts:
automated install/basic-install.sh
2015-11-15 13:03:31 -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
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
Mel
a26b60b5d7
Merge remote-tracking branch 'refs/remotes/origin/master' into patch-1
2015-11-11 12:36:34 -06:00
Mel
db55b04bf6
Merge remote-tracking branch 'refs/remotes/origin/patch-1'
...
Conflicts:
gravity.sh
2015-11-11 12:01:09 -06:00
Mel
25e7cefeb4
Merge remote-tracking branch 'refs/remotes/jacobsalmela/master'
2015-11-11 11:23:32 -06: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
Jacob Salmela
ce0ca3cc61
for use with /etc/crontab
...
Adding a system-wide crontab to update the ad source lists, flush the
log daily, and (eventually) record the stats for historical purposes.
2015-11-07 07:58:35 -06:00
Dan Schaper
5495f23e4e
Merge pull request #3 from jacobsalmela/master
...
Upstream sync
2015-11-06 15:47:58 -08:00
Jacob Salmela
e9bd7b1d47
Merge pull request #70 from jacobsalmela/development
...
Merge development changes
2015-11-06 17:29:29 -06:00
Jacob Salmela
a7d1b0b42c
Revert "theme addition"
...
This reverts commit e1b8419a07
2015-11-06 17:17:14 -06:00
Jacob Salmela
e1b8419a07
theme addition
...
Further adherence to the science/star trek theme
2015-11-06 17:16:14 -06:00
Jacob Salmela
932d410b66
anal retentive changes
...
OCD
2015-11-06 17:14:05 -06:00
Jacob Salmela
c297a86211
decluttering output
...
I love the adherence to the theme, but this line makes it difficult to
quickly read what is happening.
2015-11-06 17:10:17 -06:00
Jacob Salmela
1b65193fe4
new hostsfile url
...
This seems to be the more appropriate URL:
http://hosts-file.net/ad_servers.txt .
I compared it to the original URL using opendiff and they are exactly
the same.
2015-11-06 17:05:04 -06:00
Jacob Salmela
a06098bb16
remove filename from whitelist output
...
I also cleared the whitespace (or rather, Atom did).
I moved the pinhole.conf to it's current location
I commented out mahakala
2015-11-06 17:03:55 -06:00
Jacob Salmela
a675dc3f2c
Merge pull request #68 from dschaper/hawson-reduce-memory
...
Hawson reduce memory
2015-11-06 16:50:37 -06:00
Dan Schaper
15b9fb68d7
Remove filename from wc
...
Line 118 and Line 127 changed wc to remove filename from output.
2015-11-06 10:24:12 -08:00
Mel
c168bf4f2e
Checks for root/non-root/sudo
...
Checks if script is running as root, non-root, or sudo. For root, it sets SUDO variable to nothing and the script runs. If it's not root, then it checks to see if sudo is installed. If it is installed, then it sets SUDO variable to 'sudo' and the script runs. If it is not root and sudo is not installed, then the user does not have sufficient privileges to run the installer and it exits.
2015-11-05 22:53:12 -06:00
Mel
b5a0ffe8c1
Checks for root/non-root/sudo
...
Checks if script is running as root, non-root, or sudo. For root, it sets SUDO variable to nothing and the script runs. If it's not root, then it checks to see if sudo is installed. If it is installed, then it sets SUDO variable to 'sudo' and the script runs. If it is not root and sudo is not installed, then the user does not have sufficient privileges to run the script and it exits.
2015-11-05 22:47:56 -06:00
Dan Schaper
642c31c361
Theme changes
2015-11-05 18:33:05 -08:00
Dan Schaper
8e21488542
hawson memory reductions
2015-11-05 18:22:17 -08:00
Dan Schaper
deb6e76e08
Merge pull request #1 from dschaper/hawson-reduce-memory
...
Upstream Branch pseudo-rebase
2015-11-05 18:11:43 -08:00
Dan Schaper
23eece9443
Upstream Branch pseudo-rebase
2015-11-05 18:11:34 -08:00
Jacob Salmela
1b51b9ade3
for use as a cron job
...
The log will be flushed daily and stats will be stored in a DB for
displaying on the Web interface.
2015-11-05 14:31:38 -06:00
Mel
d756f430d8
Checks if the script is being run as root
...
These changes check to see if it installer is invoked by the root and sets the sudo variable to handle root and non-root runs.
2015-11-05 12:55:13 -06:00
Jacob Salmela
a36352dfb6
Merge pull request #58 from Giermann/patch-1
...
add whitespace after $piholeIP
2015-11-04 21:02:58 -06:00
