Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more yml-like environment format #96

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
85d70dd
Update README.md
IAmStoxe Sep 4, 2020
e699487
.gitignore
Sep 4, 2020
bcb46f0
Fixed dns and SERVERPORT in docker-compose.yml
Sep 4, 2020
94647a2
Update docker-compose.yml
Sep 4, 2020
c310edc
Fixed deployments
Sep 8, 2020
90e6e48
Fix unbound.conf verobisty
Sep 8, 2020
d28cf5d
Update README.md
IAmStoxe Sep 9, 2020
1c2cdfc
Update README.md
IAmStoxe Sep 9, 2020
854fc71
Update README.md
IAmStoxe Sep 9, 2020
3e43a9c
Update README.md
IAmStoxe Sep 9, 2020
8c585b7
Added DDNS instructions
Sep 9, 2020
20fa318
Modified to only expose wireguard ports.
Sep 9, 2020
6c0de00
Update README.md
IAmStoxe Sep 10, 2020
bdd9793
Update README.md
IAmStoxe Sep 10, 2020
be349bf
Update README.md
IAmStoxe Sep 10, 2020
60ca90e
Update README.md
IAmStoxe Sep 10, 2020
a55224b
Updated unbound.conf. Updated README.
Sep 10, 2020
9855c53
Update README to include instructions for local records
Sep 10, 2020
ee1f9b0
Lower verbosity of unbound. Update Readme.
Sep 11, 2020
78056bb
Update readme
Sep 11, 2020
dbe67a8
Update readme
Sep 11, 2020
8be36dc
Update readme
Sep 11, 2020
dba0467
Update README.md
IAmStoxe Sep 14, 2020
c2ec627
Update README.md
IAmStoxe Sep 14, 2020
f499b94
Update README.md
IAmStoxe Sep 14, 2020
b40ed1b
Update README.md
IAmStoxe Sep 15, 2020
6a94e84
Update README.md
IAmStoxe Sep 15, 2020
8b5a54e
Update README.md
IAmStoxe Sep 15, 2020
f7d3d5b
Minor name fixes
dschaper Sep 29, 2020
5b35c32
Merge pull request #8 from dschaper/patch-1
IAmStoxe Sep 29, 2020
841b9d2
Revert "Minor name fixes"
IAmStoxe Sep 29, 2020
55b789c
Merge pull request #9 from IAmStoxe/revert-8-patch-1
IAmStoxe Sep 29, 2020
1e72d0a
Update README.md
IAmStoxe Mar 25, 2021
e3a1e15
Update README
IAmStoxe Jun 1, 2021
87bb4b3
FUNDING.yml
IAmStoxe Jun 2, 2021
8cac08d
Update unwanted-reply-threshhold to 10m per recommendation
IAmStoxe Jun 19, 2021
9f5a9ee
Remove rate-limit
IAmStoxe Jun 19, 2021
1aad9cb
Fix ServerIP env for Pi-hole in compose
awooooool Dec 2, 2021
7585b28
Minor typo in issue url in README.md
awooooool Dec 2, 2021
374175d
fix verbosity level & a typo
icy-comet Jan 28, 2022
fa470e8
Merge pull request #58 from awooooool/compose
IAmStoxe Mar 15, 2022
954a9b1
Merge pull request #67 from icy-comet/patch-1
IAmStoxe Mar 15, 2022
0c277e6
Merge pull request #59 from awooooool/readme
IAmStoxe Mar 15, 2022
b03bc4f
Add infrastructure model
InfraGenie Aug 16, 2022
e292c6d
Update readme with infrastructure model
InfraGenie Aug 16, 2022
67a21cf
Merge pull request #83 from InfraGenie/infra_bot_model_0ac70fed
IAmStoxe Aug 16, 2022
bd16bed
Create stale.yml
IAmStoxe Aug 26, 2022
a05d10e
Merge pull request #85 from IAmStoxe/IAmStoxe-patch-1
IAmStoxe Aug 26, 2022
234fb38
Merge pull request #86 from IAmStoxe/github/actions
IAmStoxe Aug 26, 2022
40f3c2f
Update stale.yml
IAmStoxe Aug 26, 2022
2f306c0
more yml-like environment format
kamartem Jan 4, 2023
fea7c5f
add editor folder & env file to ignore
kamartem Jan 4, 2023
215a8dd
format & user .env file
kamartem Jan 4, 2023
5cbaa34
update readme
kamartem Jan 4, 2023
90e3d6d
remove unused staff
kamartem Jan 4, 2023
625492e
update documentation & scripts
kamartem Jan 5, 2023
b3040cb
freeze unbound version due to error log in latest
kamartem Jan 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minor name fixes
Use the spelling `Pi-hole` throughout document.
dschaper authored Sep 29, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f7d3d5b3496deda654fd5e1c3ce4286c20d3ceb2
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## What is this?
WireHole is a combination of WireGuard, PiHole, and Unbound in a docker-compose project with the intent of enabling users to quickly and easily create and deploy a personally managed full or split-tunnel WireGuard VPN with ad blocking capabilities (via Pihole), and DNS caching with additional privacy options (via Unbound).
WireHole is a combination of WireGuard, Pi-hole, and Unbound in a docker-compose project with the intent of enabling users to quickly and easily create and deploy a personally managed full or split-tunnel WireGuard VPN with ad blocking capabilities (via Pi-hole), and DNS caching with additional privacy options (via Unbound).

## Prerequisites:

@@ -112,7 +112,7 @@ Modify your wireguard client `AllowedIps` to `10.2.0.0/24` to only tunnel the we

---

## Access PiHole
## Access Pi-hole

While connected to WireGuard, navigate to http://10.2.0.100/admin

@@ -179,13 +179,13 @@ Providers they have the information for:

---

## Setting a DNS record for pihole
1. Login to pihole admin
## Setting a DNS record for Pi-hole
1. Login to Pi-hole admin
2. Navigate to "Local Records"
3. Fill out the form like the image below
![Image](https://i.imgur.com/PM1kwcf.png)

Provided your DNS is properly configured on the device you're using, and you're connected to WireGuard, you can now navigate to http://pi.hole/admin and it should take you right to the pihole admin interface.
Provided your DNS is properly configured on the device you're using, and you're connected to WireGuard, you can now navigate to http://pi.hole/admin and it should take you right to the Pi-hole admin interface.

---

@@ -206,11 +206,11 @@ The templates used for server and peer confs are saved under /config/templates.
* [The Big Blocklist Collection](https://firebog.net/)

### Commonly whitelisted domains
* [Pi-Hole Community List](https://discourse.pi-hole.net/t/commonly-whitelisted-domains/212)
* [Pi-hole Community List](https://discourse.pi-hole.net/t/commonly-whitelisted-domains/212)
* [anudeepND Whitelist](https://github.com/anudeepND/whitelist)

### Why do you use Unbound / What benefit is there to using Unbound?
* [PiHole Official Site: What does this guide provide?](https://docs.pi-hole.net/guides/unbound/#what-does-this-guide-provide)
* [Pi-hole Official Site: What does this guide provide?](https://docs.pi-hole.net/guides/unbound/#what-does-this-guide-provide)

---