Commit graph

605 commits

Author SHA1 Message Date
Marcus Hildum
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
Jakob Ackermann
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
Adam Warner
ff5d5b97c3 stash any changes in local repo 2016-10-18 13:54:09 +01:00
Dan Schaper
ef3c13fe2b Refire with curl 2016-10-17 19:22:56 -07:00
bcambl
fb9664b636 fix typo 2016-10-16 15:11:47 -06:00
bcambl
ee114b3075 use an excluded extension for ifcfg backup 2016-10-16 13:28:14 -06: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
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
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
diginc
a03caea549 setupVar tests passing for debian & centos 2016-10-10 23:14:39 -05:00
Promofaux
aa23fb1d56 choose* 2016-10-10 22:34:12 +01: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
Dan Schaper
e42b6dcc8e create_pihole_user update @diginc. 2016-10-10 09:21:28 -07:00
Dan Schaper
d71b799e75 More cleanups, localize variables, clean formatting. 2016-10-10 08:23:14 -07:00
Dan Schaper
87e7121332 Gravity.sh checks for null value for variables, obliging that expectation. 2016-10-10 07:32:16 -07:00
Dan Schaper
94f6354c94 Spinner blocks set -e trying to get it in functions that won't crash out... 2016-10-10 07:25:43 -07:00
Dan Schaper
b79059ebdb Start to add the spinner back in! 2016-10-10 06:46:30 -07:00
Dan Schaper
4f98c1bebb Boolean operators inside quotes don't work well... 2016-10-10 06:16:00 -07:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
47aad254d8 localized some more variables 2016-10-10 03:56:03 -07:00
Dan Schaper
bc14074d2a Tighten up Update Whiptail appearance. 2016-10-10 03:39:32 -07:00
Dan Schaper
5ab5b1a190 Overhaul dnsmasq version 3 way handshake configuration files. 2016-10-10 03:23:52 -07:00
Dan Schaper
b055f190f5 Factor out interfaces detection. 2016-10-10 03:16:22 -07:00
Dan Schaper
84b8953352 Remove quiet flags from package managment variables. Set quiets in functions by redirecting output. 2016-10-10 02:58:38 -07:00
Dan Schaper
93a591d487 Linting from ShellCheck 2016-10-10 02:57:04 -07:00
Dan Schaper
e6c0f38a7c Monolithic changes in one commit again. 2016-10-10 02:24:03 -07:00
Dan Schaper
f107ae4f9b Merge conflict resolution 2016-10-10 09:08:25 +00:00
Dan Schaper
bad7a08804 Refactor and rename create_pihole_user. Now to actually use the user created... 2016-10-10 01:51:19 -07:00
Dan Schaper
25cbf4cb35 Factor out legacy location script removal. 2016-10-10 01:43:10 -07:00
Dan Schaper
7f179f9a58 Remove sourcing bash completion, would fall off as soon as the subshell terminated. 2016-10-10 01:40:56 -07:00
Dan Schaper
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
Dan Schaper
43e2aaebf0 rename updateDialogs to update_dialogs 2016-10-10 01:04:59 -07:00
Dan Schaper
e60eb66283 UpdateDialogs are now a Whiptail Menu, self-explanatory. 2016-10-10 01:04:03 -07:00
Dan Schaper
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
Dan Schaper
8a15fd44d5 Update is_repo() to use git status for validity checks. 2016-10-09 23:53:18 -07:00
Dan Schaper
dac2b8942e Typo fix to generate commit. 2016-10-09 22:38:00 -07:00
Dan Schaper
54a1c5b63a Revert inadvertent commits
IDLE keeps committing direct to development.
2016-10-09 22:35:14 -07:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
d9e28a7422 factor out installer_dependencies 2016-10-09 22:05:06 -07:00
Dan Schaper
1fecdf42ca Move git to installer deps, refactor some functions. 2016-10-09 22:00:23 -07:00
Dan Schaper
d4bf85b67c Self contain package_check into package_check_install. Passes set -e test. 2016-10-09 21:44:45 -07:00
Dan Schaper
7131ff27c3 Attempt to set -e 2016-10-09 21:32:25 -07:00
Dan Schaper
a30f78c1c8 Oneliner php version check, passes set -e check. 2016-10-09 21:31:36 -07:00
Dan Schaper
7e0afffca8 Revert inadvertent commits 2016-10-09 19:41:32 -07:00
Dan Schaper
293c60fb9c Exit script on failure to install dependent package. 2016-10-09 13:52:36 -07:00
Dan Schaper
f5be8b2a5e Single dependency package check function, will exit if any errors with message to update cache. 2016-10-09 13:43:01 -07:00
Dan Schaper
6772603c15 Relocate cache check to its own function 2016-10-09 12:34:53 -07:00
Jacob Salmela
a22904f99b Merge pull request #769 from pi-hole/Fix/PackageCacheFresh
Fix/package cache fresh
2016-10-09 09:00:52 -05:00
Dan Schaper
b157bc5cd7 Fixes #768 Check the staleness of the package index instead of the package cache. 2016-10-08 13:47:35 -07:00
Dan Schaper
10e1a03c76 runGravity is called after finalExports in the Debian install side. 2016-10-08 12:58:42 -07:00
Dan Schaper
d20df92e9f Script will now run as root, removed sudo from function calls. 2016-10-08 12:56:26 -07:00
Dan Schaper
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
Dan Schaper
33745be745 Merge pull request #753 from pi-hole/feature/RemoveBarePHP
Remove bare php package from dependencies
2016-10-07 21:32:07 -07:00
Adam Warner
6a28070017 Too many -s 2016-10-07 13:09:27 +01:00
Dan Schaper
91b948332e Merge pull request #754 from pi-hole/fix/bashConditional
fix/bashConditional
2016-10-07 03:42:22 -07:00
Dan Schaper
d1a7fe2d44 fix/bashConditional 2016-10-07 03:36:34 -07:00
Dan Schaper
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
Dan Schaper
8c151c62ce echo's don't need sudo 2016-10-05 10:46:10 -07:00
Dan Schaper
50d16d8215 Finish install conversion for installScripts() 2016-10-05 10:45:17 -07:00
Dan Schaper
3bbac9a5f2 install pihole 2016-10-05 10:19:47 -07:00
Dan Schaper
3600fd277e Don't need sudo to echo to term. 2016-10-05 10:16:56 -07:00
Dan Schaper
e8bb4a7e36 Continue migration to install 2016-10-05 10:14:36 -07:00
Dan Schaper
36987cb1cc Continue migration to install 2016-10-05 09:57:48 -07:00
Dan Schaper
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
Promofaux
c281b47905 Mover {SUDO} mkdir -p /etc/pihole/ back to the beginning. 2016-10-02 12:44:33 +01:00
Promofaux
aca5064743 --force seems to light. lets try --i_do_not_follow_recommendations 2016-10-02 11:16:48 +01:00
Promofaux
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
Promofaux
4e262d81f0 wrap these vars in {} to matcht he rest of the script 2016-10-02 10:39:09 +01:00
Promofaux
6c2ff950ee remote duplicate ${SUDO} mkdir /etc/pihole 2016-10-02 10:33:59 +01:00
Promofaux
7684069d0b verifyFreeDiskSpace BEFORE installing any dependencies 2016-10-02 10:33:04 +01:00
Promofaux
73c85ae68a remove duplicate calls to installConfigs 2016-10-02 10:30:55 +01:00
Promofaux
6a8bef83b3 Fix the php version check command (Thanks @diginc!) 2016-09-30 22:40:43 +01:00
Adam Warner
3fc3c5cae4 Add iproute2 to fix #653 2016-09-27 11:15:46 +01:00
Adam Warner
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
Dan Schaper
ac8d295bb9 Merge pull request #668 from bcambl/dns-hostname-fixes
Dns hostname fixes
2016-09-20 10:16:15 -07:00
bcambl
21d4199a38 Merge branch 'development' into dns-hostname-fixes 2016-09-19 17:33:32 -06:00
Adam Warner
655c422c3c Add additional instruction.
Include "(Press space to select)" on ChooseInterface
2016-09-19 22:17:58 +01:00
Dan Schaper
5ca6599ca9 Merge branch 'development' into gravTweak 2016-09-19 12:54:58 -07:00
Promofaux
f16574085f remove code made redundant by the existence of /etc/pihole/setupVars.conf 2016-09-16 23:09:14 +01:00
Promofaux
a0977af081 remove references to UpdateDashboard.sh 2016-09-12 19:10:12 +01:00
Adam Warner
c2cb92a0b0 Add cron to apt-get dependencies 2016-09-08 23:42:05 +01:00
bcambl
6c0c6182e9 fix newline in configureSelinux stdout 2016-09-07 21:16:52 -06:00
bcambl
05ad4445b5 add dns to sysconfig interface configuration 2016-09-07 21:16:51 -06:00
bcambl
1dd9f0747e add gateway to interface configuration
pi-hole@9cb4e8b broke #593
original commit 8550b76
2016-09-07 21:16:36 -06:00
Promofaux
04c60e8a1c Switch fedora and debian install check order 2016-09-05 15:52:09 +01:00
Promofaux
01a9534729 Merge branch 'development' into UpdateMethod
# Conflicts:
#	automated install/basic-install.sh
2016-08-30 19:32:40 +01:00
Promofaux
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
Promofaux
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
Daniel (Fourdee)
49ded54306 Minor - Update descriptions
Apply to whiptail descriptions also.
2016-08-25 12:17:36 +01:00
Daniel (Fourdee)
6c0a8a4337 Minor - Corrected var names
Kilobyte values are used, not Bytes.
2016-08-25 12:11:54 +01:00
Promofaux
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
Promofaux
ed94f4b1df Create directory before trying to create a blank file in it.... 2016-08-22 22:06:33 +01:00
Promofaux
a57b097afc Change echos at the end of install depending on install or update 2016-08-21 18:00:41 +01:00
Promofaux
eb42b894c4 Delete setupVars.conf if user cancels out of install process. 2016-08-21 17:57:11 +01:00
Promofaux
b3e7619048 curly brackets all the variables! 2016-08-21 02:12:02 +01:00
Promofaux
7eb43a0b47 Expand update dialog text 2016-08-19 23:25:04 +01:00
Promofaux
fdb104348c Add updatePihole method 2016-08-19 22:45:24 +01:00
Promofaux
f54828352d remove spaces from update bool set 2016-08-19 22:42:04 +01:00
Promofaux
cc157def63 remove --defaultyes from update whiptail 2016-08-19 22:40:27 +01:00
Promofaux
8fc83655ab correct filename spelling mistake 2016-08-19 22:38:16 +01:00
Promofaux
9fb549293a APPEND 2016-08-19 22:34:50 +01:00
Promofaux
e4cc5b5b70 testing a new update method by detecting the existence of vars saved from install 2016-08-19 22:31:11 +01:00
Daniel (Fourdee)
037318e2ff Provide non-zero exit code, as per existing sourcecode. 2016-08-12 13:20:30 +01:00
Daniel (Fourdee)
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
Promofaux
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
bcambl
fe8d0f8ea8 Merge branch 'development' into sysconfig_gateway 2016-08-03 19:26:53 -06:00
Promofaux
2bc364023a Remove erroneous space in chmod command
Fix spacing in help function
2016-08-02 23:51:53 +01:00
Promofaux
57df56dc62 Add version.sh to the install script 2016-08-02 20:08:21 +01:00
Promofaux
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
bcambl
8550b76e23 add gateway to interface configuration 2016-07-24 22:42:06 -06:00
Blayne Campbell
c647e27e15 Merge branch 'development' into centos-nc 2016-07-19 08:48:54 -06:00
Adam Warner
73645f299a Merge branch 'development' into bugfix/dhcpcd_comments 2016-07-18 14:37:38 +01:00
bcambl
a32ad0dbf2 fix centos nc dependency 2016-07-15 21:43:23 -06:00
Promofaux
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
Dan Schaper
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
Daniel
2b0ba281a4 Repairs apt-get incorrect options 2016-07-04 15:35:46 -04:00
Dan Schaper
024b741552 Merge pull request #490 from bcambl/fedora-armhf7
Fedora Support
2016-06-29 14:25:23 -07:00
Mcat12
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
bcambl
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
bcambl
3ba05d0274 configure static IP on Fedora via sysconfig script 2016-06-11 22:10:12 -06:00
bcambl
0d9a8d70bf configureSelinux prior to installPihole 2016-06-11 17:28:57 -06:00
bcambl
5c79184d3b add ifconfig dependency for Fedora install 2016-06-11 17:17:12 -06:00
bcambl
3d619d9ccc fix iptables udp rule
fixes dmesg: ip_tables: udp match: only valid for protocol 17
2016-06-11 17:04:45 -06:00
bcambl
afdf3ae7a1 add sudo package to PIHOLE_DEPS 2016-06-11 16:10:31 -06:00
bcambl
943f7c06b5 uninstaller support for Fedora/CentOS 2016-06-11 15:58:49 -06:00
bcambl
27a9642090 check for sudo via 'command -v' instead of dkpg-query 2016-06-11 15:58:49 -06:00
bcambl
d0b6ff2d08 add udp port 53 to iptables/firewalld configuration 2016-06-11 15:58:49 -06:00
bcambl
97737ee9e3 move SELinux config to installPihole() for logging 2016-06-11 15:58:49 -06:00
bcambl
5e27ccc37c firewalld: specify ports and use default zone 2016-06-11 15:58:49 -06:00
bcambl
682113892a enable SELinux boolean for httpd server side includes (SSI) 2016-06-11 15:58:49 -06:00
bcambl
376eb81181 SELinux Support 2016-06-11 15:58:49 -06:00
bcambl
4fc40d96d9 ensure firewalld is running before configuration 2016-06-11 15:58:49 -06:00
bcambl
e6634531c7 basic firewalld/iptables configuration 2016-06-11 15:58:49 -06:00
bcambl
04e375a523 enable lighttpd and dnsmasq via systemd 2016-06-11 15:58:49 -06:00
bcambl
65638973ea correct dhcpcd package name to dhcpcd5
move dhcpcd5 to installer dependencies
2016-06-11 15:58:49 -06:00
bcambl
9c26bdd676 ensure fastcgi socket directory and permissions 2016-06-11 15:58:49 -06:00
bcambl
b31931c907 add epel-release for CentOS support 2016-06-11 15:58:49 -06:00
bcambl
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
bcambl
c160b2e54b fix lighttpd user/group variables 2016-06-11 15:58:48 -06:00
bcambl
c4234f4542 ensure ownership/existence of /var/cache/lighttpd/compress 2016-06-11 15:58:48 -06:00
bcambl
62fa9c0f6e fixing whitespace 2016-06-11 15:58:48 -06:00
bcambl
8198f06073 ensure dnsmasq conf-dir is configured for /etc/dnsmasq.d 2016-06-11 15:58:48 -06:00
bcambl
6f2117d786 append '.debian' to lighttpd.conf for compatability 2016-06-11 15:58:48 -06:00
bcambl
b3ec3b487c add Fedora dependency: lighttpd-fastcgi 2016-06-11 15:58:48 -06:00
bcambl
94f131a0b7 update deps and package manager variables 2016-06-11 15:58:48 -06:00
bcambl
7af0029175 check for systemctl for systemd service management 2016-06-11 15:58:48 -06:00
bcambl
f4228b04f8 additional fedora dependancies
based on current fedora (23 at this moment) docker image
2016-06-11 15:58:48 -06:00
bcambl
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
bcambl
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
bcambl
37dda79db2 install dependencies for install script 2016-06-11 15:58:48 -06:00
bcambl
063e3e85e1 Fedora compatibility variables and dependencies 2016-06-11 15:58:41 -06:00
bcambl
42afaa9f66 remove dpkg-query dependency from sudo check 2016-06-11 15:53:46 -06:00
Jacob Salmela
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
Jacob Salmela
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
Jacob Salmela
1e0666d1ef make folder so file can be deployed 2016-06-10 18:51:38 -05:00
Jacob Salmela
1c53ad6876 mcat is smarter than me
He already added this.
2016-06-10 18:20:53 -05:00
Jacob Salmela
dc2a537f6b copy sudoers file
necessary for Web interface white/black list functionality.
2016-06-10 17:47:27 -05:00
Mcat12
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
Mcat12
6cf446032f Show web interface URL after install 2016-05-25 18:55:36 -04:00
Mcat12
d52a8f08ed Merge pull request #501 from davidtorcivia/development
Fix basic install for Proxmox LXC
2016-05-11 19:12:37 -04:00
David Torcivia
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
Carter Maxwell
c0e1772e21 Replace toilet with echo 2016-05-07 11:44:18 -07:00
Jim Liu
00cc480bc1 Update basic-install.sh 2016-04-26 16:10:51 +08:00
Jim Liu
221b72439b Update basic-install.sh 2016-04-22 01:46:27 +08:00
Mcat12
24de6d6fc9 Allow sudoers file to be uninstalled 2016-04-20 21:43:01 -04:00
Mcat12
09cdf5081c Install sudoer file 2016-04-17 23:03:12 -04:00
Adam Warner
cbbc6df05a Merge pull request #425 from PiHoleController
Fixes spacing issues in whiptail dialogs
2016-04-05 22:26:02 +01:00
nate
5347ee4896 Write verbose status of processes to debug log & Minor UI Fixes 2016-04-04 00:59:24 -05:00
nate
22ea384ac8 Fix whiptail spacing 2016-04-03 18:05:11 -05:00
nate
69e8c014c3 Indentation fix 2016-04-03 17:25:48 -05:00
Promofaux
c6fb0bad4b change spinstr to match spinstr in basic-install.sh 2016-04-03 21:45:00 +01:00
Promofaux
2d08217173 Tidy up For loops, clean up whitespace 2016-04-03 21:43:36 +01:00
Promofaux
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
Promofaux
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
nate
71133f6b59 Spelling error fix... 2016-04-02 19:42:33 -05:00
nate
5d5d6c2c70 handle case where parent directories do not exist 2016-04-02 19:31:26 -05:00
nate
37fa462db5 Erraneous call to SUDO removed 2016-04-02 19:24:19 -05:00
nate
1a2046a7eb Added uninstall option to pihole command. Minor fixes 2016-04-02 19:20:54 -05:00
nate
3dff7e80fc Fixed path to /etc/bash_completion.d/ 2016-04-02 18:52:03 -05:00
nate
6eea9239a7 Merged branch development into PiHoleController 2016-04-02 18:41:36 -05:00
nate
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
nate
447af208b3 Fixed missing cp of piholeDebug.sh to /opt/pihole 2016-04-02 17:59:59 -05:00
nate
d47fbbbe96 Mcat12 requests. Added bash-completion support 2016-04-02 17:58:10 -05:00
nate
777676b525 Made uninstall.sh and pihole.sh executable. 2016-03-31 20:33:15 -05:00
nate
28f2a1309e Merge branch 'development'
Conflicts:
	automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
nate
4b0a7c2252 Added 01-pihole.conf to be removed on uninstall regardless of removing dnsmasq 2016-03-30 20:23:24 -05:00
nate
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
Nate
fb5bc16c83 Call gravity.sh in it's new location 2016-03-29 00:14:56 -05:00
nate
456eee05f2 Added pihole.sh to /usr/local/bin
Uninstall.sh will handle removing the file
2016-03-28 18:55:37 -05:00
nate
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
nate
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
nate
660e71f032 Added blacklist.sh to be removed on uninstall from u/l/b 2016-03-28 16:32:42 -05:00
nate
138aeaf8c7 Added uninstall.sh and updateDashboard.sh to be removed on uninstall from u/l/b 2016-03-28 16:25:12 -05:00
nate
80f4bf9475 Bug fixes
Fixed DONE! to done!
Fixed symlinking user scripts
Fixed /n to \n
2016-03-28 16:20:23 -05:00
nate
f444c7d4a5 Merge resolution 2016-03-28 12:21:49 -05:00
nate
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
nate
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
Nate
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
Nate
2b5cee05e6 Check for existing directory before trying to perform operations on it. 2016-03-27 10:59:09 -05:00
Nate
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
nate
5ee382c8eb Roll back addition of piholeDebug.sh (production master base) 2016-03-26 17:00:52 -05:00
Nate
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
Nate
7388461ede Modularized uninstall for cleanliness and robust usability. 2016-03-26 16:57:27 -05:00
nate
5223627b71 read locks echos... reordered to warn user 2016-03-26 16:57:22 -05:00
nate
646c4a3ccc Newline not read correctly in prompt 2016-03-26 16:57:17 -05:00
nate
0b9e78df2c Cleaned code and added prompt for purge on uninstall 2016-03-26 16:57:01 -05:00
Promofaux
bc09760c84 Grab changes by @rosskevin. (#386 - lighttpd changes to handle JS files) 2016-03-24 23:19:44 +00:00
Promofaux
1e6ac33ef1 Fix merge conflicts 2016-03-24 23:18:14 +00:00
Adam Warner
02bb5b6742 Revert previous change
Reopens #384
2016-03-20 20:50:31 +00:00
Adam Warner
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
nate
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
Kevin Ross
404ea0ce6d copy both the html and js stubs during install 2016-03-14 22:54:45 -05:00
Carter Maxwell
4452f784a8 remove trailing whitespace basic-install.sh 2016-03-05 21:16:23 -08:00
Mcat12
adcd7f10ee Fixed password input 2016-02-28 15:24:38 -05:00
Mcat12
af83936047 Added password to install
Saves in password.txt
2016-02-28 15:18:48 -05:00
Adam Warner
a0673c7028 Update basic-install.sh
Increase required free bytes.
2016-02-21 20:38:05 +00:00
Promofaux
ca2d3a192c add double bracket notation to lines 396, 399, 403 . Fixes error raised by @jacobsalmela 2016-02-21 18:38:34 +00:00
Promofaux
0ebb7eecdb Verify Custom DNS IP is a valid IP address 2016-02-20 17:33:20 +00:00
Promofaux
800d2f0859 Add back in whiptail dialog to verifyFreeDiskSpace() 2016-02-20 16:17:29 +00:00
Promofaux
f397844603 Remove conflicted merge markup. Not sure how that got through. 2016-02-20 16:08:02 +00:00
Promofaux
2d895f328c Fix merge conflicts 2016-02-20 15:38:39 +00:00
Promofaux
b14b182084 change regex to test for one or more numbers, not 0 or more numbers. 2016-02-20 15:17:57 +00:00
Promofaux
8687d25d88 make prepopulation of freetext on custom DNS provider a bit more intelligent 2016-02-20 15:12:13 +00:00
Promofaux
7001edcd1d Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs. 2016-02-20 15:00:03 +00:00
Mcat12
4a1e88f4bf Fixed Pi-hole user not being created 2016-02-20 09:48:06 -05:00
Promofaux
b41608d40b Include fix for regex in verifyFreeDiskSpace() 2016-02-20 14:44:56 +00:00
Adam Warner
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
Daniel Fayette
8e289215b4 Account for CHIP pc not having root on '/' 2016-02-17 10:00:36 -06:00
Adam Warner
c3c051385c Update basic-install.sh
Corrected mistake in previous commit
2016-02-17 12:42:31 +00:00
Promofaux
c396aeed52 Correct miss-spelled variables on lines 398 and 403 2016-02-17 00:07:14 +00:00
Adam Warner
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
Daniel Fayette
432e6d5395 Cleaned up output, Fixed Cancel button 2016-02-16 16:47:36 -06:00