fix home server

augustfengd · Oct 20, 2024 · 5289a88 · 5289a88
1 parent ec2f46a
commit 5289a88
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/cloud/home/services/pihole/cm.cue b/cloud/home/services/pihole/cm.cue
@@ -13,6 +13,9 @@ cm:
 				cname=syncthing.home.arpa,home.arpa
 				cname=traefik.home.arpa,home.arpa
 				"""
-			"custom.list": "192.168.0.254 home.arpa"
+			"custom.list": """
+				192.168.0.254 home.arpa
+				192.168.0.13 android.home.arpa
+				"""
 		}
 	}
diff --git a/cloud/home/services/pihole/ingress.cue b/cloud/home/services/pihole/ingress.cue
@@ -11,7 +11,7 @@ ingressroute:
 			match: "Host(`\(fqdn)`)"
 			services: [{
 				name: "pihole"
-				port: 80
+				port: "web"
 			}]
 		}]
 	}
@@ -25,7 +25,7 @@ ingressrouteudp: manifests: [{
 		routes: [{
 			services: [{
 				name: "pihole"
-				port: 53
+				port: "dns"
 			}]
 		}]
 	}

diff --git a/cloud/home/services/pihole/pihole.cue b/cloud/home/services/pihole/pihole.cue
@@ -13,15 +13,15 @@ deployment:
 		image: name:       "pihole/pihole"
 		annotations: "cm": base64.Encode(null, yaml.Marshal(cm.pihole))
 		expose: {
-			ports: "web":    80
-			ports: "domain": 53
+			ports: "web": 80
+			ports: "dns": 53
 		}
 		mount: configmap: "pihole": {
 			"/etc/pihole/custom.list":                    "custom.list"
 			"/etc/dnsmasq.d/05-pihole-custom-cname.conf": "05-pihole-custom-cname.conf"
 		}
-		expose: protocol: "domain": "UDP"
-		env: WEBPASSWORD: value:    ""
+		expose: protocol: "dns": "UDP"
+		env: WEBPASSWORD: value: ""
 	} & {
 		manifests: [
 			{

diff --git a/cloud/home/services/pihole/pihole_tool.cue b/cloud/home/services/pihole/pihole_tool.cue
@@ -1,11 +1,6 @@
 package pihole
 
 import (
-	"path"
-	"tool/http"
-	"tool/exec"
-
-	"github.com/augustfengd/augustfeng.app/cue.lib/tools:git"
 	"github.com/augustfengd/augustfeng.app/cue.lib/tools:kubectl"
 )
 

diff --git a/cue.lib/kubernetes/traefik.cue b/cue.lib/kubernetes/traefik.cue
@@ -30,7 +30,7 @@ traefik: {
 		}]
 
 		if fqdn =~ ".home.arpa" {
-			spec: entrypoints: ["web"]
+			spec: entryPoints: ["web"]
 		}
 		spec: {
 			entryPoints: ["web"]