diff options
| author | Elizabeth Hunt <me@liz.coffee> | 2025-04-06 11:30:47 -0700 |
|---|---|---|
| committer | Elizabeth Hunt <me@liz.coffee> | 2025-04-06 12:55:06 -0700 |
| commit | 2e2464cb53ddeb69b98b20d9e5ef4bda21075a9e (patch) | |
| tree | b3a9567dd336d0e8f6dce4c0f2f8cb69b4d34b93 | |
| parent | b7e54ba5fa27ed77d00b146547653508d9952812 (diff) | |
| download | infra-2e2464cb53ddeb69b98b20d9e5ef4bda21075a9e.tar.gz infra-2e2464cb53ddeb69b98b20d9e5ef4bda21075a9e.zip | |
rename sips_domain
| -rw-r--r-- | deploy.yml | 3 | ||||
| -rw-r--r-- | group_vars/all.yml | 2 | ||||
| -rw-r--r-- | group_vars/keepalived.yml | 2 | ||||
| -rw-r--r-- | group_vars/pihole.yml | 1 | ||||
| -rw-r--r-- | group_vars/portainer.yml | 2 | ||||
| -rw-r--r-- | group_vars/traefik.yml | 1 | ||||
| -rw-r--r-- | playbooks/roles/pihole/templates/stacks/docker-compose.yml | 2 | ||||
| -rw-r--r-- | playbooks/roles/traefik/templates/stacks/docker-compose.yml | 4 |
8 files changed, 11 insertions, 6 deletions
@@ -38,3 +38,6 @@ - name: Kanboard ansible.builtin.import_playbook: playbooks/kanboard.yml + +- name: SilverBullet + ansible.builtin.import_playbook: playbooks/silverbullet.yml diff --git a/group_vars/all.yml b/group_vars/all.yml index db9048f..b0d197c 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -12,7 +12,7 @@ domain: "liz.coffee" idm_domain: "idm.{{ domain }}" headscale_host: "vpn.{{ domain }}" # super internal private servers -traefik_domain: "sips.{{ domain }}" +sips_domain: "sips.{{ domain }}" # first deployment? homelab_build: false diff --git a/group_vars/keepalived.yml b/group_vars/keepalived.yml index aa76190..78f0c03 100644 --- a/group_vars/keepalived.yml +++ b/group_vars/keepalived.yml @@ -6,4 +6,4 @@ keepalived_virtual_router_id: 50 keepalived_priority: 100 keepalived_healthcheck_script: "/etc/keepalived/healthcheck.sh" -traefik_host: "traefik.{{ traefik_domain }}" +traefik_host: "proxy.{{ domain }}" diff --git a/group_vars/pihole.yml b/group_vars/pihole.yml index e98d56d..7e6c0e2 100644 --- a/group_vars/pihole.yml +++ b/group_vars/pihole.yml @@ -1,5 +1,6 @@ --- +pihole_domain: "dns.{{ domain }}" pihole_base: "{{ swarm_base }}/pihole" upstream_dns_servers: - 1.1.1.1 diff --git a/group_vars/portainer.yml b/group_vars/portainer.yml index aa7726c..0d8a40a 100644 --- a/group_vars/portainer.yml +++ b/group_vars/portainer.yml @@ -1,4 +1,4 @@ --- portainer_base: "{{ swarm_base }}/portainer" -portainer_host: "swarm.{{ traefik_domain }}" +portainer_host: "swarm.{{ domain }}" diff --git a/group_vars/traefik.yml b/group_vars/traefik.yml index 6b7effa..35c1483 100644 --- a/group_vars/traefik.yml +++ b/group_vars/traefik.yml @@ -2,3 +2,4 @@ certs_email: "{{ cloudflare_email }}" traefik_base: "{{ swarm_base }}/traefik" +traefik_domain: "proxy.{{ domain }}" diff --git a/playbooks/roles/pihole/templates/stacks/docker-compose.yml b/playbooks/roles/pihole/templates/stacks/docker-compose.yml index be3150e..a99d7db 100644 --- a/playbooks/roles/pihole/templates/stacks/docker-compose.yml +++ b/playbooks/roles/pihole/templates/stacks/docker-compose.yml @@ -20,7 +20,7 @@ services: - traefik.swarm.network=proxy - traefik.http.routers.piholeweb.tls=true - traefik.http.routers.piholeweb.tls.certResolver=letsencrypt - - traefik.http.routers.piholeweb.rule=Host(`pihole.{{ traefik_domain }}`) + - traefik.http.routers.piholeweb.rule=Host(`{{ pihole_domain }}`) - traefik.http.routers.piholeweb.entrypoints=websecure - traefik.http.services.piholeweb.loadbalancer.server.port=80 # 53/udp diff --git a/playbooks/roles/traefik/templates/stacks/docker-compose.yml b/playbooks/roles/traefik/templates/stacks/docker-compose.yml index 214c57e..34828ba 100644 --- a/playbooks/roles/traefik/templates/stacks/docker-compose.yml +++ b/playbooks/roles/traefik/templates/stacks/docker-compose.yml @@ -50,11 +50,11 @@ services: constraints: [node.role == manager] labels: - traefik.enable=true - - traefik.http.routers.dashboard.rule=Host(`traefik.{{ traefik_domain }}`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard/`)) + - traefik.http.routers.dashboard.rule=Host(`{{ traefik_domain }}`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard/`)) - traefik.http.routers.dashboard.service=api@internal - traefik.http.routers.dashboard.tls=true - traefik.http.routers.dashboard.tls.certresolver=letsencrypt - - traefik.http.routers.ping.rule=Host(`traefik.{{ traefik_domain }}`) && PathPrefix(`/ping`) + - traefik.http.routers.ping.rule=Host(`{{ traefik_domain }}`) && PathPrefix(`/ping`) - traefik.http.routers.ping.service=ping@internal - traefik.http.routers.ping.tls=true - traefik.http.routers.ping.tls.certresolver=letsencrypt |