Adam Warner
0de74c0448
Merge pull request #848 from pi-hole/PromoFaux-patch-1
...
Update .pullapprove.yml
2016-10-25 17:38:04 +06:00
Adam Warner
ee927346b7
Update .pullapprove.yml
...
Update to V2. Only require 2 approvers on development, and 3 on master
2016-10-25 12:36:05 +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
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
Promofaux
e612003293
handle arguments better, convert to flags, echo when they're set to true.
2016-10-15 20:52:20 +01:00
Promofaux
a43577fa26
add reconfigure flag to -r command
2016-10-15 20:43:03 +01:00
Promofaux
7e10dcdcf0
update pihole bash-completion
2016-10-15 20:12:16 +01:00
Promofaux
7ee1110351
ugh. pihole.conf.
2016-10-15 20:09:38 +01:00
Promofaux
51c4c51d9e
Add trap to check existence of setupVars
2016-10-15 20:03:33 +01:00
Promofaux
fc4fe54099
standardise function naming
2016-10-15 20:02:57 +01:00
Dan Schaper
b5b240d0be
Merge pull request #789 from pi-hole/legacy_setupVars
...
reflect name change of some of the variables in setupVars
2016-10-15 11:41:58 -07:00
Promofaux
4c42f00a86
remove uses of ${SUDO} and root check from gravity. As this is handled by pihole
command.
2016-10-15 18:42:53 +01:00
Promofaux
090fbd04af
Remove ${SUDO} usages and root checks from scripts called by pihole
command as they should not be called directly.
2016-10-15 17:54:04 +01:00
Promofaux
461de48625
function declarations as per basic-install.sh
2016-10-15 17:25:17 +01:00
Promofaux
9352ba6e4a
about time we exit 0'd
2016-10-15 17:16:44 +01:00
Promofaux
5e883239f9
remove calls for ${SUDO} as per basic-install.sh.
2016-10-15 17:15:59 +01:00
Promofaux
5ea08a2120
add -r to reconfigure pihole (basically runs basic-install.sh from /etc/.pihole)
2016-10-15 17:07:08 +01:00
Promofaux
a6fa60868b
spacing
2016-10-15 15:41:48 +01:00
Promofaux
99878ae7d6
reflect name change of some of the variables in setupVars
2016-10-15 15:40:12 +01:00
bcambl
26202014a2
stdout formatting
2016-10-12 20:35:08 -06:00
bcambl
f4f8b96788
remove systemd selinux rules on init systems
...
fixes the failing SELinux policy compile on init based systems
2016-10-12 20:35:08 -06:00
bcambl
e5ede16749
update yum/dnf package count grepfu
...
see pull #774
2016-10-12 20:33:13 -06:00
bcambl
fbe3547129
EPEL is not required on Fedora
...
epel-release installs the EPEL package repository (Extra Packages for Enterprise Linux)
Dependencies from this repository should available by default on Fedora
2016-10-12 20:26:48 -06:00
Dan Schaper
23f7363c70
Merge pull request #774 from pi-hole/InstallFixes2
...
InstallFixes2
2016-10-12 11:47:15 -07:00
Promofaux
aa23fb1d56
choose*
2016-10-10 22:34:12 +01:00
Promofaux
4f35aac6dd
transpose $
and "
2016-10-10 22:32:30 +01:00
Dan Schaper
4418ca9e9f
Missing quote replacement.
2016-10-10 11:41:29 -07:00
Dan Schaper
570611fc09
CentOS Firewall fix
2016-10-10 11:30:15 -07:00
Dan Schaper
94dd5b1ebe
More CentOS fixes.
2016-10-10 11:05:29 -07:00
Dan Schaper
74524e024d
Always check PIHOLE_dependencies.
2016-10-10 10:36:19 -07:00
Adam Warner
324e00194f
Merge pull request #766 from pi-hole/Mcat12-move-contributor
...
Move contributer file
2016-10-10 17:35:22 +01:00