42f1fa3380
Wrong conditional...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-19 23:20:58 +01:00
5ca1dbf35f
Massive overhaul of `install.sh based on how I test fresh installs of differing branches/tags
...
First git clone the repos, next checkout the relevant branches and finally run the install script. Simples.
`sed`ed out a couple of other unsupported functions
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-19 23:06:00 +01:00
ebe72b45e4
Merge pull request #737 from shaderecker/symlink
...
Remove broken doco-example.yml symlink
2021-04-19 14:54:52 +01:00
c36d6ae501
Merge pull request #842 from pi-hole/master
...
master->dev
2021-04-19 09:52:40 +01:00
2e04f5abee
Add upgrade note for v.58
2021-04-19 09:38:15 +01:00
17f6ef8e56
Merge pull request #837 from pi-hole/dev
...
Release 5.8 - "Third time's the charm" edition
2021-04-17 18:23:33 +01:00
c9a3ac0df1
Merge pull request #818 from static-void-main/dev
...
Add support for the i386 architecture
2021-04-17 17:17:57 +01:00
784be64178
Merge pull request #839 from pi-hole/tweak/valid_ip
...
Check for validity of values passed in through `PIHOLE_DNS_`
2021-04-17 11:17:25 +01:00
82ef6544a4
Merge pull request #840 from pi-hole/revert-743-docker-hostname
...
Revert "Add `hostname` to docker-compose"
2021-04-17 00:54:31 +01:00
59c08f36ee
Revert "Add `hostname` to docker-compose"
2021-04-17 00:53:51 +01:00
dba2317072
Merge pull request #769 from ignic/dhcp_setup
...
Enable DHCP Server with environment variables
2021-04-16 23:45:43 +01:00
4b7c35be7e
Merge pull request #743 from e2jk/docker-hostname
...
Add `hostname` to docker-compose
2021-04-16 23:31:56 +01:00
f6b9716a75
Additionally, exit script if 0 valid entries are detected
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 23:19:58 +01:00
14e3bcb480
Check for validity of values passed in through `PIHOLE_DNS_` Throw away junk.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 22:56:09 +01:00
e88429a65d
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into dev
2021-04-16 21:56:13 +01:00
4f531d9e78
Irrelevant since IP blocking is no longer the default method.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 21:55:55 +01:00
87c99a0b8c
Merge pull request #823 from limes007/master
...
Make test of IPv6 env variable case insensitive
2021-04-16 19:40:25 +01:00
6f865b1699
Remove some out of date info about not remapping port 80.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 18:40:47 +01:00
ba6f7f9d62
remove Upgrade notices section. It's old, and there isn't really anything relevant in there any more.
2021-04-16 18:33:01 +01:00
1207b5cb88
Merge pull request #836 from mdzw/patch-1
...
Move gravity on boot to a @reboot cron job
2021-04-16 17:51:28 +01:00
1633a976a4
Only remove the cron.d file if it exists
...
Signed-off-by: Matt Winter <MattWinter@gmail.com>
2021-04-16 12:36:13 -04:00
fa771f74fd
Change gravity-on-boot so it's run by cron
...
Proposed solution to #834
I believe the correct way to solve this issue is to change when "Gravity on Boot" is run.
The s6 init system has different stages. Currently, "gravity on boot" is run during Stage 2.ii: cont-init.d. One instance of pihole-FTL is started during cont-init, but it is only there to check the validity of the config files; it exits soon after starting. The final "service mode" instance of pihole-FTL is not started until Stage 2.iii, when the supervisor starts doing work.
If gravity.sh is counting on FTL to do its DNS lookups, then we should not run gravity until the supervised instance of FTL is running. We can accomplish this by moving "Gravity on Boot" to a @reboot line in /etc/cron.d/gravity-on-boot, and making that file's existence dependent on the value of SKIPGRAVITYONBOOT.
This will work because cron isn't started until we've reached Stage 2.iii.
Signed-off-by: Matt Winter <MattWinter@gmail.com>
2021-04-16 10:58:14 -04:00
6f21b020f8
Add i386 arch to deployment script
...
Signed-off-by: static-void-main <33235498+static-void-main@users.noreply.github.com>
2021-04-15 01:09:22 +02:00
6292fd1294
Add i386 arch
...
Signed-off-by: static-void-main <33235498+static-void-main@users.noreply.github.com>
2021-04-15 00:15:31 +02:00
68ad7b045d
Merge pull request #833 from pi-hole/dev
...
Release 5.8 - Take 2
2021-04-14 23:03:00 +01:00
fe7f0c8612
Merge pull request #832 from pi-hole/release/v5.8-1
...
Release prep
2021-04-14 22:47:07 +01:00
692a12c2c6
Acccount for core 5.3.1
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-14 22:27:50 +01:00
731cd5e907
Merge pull request #831 from pi-hole/dev
...
Release v5.8
2021-04-14 19:34:09 +01:00
e6a45eb96b
prep for new release ( #830 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-14 19:18:20 +01:00
f53015157d
Issue #824 - Don't log password ( #825 )
...
When setting the password, explicitly disable bash logging. Leave the
re-enable code so that other functions work as expected. Additionally,
do not remove the print in generate_password so randomly generated
passwords are still logged for user consistency.
Signed-off-by: Kyle Kurz <kyle@doublekaudio.com>
2021-04-14 17:13:01 +01:00
190844d0b0
remove no longer required code ( #736 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-14 14:36:55 +01:00
6532390647
Only set one PIHOLE_DNS_ entry in the install script ( #826 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-13 19:09:40 +01:00
26aea62e22
Added new Debian version: bullseye ( #828 )
...
Signed-off-by: Daniel <daniel@developerdan.com>
2021-04-13 18:09:31 +01:00
ededb44601
fix test of IPv6 env variable
...
Signed-off-by: limes007 <39467727+limes007@users.noreply.github.com>
2021-04-09 21:10:53 +02:00
c0e55c156f
Remove port 443 from templates and documentation. (Redo) ( #808 )
...
* Update docker_run.sh
* Update docker-compose.yml.example
* Update README.md
* Update Dockerfile
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-02-26 20:09:31 +00:00
6d9913e824
Merge pull request #807 from pi-hole/master
...
Master -> Dev
2021-02-26 19:44:48 +00:00
20cd9c3abf
Merge pull request #803 from pi-hole/fix/GH_IssueTemplate2
...
Add required front matter to bug report template.
2021-02-18 13:05:53 -08:00
e6307df638
Add required front matter to bug report template.
2021-02-18 12:56:33 -08:00
14f6262491
Merge pull request #800 from pi-hole/fix/issue_templates
...
Override default issue templates
2021-02-18 12:50:21 -08:00
bcd9ad5157
Copy default config.yml
...
From the docs:
> If a repository has any files in its own .github/ISSUE_TEMPLATE folder, including issue templates or a config.yml file, none of the contents of the default .github/ISSUE_TEMPLATE folder will be used.
So we need to copy the config.yml since it will be ignored.
2021-02-18 10:25:05 -08:00
6e1e93112d
Override default issue templates
2021-02-18 10:17:40 -08:00
5acc88ef86
Merge pull request #798 from pi-hole/master
...
sync master back to dev
2021-02-17 00:12:15 +00:00
8d57c8ce7b
Merge pull request #797 from pi-hole/dev
...
Dev -> master
2021-02-16 23:31:34 +00:00
ea7f659874
Merge branch 'master' into dev
2021-02-16 23:17:52 +00:00
abdf9f1130
remove shared memory files before starting the FTL process. Mimics bare metal service script (to an extent) ( #796 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-16 23:09:49 +00:00
75328c63f8
Merge pull request #793 from pi-hole/dev
...
Release 5.7
2021-02-16 20:19:25 +00:00
3f0a7d85b1
bump web version
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-16 19:50:09 +00:00
c5484e6a85
Merge pull request #792 from optimusprime01/devel
...
fixing typos in ReadMe
2021-02-16 09:15:31 +00:00
dad930f9d2
fixing typos in ReadMe
...
Signed-off-by: Sachin Sunder Sagadevan <sachsun2809@outlook.com>
2021-02-15 20:25:12 -08:00
b39f53d12e
Merge pull request #790 from Sounie/documentation-tidy-ups
...
Couple of typos in docs.
2021-02-12 20:34:45 +00:00
Adam Warner
Adam Warner
Matt Winter
static-void-main
Kyle Kurz
Daniel
limes007
Dan Schaper
Sachin Sunder Sagadevan