Commit graph

1236 commits

Author SHA1 Message Date
Tommy Huff
f14c802822 change writehost to PromoFaux proposed 2016-10-19 17:52:14 -04:00
Tommy Huff
35df1844cb add ip var check 2016-10-19 15:24:22 -04:00
Tommy Huff
acfd56a7b9 Working on ipv6 + ipv4 2016-10-19 15:10:33 -04:00
Tommy Huff
3d7d7b80f0 Remove CIDR from IPs 2016-10-19 14:49:29 -04:00
Tommy Huff
b2134b8fde remove CIDR from IPs 2016-10-19 14:49:03 -04:00
Tommy Huff
67f553a7f2 make hosts with ivp4 and 6 2016-10-19 14:36:43 -04:00
Tommy Huff
e93f8d59d9 remove more old vars 2016-10-19 13:33:19 -04:00
Tommy Huff
0433838e26 uncomment temp chmod line 2016-10-19 13:23:25 -04:00
Tommy Huff
495568ea56 remove refrance to old ipv6_addr and test ipv4 and 6 2016-10-19 13:21:10 -04:00
Tommy Huff
189d19da37 quote setupVars include / remove if statement for piholeIPv6 2016-10-19 12:47:39 -04:00
Tommy Huff
37868a86dd quote -z and -n if vars 2016-10-19 12:35:45 -04:00
Tommy Huff
7455cac06c assume we need to remove the /CIDR from ipv6 addresses 2016-10-19 08:28:49 -04:00
Tommy Huff
9617a9eb68 remove debugging on force 2016-10-19 00:27:11 -04:00
Tommy Huff
2d7e31689c merge with devel 2016-10-18 23:21:37 -04:00
Tommy Huff
87d3dd2bd5 Merge remote-tracking branch 'origin/development' 2016-10-18 23:17:58 -04:00
Tommy Huff
d4aeef03c7 remove absolute pathnames and store everything in setupvars 2016-10-18 23:09:55 -04:00
Dan Schaper
16e4f79f09 Merge pull request #809 from pi-hole/PromoTweaks
Promo tweaks
2016-10-18 17:37:52 -07:00
Adam Warner
76cae20c33 Merge pull request #803 from pi-hole/attributes
Create .gitattributes
2016-10-18 19:51:44 +01:00
Adam Warner
b66f23cfd0 account for new update script 2016-10-18 14:19:44 +01:00
Adam Warner
27d6e5d8cf Complete overhaul of update logic. Moved to seperate script 2016-10-18 14:19:25 +01:00
Adam Warner
ff5d5b97c3 stash any changes in local repo 2016-10-18 13:54:09 +01:00
Adam Warner
ce46c4dec4 remove prematurely added code 2016-10-18 12:11:02 +01:00
Adam Warner
77e8be09a1 handle passing arguments to version script 2016-10-18 12:07:42 +01:00
Adam Warner
013d77488a complete overhaul of version script. Now with optional arguments! 2016-10-18 12:07:11 +01:00
Adam Warner
29ad2496b6 don't output "elevating with sudo" in pihole script, just do it. 2016-10-18 12:05:48 +01:00
Adam Warner
97a013b2b7 Add direction to change upstream servers in setupVars.conf 2016-10-18 10:35:22 +01:00
Adam Warner
77808223dc remove stock comments from 01-pihole.conf and add warning to the top 2016-10-18 10:05:10 +01:00
Jacob Salmela
fc89851ce9 Merge pull request #805 from pi-hole/development
Hotfix for installer bug, MASTER
2016-10-17 22:41:02 -05:00
Dan Schaper
c4c6555814 Merge branch 'master' into development 2016-10-17 19:57:05 -07:00
Dan Schaper
df0087fb23 Merge pull request #804 from pi-hole/hotfix/curlRefire
Refire with curl
2016-10-17 19:27:46 -07:00
Dan Schaper
ef3c13fe2b Refire with curl 2016-10-17 19:22:56 -07:00
Dan Schaper
0ad704e532 Update .gitattributes 2016-10-17 18:31:06 -07:00
Dan Schaper
2220d2dab8 Create .gitattributes 2016-10-17 18:28:38 -07:00
Promofaux
49f48e2aaa wrong word. #admincrimes 2016-10-17 22:24:59 +01:00
Adam Warner
dce24df379 Merge pull request #794 from pi-hole/development
[RELEASE] v2.9.3
2016-10-17 15:45:21 +01:00
Adam Warner
b59136c262 Merge pull request #800 from bcambl/ifcfg_backup
fix typo
2016-10-16 22:15:39 +01:00
bcambl
fb9664b636 fix typo 2016-10-16 15:11:47 -06:00
Adam Warner
5b736ae05e Merge pull request #799 from bcambl/ifcfg_backup
use an excluded extension for ifcfg backup
2016-10-16 20:50:54 +01:00
bcambl
ee114b3075 use an excluded extension for ifcfg backup 2016-10-16 13:28:14 -06:00
Adam Warner
123b16991b Merge pull request #798 from pi-hole/dnsmasqrestartchange
Some bug fixes before release
2016-10-16 17:25:30 +01:00
Promofaux
5792fc0bef change wording depending on choice 2016-10-16 17:23:26 +01:00
Promofaux
42c93917ef bug I forgot to fix before piholeUpdate was merged to development 2016-10-16 17:19:44 +01:00
Promofaux
8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq 2016-10-16 17:16:59 +01:00
Adam Warner
df30a4c0d1 Merge pull request #779 from bcambl/fedora_fixes
Fedora fixes
2016-10-16 15:46:50 +01:00
Adam Warner
9ce13f0035 Merge pull request #790 from pi-hole/piholeUpdate
Various refactoring.
2016-10-15 23:51:07 +01:00
Promofaux
3884b01503 Forgot a 2016-10-15 23:21:13 +01:00
Promofaux
a84c3adeab if uniformity then dan = happy 2016-10-15 23:19:26 +01:00
Promofaux
a65b784907 repeat after me: repetition is a bit repetitive. 2016-10-15 21:26:41 +01:00
Promofaux
05dadad2e1 repair sounds better than refresh 2016-10-15 21:22:46 +01:00
Promofaux
3a9b39b842 adjust text in update_dialogs() whiptail 2016-10-15 21:12:13 +01:00