cde003bc98
\ all the /s!
2016-10-27 11:13:00 +01:00
3996e11425
Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
...
Improvements to White and Blacklists
2016-10-26 19:52:16 +01:00
3a4fe3e391
Wheezy install fix by selecting appropriate deps, made the php check the same
2016-10-26 14:47:29 -04:00
4ed6e4d016
Tiny screens get sane minimums
2016-10-26 11:15:02 -04:00
ac8d24a1ce
Even with no detected screen size, it should presume 80x24
2016-10-26 11:14:54 -04:00
fc776921d5
stty is more compatible and does not require any additional dependancies for busybox
2016-10-26 11:14:46 -04:00
55a653aca4
clear out /opt/pihole folder before installing scripts
2016-10-26 10:00:00 +01:00
bd0db56ba0
actually fix up logic
2016-10-25 15:29:02 +01:00
95f0b3710d
fix up logic
2016-10-25 15:27:13 +01:00
86349527e7
replace HOSTNAME tokens in 01-pihole.conf
2016-10-25 15:06:37 +01:00
911053f63f
Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution.
2016-10-25 15:00:18 +01:00
519d731ddd
Fix missing newline
...
My mistake
2016-10-23 16:45:51 -07:00
21b906e0e0
Consistency
...
More of the same
2016-10-21 23:57:47 -07:00
28eeaf201b
Standardize function declaration
...
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical
myfucn() {
}
style.
2016-10-19 19:47:45 -07:00
8872594ab9
create upload dir for lighttpd
...
directory is missing in the installation process but is used in the
lighttpd.conf
2016-10-19 14:27:17 +02:00
ff5d5b97c3
stash any changes in local repo
2016-10-18 13:54:09 +01:00
ef3c13fe2b
Refire with curl
2016-10-17 19:22:56 -07:00
fb9664b636
fix typo
2016-10-16 15:11:47 -06:00
ee114b3075
use an excluded extension for ifcfg backup
2016-10-16 13:28:14 -06:00
5792fc0bef
change wording depending on choice
2016-10-16 17:23:26 +01:00
42c93917ef
bug I forgot to fix before piholeUpdate was merged to development
2016-10-16 17:19:44 +01:00
df30a4c0d1
Merge pull request #779 from bcambl/fedora_fixes
...
Fedora fixes
2016-10-16 15:46:50 +01:00
9ce13f0035
Merge pull request #790 from pi-hole/piholeUpdate
...
Various refactoring.
2016-10-15 23:51:07 +01:00
3884b01503
Forgot a ` `
2016-10-15 23:21:13 +01:00
a84c3adeab
if uniformity then dan = happy
2016-10-15 23:19:26 +01:00
a65b784907
repeat after me: repetition is a bit repetitive.
2016-10-15 21:26:41 +01:00
05dadad2e1
repair sounds better than refresh
2016-10-15 21:22:46 +01:00
3a9b39b842
adjust text in update_dialogs() whiptail
2016-10-15 21:12:13 +01:00
e612003293
handle arguments better, convert to flags, echo when they're set to true.
2016-10-15 20:52:20 +01:00
a43577fa26
add reconfigure flag to -r command
2016-10-15 20:43:03 +01:00
a6fa60868b
spacing
2016-10-15 15:41:48 +01:00
99878ae7d6
reflect name change of some of the variables in setupVars
2016-10-15 15:40:12 +01:00
26202014a2
stdout formatting
2016-10-12 20:35:08 -06:00
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
e5ede16749
update yum/dnf package count grepfu
...
see pull #774
2016-10-12 20:33:13 -06:00
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
a03caea549
setupVar tests passing for debian & centos
2016-10-10 23:14:39 -05:00
aa23fb1d56
choose*
2016-10-10 22:34:12 +01:00
570611fc09
CentOS Firewall fix
2016-10-10 11:30:15 -07:00
94dd5b1ebe
More CentOS fixes.
2016-10-10 11:05:29 -07:00
74524e024d
Always check PIHOLE_dependencies.
2016-10-10 10:36:19 -07:00
e42b6dcc8e
create_pihole_user update @diginc.
2016-10-10 09:21:28 -07:00
d71b799e75
More cleanups, localize variables, clean formatting.
2016-10-10 08:23:14 -07:00
87e7121332
Gravity.sh checks for null value for variables, obliging that expectation.
2016-10-10 07:32:16 -07:00
94f6354c94
Spinner blocks `set -e` trying to get it in functions that won't crash out...
2016-10-10 07:25:43 -07:00
b79059ebdb
Start to add the spinner back in!
2016-10-10 06:46:30 -07:00
4f98c1bebb
Boolean operators inside quotes don't work well...
2016-10-10 06:16:00 -07:00
2feec01e10
Add `start_service` and `enable_service` functions to handle restating services and setting services to start on reboot.
2016-10-10 06:06:34 -07:00
72b95e192e
Fix logic bug in `setup_user`, update how setupVars are sourced so they will only be used if the user selects `update` and not if they select `install`.
2016-10-10 05:45:37 -07:00
47aad254d8
localized some more variables
2016-10-10 03:56:03 -07:00
bc14074d2a
Tighten up Update Whiptail appearance.
2016-10-10 03:39:32 -07:00
5ab5b1a190
Overhaul dnsmasq version 3 way handshake configuration files.
2016-10-10 03:23:52 -07:00
b055f190f5
Factor out interfaces detection.
2016-10-10 03:16:22 -07:00
84b8953352
Remove quiet flags from package managment variables. Set quiets in functions by redirecting output.
2016-10-10 02:58:38 -07:00
93a591d487
Linting from ShellCheck
2016-10-10 02:57:04 -07:00
e6c0f38a7c
Monolithic changes in one commit again.
2016-10-10 02:24:03 -07:00
f107ae4f9b
Merge conflict resolution
2016-10-10 09:08:25 +00:00
bad7a08804
Refactor and rename `create_pihole_user`. Now to actually use the user created...
2016-10-10 01:51:19 -07:00
25cbf4cb35
Factor out legacy location script removal.
2016-10-10 01:43:10 -07:00
7f179f9a58
Remove sourcing bash completion, would fall off as soon as the subshell terminated.
2016-10-10 01:40:56 -07:00
5287ea8537
Refactor `stopServices` into `stop_service` and accept arguments for service to stop. Quiet output from a few other functions.
2016-10-10 01:25:11 -07:00
43e2aaebf0
rename `updateDialogs` to `update_dialogs`
2016-10-10 01:04:59 -07:00
e60eb66283
UpdateDialogs are now a Whiptail Menu, self-explanatory.
2016-10-10 01:04:03 -07:00
ca59b808d8
Git clone/update now occurs right after installer dependency checks. Allows for inclusion of installer source files in the repo. Passes `set -e`
2016-10-10 00:02:50 -07:00
8a15fd44d5
Update `is_repo()` to use `git status` for validity checks.
2016-10-09 23:53:18 -07:00
dac2b8942e
Typo fix to generate commit.
2016-10-09 22:38:00 -07:00
54a1c5b63a
Revert inadvertent commits
...
IDLE keeps committing direct to development.
2016-10-09 22:35:14 -07:00
61b02bf6d3
Add OR TRUE to PKG_COUNT so that a 0 package to update doesn't grep -c to an exit value of 1.
2016-10-09 22:27:37 -07:00
9d048b2fdf
Move Pi-hole dependency checks to `main()` and out of duplicated `install` and `update` functions. Bring them up a level in the subshells.
2016-10-09 22:24:13 -07:00
d9e28a7422
factor out `installer_dependencies`
2016-10-09 22:05:06 -07:00
1fecdf42ca
Move `git` to installer deps, refactor some functions.
2016-10-09 22:00:23 -07:00
d4bf85b67c
Self contain `package_check` into `package_check_install`. Passes `set -e` test.
2016-10-09 21:44:45 -07:00
7131ff27c3
Attempt to `set -e`
2016-10-09 21:32:25 -07:00
a30f78c1c8
Oneliner php version check, passes `set -e` check.
2016-10-09 21:31:36 -07:00
7e0afffca8
Revert inadvertent commits
2016-10-09 19:41:32 -07:00
293c60fb9c
Exit script on failure to install dependent package.
2016-10-09 13:52:36 -07:00
f5be8b2a5e
Single dependency package check function, will exit if any errors with message to update cache.
2016-10-09 13:43:01 -07:00
6772603c15
Relocate cache check to its own function
2016-10-09 12:34:53 -07:00
a22904f99b
Merge pull request #769 from pi-hole/Fix/PackageCacheFresh
...
Fix/package cache fresh
2016-10-09 09:00:52 -05:00
b157bc5cd7
Fixes #768 Check the staleness of the package index instead of the package cache.
2016-10-08 13:47:35 -07:00
10e1a03c76
`runGravity` is called after `finalExports` in the Debian install side.
2016-10-08 12:58:42 -07:00
d20df92e9f
Script will now run as root, removed `sudo` from function calls.
2016-10-08 12:56:26 -07:00
44170207ac
Add `main` function and fire script from `main` call. Prevents script from running before it is entirely downloaded.
2016-10-08 12:17:04 -07:00
33745be745
Merge pull request #753 from pi-hole/feature/RemoveBarePHP
...
Remove bare php package from dependencies
2016-10-07 21:32:07 -07:00
6a28070017
Too many `-`s
2016-10-07 13:09:27 +01:00
91b948332e
Merge pull request #754 from pi-hole/fix/bashConditional
...
fix/bashConditional
2016-10-07 03:42:22 -07:00
d1a7fe2d44
fix/bashConditional
2016-10-07 03:36:34 -07:00
c39324d11f
Remove bare php package from dependencies
...
`php5` package can trigger install of Apache2. Without this package in deps, PHP is still installed and operational.
2016-10-07 00:24:25 -07:00
8c151c62ce
echo's don't need sudo
2016-10-05 10:46:10 -07:00
50d16d8215
Finish `install` conversion for installScripts()
2016-10-05 10:45:17 -07:00
3bbac9a5f2
`install` pihole
2016-10-05 10:19:47 -07:00
3600fd277e
Don't need `sudo` to echo to term.
2016-10-05 10:16:56 -07:00
e8bb4a7e36
Continue migration to `install`
2016-10-05 10:14:36 -07:00
36987cb1cc
Continue migration to `install`
2016-10-05 09:57:48 -07:00
5382b4fa37
Change installScripts to use install
...
Use the install program instead of copying files and directories in installScripts function.
2016-10-05 09:42:15 -07:00
c281b47905
Mover {SUDO} mkdir -p /etc/pihole/ back to the beginning.
2016-10-02 12:44:33 +01:00
aca5064743
--force seems to light. lets try --i_do_not_follow_recommendations
2016-10-02 11:16:48 +01:00
6f780316c4
remove whiptail dependency from verifyFreeDiskSpace.
...
Add argument detection to skip disk space. This is because curling to bash does not support waiting for user input.
2016-10-02 11:09:14 +01:00
4e262d81f0
wrap these vars in {} to matcht he rest of the script
2016-10-02 10:39:09 +01:00
6c2ff950ee
remote duplicate ${SUDO} mkdir /etc/pihole
2016-10-02 10:33:59 +01:00
7684069d0b
verifyFreeDiskSpace BEFORE installing any dependencies
2016-10-02 10:33:04 +01:00
73c85ae68a
remove duplicate calls to installConfigs
2016-10-02 10:30:55 +01:00
6a8bef83b3
Fix the php version check command (Thanks @diginc!)
2016-09-30 22:40:43 +01:00
3fc3c5cae4
Add iproute2 to fix #653
2016-09-27 11:15:46 +01:00
daa5366b57
Check if php5 is available in apt-cache, if so install it, else just install php
2016-09-27 11:11:47 +01:00
ac8d295bb9
Merge pull request #668 from bcambl/dns-hostname-fixes
...
Dns hostname fixes
2016-09-20 10:16:15 -07:00
21d4199a38
Merge branch 'development' into dns-hostname-fixes
2016-09-19 17:33:32 -06:00
655c422c3c
Add additional instruction.
...
Include "(Press space to select)" on ChooseInterface
2016-09-19 22:17:58 +01:00
5ca6599ca9
Merge branch 'development' into gravTweak
2016-09-19 12:54:58 -07:00
f16574085f
remove code made redundant by the existence of /etc/pihole/setupVars.conf
2016-09-16 23:09:14 +01:00
a0977af081
remove references to UpdateDashboard.sh
2016-09-12 19:10:12 +01:00
c2cb92a0b0
Add cron to apt-get dependencies
2016-09-08 23:42:05 +01:00
6c0c6182e9
fix newline in configureSelinux stdout
2016-09-07 21:16:52 -06:00
05ad4445b5
add dns to sysconfig interface configuration
2016-09-07 21:16:51 -06:00
1dd9f0747e
add gateway to interface configuration
...
pi-hole@9cb4e8b broke #593
original commit 8550b76
2016-09-07 21:16:36 -06:00
04c60e8a1c
Switch fedora and debian install check order
2016-09-05 15:52:09 +01:00
01a9534729
Merge branch 'development' into UpdateMethod
...
# Conflicts:
# automated install/basic-install.sh
2016-08-30 19:32:40 +01:00
344e63c2dc
Add undocumented argument to install script ("pihole") which allows the pihole command to run the update script without prompting the user. Useful for update automation
2016-08-26 23:06:35 +01:00
e4295f5d3c
Move exporting the setupConf files to a function to be run at the end of the script only. If script is cancelled, then they are not written. Simples.
...
Also I'm surprised nobody noticed the duplicate installPihole() function :S
2016-08-26 22:45:38 +01:00
49ded54306
Minor - Update descriptions
...
Apply to whiptail descriptions also.
2016-08-25 12:17:36 +01:00
6c0a8a4337
Minor - Corrected var names
...
Kilobyte values are used, not Bytes.
2016-08-25 12:11:54 +01:00
d217626318
If an existing install is detected, offer the user a choice of Updating or Installing with a radio list whiptail.
2016-08-24 22:52:11 +01:00
ed94f4b1df
Create directory before trying to create a blank file in it....
2016-08-22 22:06:33 +01:00
a57b097afc
Change echos at the end of install depending on install or update
2016-08-21 18:00:41 +01:00
eb42b894c4
Delete setupVars.conf if user cancels out of install process.
2016-08-21 17:57:11 +01:00
7eb43a0b47
Expand update dialog text
2016-08-19 23:25:04 +01:00
fdb104348c
Add updatePihole method
2016-08-19 22:45:24 +01:00
f54828352d
remove spaces from update bool set
2016-08-19 22:42:04 +01:00
cc157def63
remove --defaultyes from update whiptail
2016-08-19 22:40:27 +01:00
8fc83655ab
correct filename spelling mistake
2016-08-19 22:38:16 +01:00
9fb549293a
APPEND
2016-08-19 22:34:50 +01:00
e4cc5b5b70
testing a new update method by detecting the existence of vars saved from install
2016-08-19 22:31:11 +01:00
037318e2ff
Provide non-zero exit code, as per existing sourcecode.
2016-08-12 13:20:30 +01:00
a9a499939e
Fourdee - See notes:
...
https://github.com/pi-hole/pi-hole/issues/602
+ Improve available free disk space check.
+ Option to override if the free disk space check is not a valid
integer.
2016-08-12 12:44:45 +01:00
9cb4e8bde8
Merge remote-tracking branch 'origin/Debug_Options' into Debug_Options
...
# Conflicts:
# automated install/basic-install.sh
2016-08-05 12:53:08 +01:00
fe8d0f8ea8
Merge branch 'development' into sysconfig_gateway
2016-08-03 19:26:53 -06:00
2bc364023a
Remove erroneous space in chmod command
...
Fix spacing in help function
2016-08-02 23:51:53 +01:00
57df56dc62
Add version.sh to the install script
2016-08-02 20:08:21 +01:00
66ff9a24c6
Add piholeDebug to the chmod 755 command in install script. Not sure how that went missing...
2016-08-01 21:54:42 +01:00
8550b76e23
add gateway to interface configuration
2016-07-24 22:42:06 -06:00
c647e27e15
Merge branch 'development' into centos-nc
2016-07-19 08:48:54 -06:00
73645f299a
Merge branch 'development' into bugfix/dhcpcd_comments
2016-07-18 14:37:38 +01:00
a32ad0dbf2
fix centos nc dependency
2016-07-15 21:43:23 -06:00
e106ff0fef
Add netcat to dependencies for termbin.com. Should be installed by default, but JUST IN CASE.
2016-07-15 19:58:26 +01:00
f0a2248c81
Change comment to hash
...
Change format of comment to hash/octothorpe to clearly delineate that it's a comment. Looks better than `:::` which causes confusion.
2016-07-15 10:27:40 -07:00
2b0ba281a4
Repairs apt-get incorrect options
2016-07-04 15:35:46 -04:00
024b741552
Merge pull request #490 from bcambl/fedora-armhf7
...
Fedora Support
2016-06-29 14:25:23 -07:00
1f130b6550
Fix missing permissions on piholeIP
...
Without sudo/root privileges, the echo command is unable to write
to the file.
2016-06-21 19:16:11 -04:00
fa89bd830a
re-order when SELinux gets configured
...
configure SELinux *after* git clone/pull & file setup and *before* service configuration
2016-06-11 22:33:44 -06:00
3ba05d0274
configure static IP on Fedora via sysconfig script
2016-06-11 22:10:12 -06:00
Promofaux
Adam Warner
Eric Warnke
Adam Warner
Marcus Hildum
Jakob Ackermann
Dan Schaper
bcambl
diginc
Dan Schaper
Jacob Salmela
Daniel (Fourdee)
Daniel
Mcat12