Remove pihole

Internal VPN server is working just perfectly instead
This commit is contained in:
Jake Howard 2020-06-24 18:46:13 +01:00
parent 7d61282d19
commit dd12b795b5
Signed by: jake
GPG key ID: 57AFB45680EDD477
7 changed files with 0 additions and 93 deletions

View file

@ -1,9 +1,6 @@
[Interface] [Interface]
Address = {{ item.value.ip }} Address = {{ item.value.ip }}
PrivateKey = {{ item.value.private_key }} PrivateKey = {{ item.value.private_key }}
{% if item.value != wireguard.clients.intersect %}
DNS = {{ wireguard.clients.intersect.ip }}
{% endif %}
[Peer] [Peer]
PublicKey = {{ wireguard.server.public_key }} PublicKey = {{ wireguard.server.public_key }}

View file

@ -1,5 +0,0 @@
localise-queries
{% for host in internal_hostnames %}
host-record={{ host }},{{ wireguard.clients.intersect.ip }}
{% endfor %}

View file

@ -1,22 +0,0 @@
version: "2.3"
services:
pihole:
container_name: pihole
image: pihole/pihole:v5.0
ports:
- "{{ wireguard.clients.intersect.ip }}:53:53/tcp"
- "{{ wireguard.clients.intersect.ip }}:53:53/udp"
environment:
- TZ=Europe/London
- VIRTUAL_HOST=pihole.jakehoward.tech
volumes:
- ./pihole/:/etc/pihole/
- ./dnsmasq.d/:/etc/dnsmasq.d/
restart: unless-stopped
labels:
- traefik.enable=true
- traefik.http.routers.pihole.rule=Host(`pihole.jakehoward.tech`)
- traefik.http.routers.pihole.tls.certresolver=le
- traefik.http.routers.pihole.middlewares=internal-only@file
- traefik.http.services.pihole-pihole.loadbalancer.server.port=80

View file

@ -19,9 +19,6 @@
- name: Install nextcloud - name: Install nextcloud
include: nextcloud.yml include: nextcloud.yml
- name: Install pihole
include: pihole.yml
- name: Install quassel - name: Install quassel
include: quassel.yml include: quassel.yml

View file

@ -1,48 +0,0 @@
- name: Include pihole variables
include_vars: pihole.yml
- name: Create pihole directory
file:
path: /opt/pihole
state: directory
owner: "{{ docker_user.name }}"
mode: "{{ docker_compose_directory_mask }}"
become: true
- name: Install pihole compose file
template:
src: files/pihole/docker-compose.yml
dest: /opt/pihole/docker-compose.yml
mode: "{{ docker_compose_file_mask }}"
owner: "{{ docker_user.name }}"
validate: /usr/bin/docker-compose -f %s config
register: compose_file
become: true
- name: Create dnsmasq directory
file:
path: /opt/pihole/dnsmasq.d/
state: directory
mode: "{{ docker_compose_directory_mask }}"
become: true
- name: Install dnsmasq hosts config
template:
src: files/pihole/dnsmasq-vpn.conf
dest: /opt/pihole/dnsmasq.d/02-vpn.conf
mode: "{{ docker_compose_file_mask }}"
owner: "{{ docker_user.name }}"
register: dnsmasq_vpn_hosts
become: true
- name: Cycle pihole container
docker_compose:
project_src: /opt/pihole
pull: true
remove_orphans: true
remove_volumes: true
state: "{{ item }}"
when: compose_file.changed or dnsmasq_vpn_hosts.changed
loop:
- absent
- present

View file

@ -1,4 +0,0 @@
internal_hostnames:
- deluge.jakehoward.tech
- speed.jakehoward.tech
- pihole.jakehoward.tech

View file

@ -84,14 +84,6 @@ resource "cloudflare_record" "jakehowardtech_quassel" {
ttl = 1 ttl = 1
} }
resource "cloudflare_record" "jakehowardtech_pihole" {
zone_id = cloudflare_zone.jakehowardtech.id
name = "pihole"
value = vultr_server.casey.main_ip
type = "A"
ttl = 1
}
resource "cloudflare_record" "jakehowardtech_collabora" { resource "cloudflare_record" "jakehowardtech_collabora" {
zone_id = cloudflare_zone.jakehowardtech.id zone_id = cloudflare_zone.jakehowardtech.id
name = "collabora" name = "collabora"