86d3ca48ae
moved newline to correct place
2016-11-15 22:40:57 +13:00
e9475a9739
Merge pull request #887 from brontide/dependancy_cleanup
...
Dependancy cleanup
2016-11-07 21:45:23 -08:00
0caa44e979
write ifcfg instead of appending
2016-11-07 12:54:31 -06:00
b9f3493dbc
move PH_TRUE to Dockerfiles to DRY
2016-11-03 22:34:04 -05:00
633095aee1
switch to consistent style
2016-11-02 22:13:05 -05:00
71005e1db3
Merge with change of spacing in development
2016-11-02 19:01:34 -04:00
c452a4569e
.js
2016-11-02 21:17:00 +00:00
a182a208dc
Tidy up output
2016-11-02 21:06:12 +00:00
d273b4b48b
Check for missing index.html, replace if missing.
2016-11-02 20:57:56 +00:00
b429e890ad
move web interface message inside "if not update" block. Check for pi-hole deps AFTER whiptails
2016-11-02 20:16:36 +00:00
6d415a7384
Merge pull request #894 from diginc/InstallFixes_UnitTests
...
Unit tests framework and some basic tests
2016-11-02 09:42:20 -07:00
8b9f0487c0
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
...
# Conflicts:
# advanced/Scripts/update.sh
# automated install/basic-install.sh
2016-11-02 06:57:33 -07:00
50bd8b4a09
Further tweaks to local repo handling
2016-11-02 13:34:57 +00:00
7740e4268c
Consistency and standards basic-install start.
2016-11-02 05:17:28 -07:00
3df2ef8587
Cherry picking f6f6f6d, conflict fix
2016-11-02 04:31:28 -07:00
354309fcad
set QUERY_LOGGING default to true
2016-11-02 04:28:58 -07:00
edd00e8e70
consistency
2016-11-02 04:12:37 -07:00
82e7de2aaa
Account for variable name changes
2016-11-02 04:12:21 -07:00
b723714c0c
Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names
2016-11-02 04:12:06 -07:00
a2903b6e63
Consistency
2016-11-02 04:11:54 -07:00
9a1876571b
Prototype `whiptails` so they don't fall to shell. Need to do this to all functions.
2016-11-02 04:11:41 -07:00
c07d7165ab
Global variables CAP'ed
2016-11-02 04:11:27 -07:00
d695c5972f
`local` variables just to be safe and make sure they stay in this function.
2016-11-02 04:11:09 -07:00
bbc09ed313
Swap variable names.
2016-11-02 04:10:57 -07:00
617a147706
Wording adjustment
2016-11-02 04:10:29 -07:00
d4dccfdb2d
Cherry pick 229439c
2016-11-02 04:08:53 -07:00
d9528dfd09
Bash is funny with returns.
2016-11-02 00:51:38 -07:00
12f5f8ba00
Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code.
2016-11-02 00:14:25 -07:00
db0f3307e0
Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs.
2016-11-01 22:48:30 -07:00
7a22471787
New naming convention, and reorder functions as bash would prefer them to be.
2016-11-01 22:19:40 -07:00
b4524839bb
Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests
2016-11-01 23:52:20 -05:00
fb5ac6d6d7
We should prefer the php metapackage if it's there, falling back on php5 if it's not
2016-10-31 21:31:13 -04:00
4e7ca51beb
Added dependancy for ping and lsof used in debug scripts
2016-10-31 21:24:57 -04:00
65e0fcbf10
Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
2016-10-28 13:14:00 -04:00
e22aca49c8
Merge pull request #813 from das7pad/development
...
Create missing directory for lighttpd
2016-10-28 10:05:08 -07:00
21fc6344bf
Merge pull request #849 from pi-hole/aManHasNoNameResolution
...
[BugFix] A man has no name resolution
2016-10-27 19:41:07 +01:00
794fa21137
install uninstall.sh...
2016-10-27 12:44:21 +01:00
977d1d1998
Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
2016-10-27 07:37:40 -04:00
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
ec4f5007e7
remove bad {
2016-10-21 23:59:31 -07:00
21b906e0e0
Consistency
...
More of the same
2016-10-21 23:57:47 -07:00
7ebaf8e843
Consistency
...
Now with block indents!
2016-10-21 23:23:31 -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
b3e7619048
curly brackets all the variables!
2016-08-21 02:12:02 +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
0d9a8d70bf
configureSelinux prior to installPihole
2016-06-11 17:28:57 -06:00
5c79184d3b
add ifconfig dependency for Fedora install
2016-06-11 17:17:12 -06:00
3d619d9ccc
fix iptables udp rule
...
fixes dmesg: ip_tables: udp match: only valid for protocol 17
2016-06-11 17:04:45 -06:00
afdf3ae7a1
add sudo package to PIHOLE_DEPS
2016-06-11 16:10:31 -06:00
943f7c06b5
uninstaller support for Fedora/CentOS
2016-06-11 15:58:49 -06:00
27a9642090
check for sudo via 'command -v' instead of dkpg-query
2016-06-11 15:58:49 -06:00
d0b6ff2d08
add udp port 53 to iptables/firewalld configuration
2016-06-11 15:58:49 -06:00
97737ee9e3
move SELinux config to installPihole() for logging
2016-06-11 15:58:49 -06:00
5e27ccc37c
firewalld: specify ports and use default zone
2016-06-11 15:58:49 -06:00
682113892a
enable SELinux boolean for httpd server side includes (SSI)
2016-06-11 15:58:49 -06:00
376eb81181
SELinux Support
2016-06-11 15:58:49 -06:00
4fc40d96d9
ensure firewalld is running before configuration
2016-06-11 15:58:49 -06:00
e6634531c7
basic firewalld/iptables configuration
2016-06-11 15:58:49 -06:00
04e375a523
enable lighttpd and dnsmasq via systemd
2016-06-11 15:58:49 -06:00
65638973ea
correct dhcpcd package name to dhcpcd5
...
move dhcpcd5 to installer dependencies
2016-06-11 15:58:49 -06:00
9c26bdd676
ensure fastcgi socket directory and permissions
2016-06-11 15:58:49 -06:00
b31931c907
add epel-release for CentOS support
2016-06-11 15:58:49 -06:00
c74af2c21f
warn if lighty-enable-mod utility is not available
...
Fastcgi can be enabled via lighttpd configuration.
This step may not be required for all distributions.
2016-06-11 15:58:49 -06:00
c160b2e54b
fix lighttpd user/group variables
2016-06-11 15:58:48 -06:00
c4234f4542
ensure ownership/existence of /var/cache/lighttpd/compress
2016-06-11 15:58:48 -06:00
62fa9c0f6e
fixing whitespace
2016-06-11 15:58:48 -06:00
8198f06073
ensure dnsmasq conf-dir is configured for /etc/dnsmasq.d
2016-06-11 15:58:48 -06:00
6f2117d786
append '.debian' to lighttpd.conf for compatability
2016-06-11 15:58:48 -06:00
b3ec3b487c
add Fedora dependency: lighttpd-fastcgi
2016-06-11 15:58:48 -06:00
94f131a0b7
update deps and package manager variables
2016-06-11 15:58:48 -06:00
7af0029175
check for systemctl for systemd service management
2016-06-11 15:58:48 -06:00
f4228b04f8
additional fedora dependancies
...
based on current fedora (23 at this moment) docker image
2016-06-11 15:58:48 -06:00
ffaf243160
split dependency installations into two separate functions
...
- installerDependencies:
- updates the package manager list/cache
- installs dependencies for install script
- checkForDependencies:
- install dependencies for Pi-Hole
2016-06-11 15:58:48 -06:00
29d48bbd9a
move IP/route discovery to a function
...
Defer use of 'ip' utility until after install script dependencies have been satisfied.
2016-06-11 15:58:48 -06:00
37dda79db2
install dependencies for install script
2016-06-11 15:58:48 -06:00
063e3e85e1
Fedora compatibility variables and dependencies
2016-06-11 15:58:41 -06:00
42afaa9f66
remove dpkg-query dependency from sudo check
2016-06-11 15:53:46 -06:00
13a479a9f6
tell user to run as root
...
since you can't install sudo as a non-root user, the script needs to be
run as root in order to install it.
2016-06-11 13:21:08 -05:00
1194e48bd8
install sudo
...
sudo is needed for the sudoers file to work, which is how the Web
interface executes the pihole commands.
2016-06-11 13:08:43 -05:00
1e0666d1ef
make folder so file can be deployed
2016-06-10 18:51:38 -05:00
1c53ad6876
mcat is smarter than me
...
He already added this.
2016-06-10 18:20:53 -05:00
dc2a537f6b
copy sudoers file
...
necessary for Web interface white/black list functionality.
2016-06-10 17:47:27 -05:00
a16cd9aef7
Merge pull request #469 from pi-hole/web-sudo
...
Give WebUI permissions to run pihole commands
2016-05-26 18:45:04 -04:00
6cf446032f
Show web interface URL after install
2016-05-25 18:55:36 -04:00
d52a8f08ed
Merge pull request #501 from davidtorcivia/development
...
Fix basic install for Proxmox LXC
2016-05-11 19:12:37 -04:00
b7e27bf6b4
Fix basic install for Proxmox LXC
...
Fixed basic installer to properly bind to eth0 when install to a Proxmox LXC.
2016-05-11 18:24:43 -04:00
c0e1772e21
Replace toilet with echo
2016-05-07 11:44:18 -07:00
00cc480bc1
Update basic-install.sh
2016-04-26 16:10:51 +08:00
221b72439b
Update basic-install.sh
2016-04-22 01:46:27 +08:00
24de6d6fc9
Allow sudoers file to be uninstalled
2016-04-20 21:43:01 -04:00
09cdf5081c
Install sudoer file
2016-04-17 23:03:12 -04:00
cbbc6df05a
Merge pull request #425 from PiHoleController
...
Fixes spacing issues in whiptail dialogs
2016-04-05 22:26:02 +01:00
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
2016-04-04 00:59:24 -05:00
22ea384ac8
Fix whiptail spacing
2016-04-03 18:05:11 -05:00
69e8c014c3
Indentation fix
2016-04-03 17:25:48 -05:00
c6fb0bad4b
change spinstr to match spinstr in basic-install.sh
2016-04-03 21:45:00 +01:00
2d08217173
Tidy up For loops, clean up whitespace
2016-04-03 21:43:36 +01:00
36645d9335
Add check for existing files in /usr/local/bin left over from previous version, as those scripts are replaced with `pihole <command>` script.
2016-04-03 18:39:22 +01:00
ad8573c739
Pedantic change, stops my editor from treating all of the code as one long sting in `' '` (as the `'` was escaped with `\`)
2016-04-03 18:10:50 +01:00
71133f6b59
Spelling error fix...
2016-04-02 19:42:33 -05:00
5d5d6c2c70
handle case where parent directories do not exist
2016-04-02 19:31:26 -05:00
37fa462db5
Erraneous call to SUDO removed
2016-04-02 19:24:19 -05:00
1a2046a7eb
Added uninstall option to `pihole` command. Minor fixes
2016-04-02 19:20:54 -05:00
3dff7e80fc
Fixed path to /etc/bash_completion.d/
2016-04-02 18:52:03 -05:00
6eea9239a7
Merged branch development into PiHoleController
2016-04-02 18:41:36 -05:00
75f1969bd2
Set executable permissions of `pihole` and changed installer to invoke sudo for gravity.sh.
...
Note: We invoke gravity.sh with sudo in other places, so ignore the removed comment.
2016-04-02 18:39:09 -05:00
447af208b3
Fixed missing `cp` of `piholeDebug.sh` to /opt/pihole
2016-04-02 17:59:59 -05:00
d47fbbbe96
Mcat12 requests. Added bash-completion support
2016-04-02 17:58:10 -05:00
777676b525
Made uninstall.sh and pihole.sh executable.
2016-03-31 20:33:15 -05:00
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
4b0a7c2252
Added 01-pihole.conf to be removed on uninstall regardless of removing dnsmasq
2016-03-30 20:23:24 -05:00
f8427ab789
Merge remote-tracking branch 'refs/remotes/pi-hole/development'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-29 12:57:22 -05:00
fb5bc16c83
Call gravity.sh in it's new location
2016-03-29 00:14:56 -05:00
456eee05f2
Added pihole.sh to /usr/local/bin
...
Uninstall.sh will handle removing the file
2016-03-28 18:55:37 -05:00
00b65abd09
Minor changes to reflect new tool usage
...
Removed symlink of scripts to u/l/b
Added copy for setupLCD to /opt/pihole/
New spinner added to gravity.sh to reflect new spinner in basic-install.sh and uninstall.sh
2016-03-28 18:44:54 -05:00
32dd594f06
Check if lighttpd has been uninstalled before removing conf files
...
If is still installed, then restore the original lighttpd.conf file.
2016-03-28 17:08:19 -05:00
660e71f032
Added blacklist.sh to be removed on uninstall from u/l/b
2016-03-28 16:32:42 -05:00
138aeaf8c7
Added uninstall.sh and updateDashboard.sh to be removed on uninstall from u/l/b
2016-03-28 16:25:12 -05:00
80f4bf9475
Bug fixes
...
Fixed DONE! to done!
Fixed symlinking user scripts
Fixed /n to \n
2016-03-28 16:20:23 -05:00
f444c7d4a5
Merge resolution
2016-03-28 12:21:49 -05:00
8ef4c12f97
Merge branch 'ScriptCleanup'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:21:18 -05:00
c520c55ff4
Addressed UAT issues and moved scripts to /opt/pihole
...
Symlinks now include the /etc/pihole scripts in the user's PATH.
2016-03-28 10:24:13 -05:00
8c45bd32b7
Loop through dependencies for future expansion.
...
Syntax of uninstall script now matches basic-install.sh.
More error handling of missing default files.
Force user prompt for removing packages when uninstalling.
2016-03-27 12:31:05 -05:00
2b5cee05e6
Check for existing directory before trying to perform operations on it.
2016-03-27 10:59:09 -05:00
5442954db6
Prompt user to remove each dependent package if they do choose to remove packages at all.
2016-03-27 10:58:48 -05:00
5ee382c8eb
Roll back addition of piholeDebug.sh (production master base)
2016-03-26 17:00:52 -05:00
901cb44f5e
Added /etc/.pihole/ and /var/log/*pihole* to uninstall as well as fixed missing call to removeNoPurge.
2016-03-26 16:57:34 -05:00
7388461ede
Modularized uninstall for cleanliness and robust usability.
2016-03-26 16:57:27 -05:00
5223627b71
read locks echos... reordered to warn user
2016-03-26 16:57:22 -05:00
646c4a3ccc
Newline not read correctly in prompt
2016-03-26 16:57:17 -05:00
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
2016-03-26 16:57:01 -05:00
bc09760c84
Grab changes by @rosskevin. ( #386 - lighttpd changes to handle JS files)
2016-03-24 23:19:44 +00:00
1e6ac33ef1
Fix merge conflicts
2016-03-24 23:18:14 +00:00
02bb5b6742
Revert previous change
...
Reopens #384
2016-03-20 20:50:31 +00:00
fad5fafa32
Increase disk space to verify...
...
.. was missing a couple of zeros, and not verifying enough space!
Fixes #384
2016-03-20 13:26:02 +00:00
0b5f005a5d
Added piholeDebug.sh script for advanced debugging
...
Script piholeDebug.sh added to /usr/local/bin to generate a detailed log file for debugging/troubleshooting.
2016-03-19 20:32:11 -05:00
404ea0ce6d
copy both the html and js stubs during install
2016-03-14 22:54:45 -05:00
4452f784a8
remove trailing whitespace basic-install.sh
2016-03-05 21:16:23 -08:00
adcd7f10ee
Fixed password input
2016-02-28 15:24:38 -05:00
af83936047
Added password to install
...
Saves in password.txt
2016-02-28 15:18:48 -05:00
a0673c7028
Update basic-install.sh
...
Increase required free bytes.
2016-02-21 20:38:05 +00:00
ca2d3a192c
add double bracket notation to lines 396, 399, 403 . Fixes error raised by @jacobsalmela
2016-02-21 18:38:34 +00:00
0ebb7eecdb
Verify Custom DNS IP is a valid IP address
2016-02-20 17:33:20 +00:00
800d2f0859
Add back in whiptail dialog to verifyFreeDiskSpace()
2016-02-20 16:17:29 +00:00
f397844603
Remove conflicted merge markup. Not sure how that got through.
2016-02-20 16:08:02 +00:00
2d895f328c
Fix merge conflicts
2016-02-20 15:38:39 +00:00
b14b182084
change regex to test for one or more numbers, not 0 or more numbers.
2016-02-20 15:17:57 +00:00
8687d25d88
make prepopulation of freetext on custom DNS provider a bit more intelligent
2016-02-20 15:12:13 +00:00
7001edcd1d
Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs.
2016-02-20 15:00:03 +00:00
4a1e88f4bf
Fixed Pi-hole user not being created
2016-02-20 09:48:06 -05:00
b41608d40b
Include fix for regex in verifyFreeDiskSpace()
2016-02-20 14:44:56 +00:00
3e7ecda80f
Merge pull request #242 from ChadBHowell/CBH---pihole-system-user-v2
...
Add user pihole if user does not exsist
2016-02-19 09:31:41 +00:00
8e289215b4
Account for CHIP pc not having root on '/'
2016-02-17 10:00:36 -06:00
c3c051385c
Update basic-install.sh
...
Corrected mistake in previous commit
2016-02-17 12:42:31 +00:00
c396aeed52
Correct miss-spelled variables on lines 398 and 403
2016-02-17 00:07:14 +00:00
40f541bc31
update verifyFreeDiskSpace()...
...
addresses #322 . Will now check free space on the first file system output by 'df- lkP`, as opposed to `/` to make pi-hole more compatible with other distros.
2016-02-16 23:00:48 +00:00
432e6d5395
Cleaned up output, Fixed Cancel button
2016-02-16 16:47:36 -06:00
fdf805bc7b
Merged with @slamanna212 code to add 3 new DNS providers.
2016-02-16 16:38:06 -06:00
da959e1296
Increased Size Of Whiptail Dialog
...
Increased Size of Whiptail Dialog to 5 to show all 5 DNS choices
2016-02-15 17:55:14 -05:00
94600c54cb
Added Default State for New DNS Options
...
Added default state of off for 3 new DNS options to better match existing code
2016-02-15 17:54:17 -05:00
06444c1c27
Add 3 More DNS Server Choices Durring Install
...
Added Level 3 , Norton, and Comodo DNS Choices
2016-02-15 17:31:31 -05:00
4d0b4cfb36
Update basic-install.sh
...
Do not stop dnsmasq when installing. Instead run `service dnsmasq restart` once installation is complete.
This may have been the cause of issues outlined in #218
2016-02-14 23:44:23 +00:00
3c801e5b91
Merge pull request #301 from fayetted/Issue_163-2
...
Check for 25mb of free disk space before install
2016-02-14 13:29:07 +00:00
ecd46f8560
Allow installer to specify own DNS servers
...
Offers "other" option.
Gives Installer chance to review settings before continuing.
2016-02-13 22:36:24 -06:00
b5406240c6
Fixes IPv6 surviving a reinstall
2016-02-10 19:07:48 -05:00
46d7bfecdb
Check for 25mb of free disk space before install
...
Function will check the free space of / (root)
If the free space is less than 25MB it will give directions
on how to expand the disk.
Fixes #163
2016-02-10 09:34:06 -06:00
255706e173
Bring dev branch up to date with master bug fixes
2016-02-09 20:44:49 +00:00
beb6b950f7
Replaced 'sudo' with
2016-02-08 22:26:41 +01:00
2d1c0be24e
fix reference to install log location. #282
2016-02-06 13:04:54 +00:00
9941651b3c
Addresses changes as requested by @jacobsalmela in #282
2016-02-06 13:02:21 +00:00
c93c4cc5e6
Update basic-install.sh
...
ahem
2016-02-01 22:28:35 +00:00
06cba7defd
Fix script output around new changes
2016-02-01 22:25:28 +00:00
8b76bbe51d
Merge github.com:pi-hole/pi-hole
2016-02-01 22:19:37 +00:00
aa1d3a4c2e
Fix logic in versionCheckDNSmasq, as dnsmasq.conf was being overwritten every time install was run. Fixes @kmr2319 's concern in #98
2016-02-01 22:19:17 +00:00
38e73a188a
Fix array selection
2016-02-01 02:11:55 +00:00
3fdf588cc9
Costmetic fixes, change DynDNS to OpenDNS
2016-02-01 02:09:11 +00:00
70e4104c17
Merge remote-tracking branch 'origin/development'
2016-01-31 20:47:10 +00:00
29e0e1760b
Fixes #154 #269 . No need for PR #214 any more.
2016-01-31 20:39:12 +00:00
5060ed8970
Add error checking for grep and correct typos
2016-01-30 20:51:28 -05:00
d18e064d21
Remove no longer needed change to config file
...
Config file moved, no longer needed command removed.
2016-01-30 16:30:38 -08:00
0cfb3c7ab4
Fixed config issue
2016-01-30 19:21:31 -05:00
48f9a61ff0
Updated License
2016-01-30 15:12:40 -05:00
0042e3ae02
Merge branch 'development' into CBH/UpstreamDNS
...
Conflicts:
automated install/basic-install.sh
2016-01-30 13:28:01 -05:00
b93e46de14
Update basic-install.sh
2016-01-30 14:55:02 +00:00
9e0c7ed29a
Merging from CBH bugfix
2016-01-30 14:34:12 +00:00
21a07e7419
Merge pull request #263 from pi-hole/newVersioning
...
New versioning system
2016-01-29 20:47:10 +00:00
6b50ea6504
Merge pull request #249 from pi-hole/OperationBlockListFromGravity
...
Seperate blocklist sources from gravity.sh to allow users to manage their own list of blocklists that persists through installs/upgrades
2016-01-29 19:39:11 +00:00
895647b908
Don't copy version to install dir
2016-01-29 12:32:58 -05:00
0ece58b9cb
Add version
2016-01-29 12:23:03 -05:00
49a56cf131
Start on new versioning
2016-01-29 08:25:35 -05:00
cadc506aa5
Remove extraneous whitespace from basic-install.sh
2016-01-28 09:25:00 +00:00
eee0ccef8c
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---pihole-system-user-v2
2016-01-27 22:44:14 -05:00
088bd632ab
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Descrition-for-pi-hole-v1-back-function
...
# Conflicts:
# automated install/basic-install.sh
2016-01-27 22:43:43 -05:00
60bf14d4dd
Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix
...
Force apt-get update if it has not been run today. This will stop dependency errors on a fresh install.
2016-01-27 23:43:38 +00:00
c00fb44cee
Do not force apt-get upgrade on the user. Instead, advise them. We only need to make sure apt-get update has been run
2016-01-27 23:28:36 +00:00
3d78b44a8e
Changes as in #253 , but with less commits to keep the repo tidy
2016-01-27 22:32:08 +00:00
701ae06e4a
Move copying of adlists.default to gravity.sh
2016-01-27 21:14:06 +00:00
98a0d17431
Update basic-install.sh
...
Emergency Bug fix. I take the blame for this one, it got lost in a merge!
2016-01-27 15:28:40 +00:00
ae336da7a1
Fix formatting, use consistent style, add comments
...
Fix formatting, use consistent style, add comments
2016-01-27 01:11:38 -05:00
ef99fe2d18
Add line to copy default ad list into /etc/pihole
2016-01-26 20:33:49 +00:00
80bec9c5cf
Delete install
...
Not sure how this got in here... :)
2016-01-25 16:28:26 +00:00
2b99fa81f3
Tidy up output lines around new code
2016-01-25 16:08:48 +00:00
354a42dd00
close quotes on line 318!!!
2016-01-25 12:49:04 +00:00
4cedca3427
add in a prompt to give users the option to quit installation or continue
2016-01-25 12:47:03 +00:00
e99be28a73
Variable missing $
2016-01-25 02:31:03 -08:00
32389e4ab8
Terminate string with missing quote
2016-01-25 02:27:44 -08:00
01d7fc0ac9
Removed apt-get update/upgrade, instead checking for updates availible and advising user to update/upgrade after installation of pi-hole. Addresses issue #218
2016-01-25 10:07:12 +00:00
d74c8261aa
dnsFile2="/etc/dnsmasq.conf.orig"
...
added .orig
2016-01-25 01:38:41 -05:00
ac373545d0
versionCheckDNSmasq() fixups
...
versionCheckDNSmasq() fixups per dschaper's suggestions.
2016-01-25 01:27:10 -05:00
a21948d2c6
Typo fix
...
Typo fix
2016-01-25 01:09:45 -05:00
940480effe
Revert "Fix backup to use new 01-pihole.conf location"
...
This reverts commit 0c444e6f2b
2016-01-25 00:57:36 -05:00
29c593b8b0
Add user pihole if user does not exsist
...
Check if user pihole exist and add if not. This will give pihole its
own system user without a login or home directory that is not system
dependent.
2016-01-25 00:28:53 -05:00
0c444e6f2b
Fix backup to use new 01-pihole.conf location
...
Fix backup to use new 01-pihole.conf location
2016-01-25 00:12:51 -05:00
6cf6e16d22
Add ability to choose upstream DNS servers
...
Give the user the ability to choose between Google and DynDNS upstream
servers. Then insert the chosen DNS servers in to
/etc/dnsmasq.d/01-pihole.conf. Todo: extend choices to include manually
entered DNS servers.
2016-01-25 00:11:00 -05:00
e5f9663a0e
Move dnsmasq.conf to dnsmasq.d/01-pihole.conf
...
Check if /etc/dnsmasq.conf is from pihole. If so, replace with an
original and install new in .d directory. Add and unmolested version of
dnsmasq.conf to the ./advanced directory.
2016-01-25 00:04:02 -05:00
eec14be10d
add $SUDO into spinner control.
2016-01-24 21:19:23 +00:00
c179936b54
add $SUDO
2016-01-24 20:49:37 +00:00
649a565801
run apt-get install as sudo when resolving dependencies
2016-01-24 20:35:24 +00:00
2d4ebf5eb5
FIX CONFLICTS
2016-01-24 20:29:22 +00:00
754beed3a1
Bring up to date with master
2016-01-24 20:22:41 +00:00
9f0927351d
Merge from #236
2016-01-24 18:49:25 +00:00
736edf44e4
Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today
2016-01-24 17:53:27 +00:00
8a74942da7
Cleaned up output before running gravity.sh
2016-01-24 16:41:11 +00:00
2fe42138c7
removed a space
2016-01-24 16:37:15 +00:00
1563146918
improvements to git functions (passing parameters). Added >/dev/null to attempt to supress output from apt-get upgrade
2016-01-24 16:33:53 +00:00
cf3aea8075
uncomment the apt-get update/upgrade!
2016-01-24 15:27:40 +00:00
6cea480210
Huge update! Base files now cloned from github (or updated if already existing) and copied out to the correct directories. Web admin interface is now cloned from hithub (or updated if already existing). Packages are checked before we go ahead and try to install them anyway.
2016-01-24 03:31:12 +00:00
206717828b
Improve spinner function.
2016-01-23 22:25:30 +00:00
316d26ede2
Add unzip to the dependencies
...
unzip is required for the install script to complete. Some distros do
not have it installed by default.
2016-01-23 16:29:52 -05:00
e8b8fb0835
s
2016-01-23 00:23:32 +00:00
6663ced38d
Initial commit
2016-01-23 00:13:16 +00:00
c99a8a9b15
initial commit
2016-01-22 20:30:32 +00:00
ea0fb15ff2
Move creation of pihole directory out of IPv6 function
2016-01-22 19:48:55 +00:00
05a59b17be
Changed URLs in installScripts() to match new organisation links
2016-01-22 16:50:01 +00:00
ce578534fe
Fixing minor typos in basic-install.sh
2016-01-21 11:33:49 -06:00
3f40a95929
Whoops, should probably commit more often. Massive overhaul. Cleaned up output, less verbose (will still output errors, but gets rid of anything not needed) Added a spinner so users don't think it has stalled
2016-01-20 23:34:18 +00:00
5c25c42da8
Make installPiholeWeb() more inteliigent. Checks for existence of /var/www/html/pihole, and only downloads from repo if it does not exist. Will stop install script from overwriting any tweaks users have made to index.html
2016-01-20 22:14:17 +00:00
96011bc2ae
make InstallWebAdmin() a bit more intelligent, and less verbose. Checks if installing over an existing installation, and if so, will remove existing webadmin folder.
2016-01-20 22:02:54 +00:00
4f59577fd1
Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root
2016-01-20 21:20:52 +00:00
bc51f88805
Check if any list.* files exist from previous installation, if they do delete them.
2016-01-19 22:52:29 +00:00
0a0f00da3b
fixes #169
...
exits if sudo is not installed when run as a regular user
2016-01-16 14:10:03 -06:00
bee109c784
better uninstall
...
More from JoshKastang. This closes #153 as it is the last step from
his ideas.
2016-01-16 13:56:08 -06:00
5d608a2db5
leave system cron alone
...
Taking JoshKastang’s idea from #153 , the system cron file will be left
alone and the pihole.cron gets its own.
2016-01-16 13:48:29 -06:00
7c6ef0cfd0
privileged install
...
This puts sudo in a variable if run as a regular user. If already
running as root, the script proceeds as normal. Not a perfect fix, but
should help for install on other systems.
2016-01-16 13:40:09 -06:00
0cf859344a
Merge pull request #176 from xd1936/patch-1
...
Install Figlet Fonts with Toilet
2016-01-16 13:19:15 -06:00
6125b2520b
install git for updateDashboard.sh
...
I also download and chmod the script
2016-01-16 13:15:44 -06:00
bd5ed2bcf0
move webinterface.sh into scripts folder
...
I also renamed it to make it is easier to identify.
2016-01-16 13:12:55 -06:00
665dfdfe8e
Install Figlet Fonts with Toilet
...
Some OS' don't have Figlet Fonts, which causes `chronometer.sh` to have `error: font small not found` instead of the pretty "Pi-hole" display
2016-01-15 18:50:32 -05:00
6b1f14647c
add reference to blacklist.sh
2016-01-15 15:52:27 +00:00
802638ce8b
replaces the non-repository managed web interface for pihole and keeps it updated
2016-01-10 19:08:29 +00:00
6f9d2d0567
fixes #145
...
A much more elegant way to get the screen size.
2016-01-02 17:20:33 -06:00
bc3224e0b9
installer - only select first (probably default) interface in list instead of all
2016-01-02 22:10:26 +00:00
d37db4304c
A few small display changes
...
IPv6 box was missing the title.
Added some IPv6 echoes.
2016-01-01 10:59:30 -06:00
d646612a25
Block ads over IPv6
...
I’m pretty sure this works well. Maybe someone else can try it out.
2015-12-31 20:26:05 -06:00
b757e7a769
Fix typo in installer
...
IPv4 was mentioned in an IPv6 setting - changed to correctly reference IPv6.
2015-12-28 12:29:54 +00:00
184d1bd046
fixes #126
...
These commands were left out, resulting in the Web interface not showing ads blocked despite the Pi-hole working. It is just a permissions error.
2015-12-16 11:23:44 -06:00
4027139d9c
More merge conflict resolution
2015-12-06 20:24:58 -08:00
d215fa9ade
Resolve merge confict
2015-12-06 20:22:34 -08:00
dcccb2ee2b
Merge branch 'bug/multipleIP' into development
2015-12-06 11:58:02 -08:00
412a190b42
Basic-install.sh should only show one ip address in whiptail screen.
2015-12-06 11:05:09 -08:00
d2b260fc1e
Log file is automatically generated by dnsmasq, no need to create.
2015-12-06 10:29:59 -08:00
22d0e82d92
Add GPL V2+ header
2015-12-06 06:31:49 -08:00
7cf5320f50
Only write to dhcpcd.conf if address isn't set
2015-12-06 02:40:30 -08:00
9421366e4f
Breakout basic-install.sh to functions
2015-12-03 09:25:13 -08:00
bc0a8e7733
final dialog verbiage
...
Updating dialog to reflect changes in #90
2015-11-25 18:08:17 -06:00
b011fe28d9
No longer need a reboot
2015-11-25 14:34:06 -08:00
6e13134328
Revert FHS change until merged
2015-11-25 13:55:32 -08:00
29ae66c6db
Check IP info for outgoing interface
2015-11-25 13:43:59 -08:00
464003d674
uninstall script
...
This should remove the Pi-hole.
2015-11-25 13:36:39 -08:00
d0d165ad16
chmod the log flusher
2015-11-15 13:14:56 +00:00
0cb20fc080
typo
2015-11-15 13:14:46 +00:00
dee3df4e11
download master gravity
2015-11-15 13:14:33 +00:00
814873c643
reboot logic
2015-11-15 13:14:22 +00:00
0936e394d4
reboot only if new IP was set
2015-11-15 13:14:07 +00:00
ad91eb44fb
choose an interface
...
also fixing ipv6 logic
2015-11-15 13:13:21 +00:00
76c217d9cc
moving to functions
...
Also download the whitelist script. Ask for donations for IPv6 support.
2015-11-15 13:13:07 +00:00
46b4000e75
reboot works better
2015-11-15 13:12:55 +00:00
8ac8aa72ce
Closing dialog
...
Also starting the Pi-hole and restarting networking.
2015-11-15 13:12:41 +00:00
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
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
fb3fde3d19
testing with no reboot
2015-11-15 13:12:04 +00:00
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
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
f37990351e
dumb mistake
...
fixed the variable name
2015-11-15 13:11:21 +00:00
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
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
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
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
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
7a0b92d2c1
missed a few file paths
2015-10-27 17:03:48 -05:00
cfc4697236
Download and install the Web interface
...
dnsmasq also needs to be able to read the log file to properly display
the statistics
2015-10-27 16:21:20 -05:00
bc3ece778d
/var/www/html instead of /var/www
...
lighttpd in Jessie uses /var/www/html for the root folder, so in order
to only edit one lightpd.conf file, the installer will create the
correct directory even if not being run on Jessie.
2015-10-27 16:19:01 -05:00
6d0c67af9a
Install and enable PHP
...
Needed to view the admin web interface
2015-10-27 16:16:22 -05:00
ced96905e9
Update basic-install.sh
...
change `shutdown -r now` to reboot for ssh users
2015-10-24 21:55:31 +02:00
06e89614e9
Dnsutils package missing for dig tool
2015-10-05 23:58:15 +02:00
7b49677d24
add install for bc and toilet tools
...
these tools are needed later by chronometer.sh
2015-09-22 22:38:25 +02:00
56d4b7b0f7
Update basic-install.sh
2015-09-22 22:13:16 +02:00
96bc557e21
Update basic-install.sh
2015-09-22 22:11:30 +02:00
11fcfc4bf5
Update basic-install.sh
2015-09-22 22:10:33 +02:00
6fc798ebe4
Update basic-install.sh
2015-09-18 00:40:21 +02:00
2b4500363b
Update basic-install.sh
2015-09-18 00:31:17 +02:00
2d91a7a3c4
Update basic-install.sh
2015-09-18 00:22:21 +02:00
d15a085dd0
Update basic-install.sh
2015-09-18 00:20:50 +02:00
8718321727
Update basic-install.sh
2015-09-18 00:06:04 +02:00
46bda342a9
Fix URL of chronometer.sh
...
Github URLs seems to be case-sensitive. Now the chronometer.sh souldn't contain "Not Found" anymore. ;)
2015-08-10 22:50:06 +02:00
6953c02402
detect original pihole and backup
...
Detects if the Pi had an original Pi-hole by looking for adList.conf.
If it exists, it backs up all the files to /etc/pihole/original. Then,
the script continues as normal and creates the new files. This helps
ensure that /etc/hosts and /etc/dnsmasq.d/adList.conf are not being
used simultaneously.
2015-06-21 07:53:29 -05:00
a2350ba880
misspelled "install"
2015-06-16 17:23:48 -05:00
56c776af22
hosts format script
2015-05-19 13:31:37 -05:00
fe4e579005
working copy (I think)
...
for use with the upcoming Raspberry Pi, ad-blocking, wireless router.
2015-02-08 17:17:45 -06:00
55ebc0e492
fixing dns
2014-12-20 13:10:58 -06:00
ea5616d3b3
escaping ascii art
2014-12-20 12:44:36 -06:00
4ba3ba2ef5
initial commit - unstable
2014-12-20 12:43:10 -06:00
Hayden Knowles
Dan Schaper
bcambl
diginc
Eric Warnke
Promofaux
Dan Schaper
Adam Warner
Adam Warner
Marcus Hildum
Jakob Ackermann
Jacob Salmela
Daniel (Fourdee)
Daniel
Mcat12
David Torcivia
Carter Maxwell
Jim Liu
nate
Kevin Ross
Daniel Fayette
slamanna212
Sergio G
Chad Howell
Adam Warner
Kenneth Koski
Leo
Josh Kastang
Clinton
Salmela
Clinton Montague
Emmanuel CHARETTE
mospaeda
Mathias
jacobsalmela