From ea54d1be694469b77fc17744141a863167479f45 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 5 Sep 2020 20:33:57 +0100
Subject: [PATCH] Expose pages sites

---
 ansible/roles/gitlab-pages/files/docker-compose.yml | 8 ++++++++
 ansible/roles/traefik/files/traefik.yml             | 4 ++++
 terraform/theorangeone.net.tf                       | 8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/ansible/roles/gitlab-pages/files/docker-compose.yml b/ansible/roles/gitlab-pages/files/docker-compose.yml
index 5cf64ed..58064d3 100644
--- a/ansible/roles/gitlab-pages/files/docker-compose.yml
+++ b/ansible/roles/gitlab-pages/files/docker-compose.yml
@@ -18,6 +18,14 @@ services:
     tmpfs:
       - /var/log/gitlab
     restart: unless-stopped
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.gitlab-pages.rule=HostRegexp(`{subdomain:[a-z]+}.pages.theorangeone.net`)
+      - traefik.http.routers.gitlab-pages.tls.certresolver=le
+      - traefik.http.routers.gitlab-pages.tls.domains[0].main=pages.theorangeone.net
+      - traefik.http.routers.gitlab-pages.tls.domains[0].sans=*.pages.theorangeone.net
+      - traefik.http.services.gitlab-pages-gitlab-pages.loadbalancer.server.port=8080
+      - traefik.http.services.gitlab-pages-gitlab-pages.loadbalancer.server.scheme=http
 
   ssh-server:
     image: linuxserver/openssh-server:latest
diff --git a/ansible/roles/traefik/files/traefik.yml b/ansible/roles/traefik/files/traefik.yml
index e1fa2f5..75a7742 100644
--- a/ansible/roles/traefik/files/traefik.yml
+++ b/ansible/roles/traefik/files/traefik.yml
@@ -38,6 +38,10 @@ certificatesResolvers:
       storage: /etc/traefik/acme.json
       dnsChallenge:
         provider: cloudflare
+        delayBeforeCheck: 0
+        resolvers:
+          - 1.1.1.1:53
+          - 1.0.0.1:53
 
 serversTransport:
   insecureSkipVerify: true
diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf
index d10386d..31f9b7c 100644
--- a/terraform/theorangeone.net.tf
+++ b/terraform/theorangeone.net.tf
@@ -172,3 +172,11 @@ resource "cloudflare_record" "theorangeonenet_gitlab_pages" {
   type    = "A"
   ttl     = 1
 }
+
+resource "cloudflare_record" "theorangeonenet_gitlab_pages_wildcard" {
+  zone_id = cloudflare_zone.theorangeonenet.id
+  name    = "*.pages"
+  value   = var.walker_ip
+  type    = "A"
+  ttl     = 1
+}