From 015e6eac59bc7b68cc2c5b455a9fd1cd7f1bf80a Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Mon, 10 Jul 2023 07:43:52 +0000 Subject: [PATCH] Latest --- home/Library/LaunchDaemons/com.cloudflare.warp.plist.tmpl | 2 +- home/dot_local/etc/cloudflared/config.yaml.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/Library/LaunchDaemons/com.cloudflare.warp.plist.tmpl b/home/Library/LaunchDaemons/com.cloudflare.warp.plist.tmpl index be6088d0..586f3e83 100644 --- a/home/Library/LaunchDaemons/com.cloudflare.warp.plist.tmpl +++ b/home/Library/LaunchDaemons/com.cloudflare.warp.plist.tmpl @@ -8,7 +8,7 @@ /usr/local/bin/bash -c - cp -f "{{ .user.home }}/Library/Managed Preferences/com.cloudflare.warp.plist" "/Library/Managed Preferences/com.cloudflare.warp.plist" && plutil -convert binary1 "/Library/Managed Preferences/com.cloudflare.warp.plist" + cp -f "{{ .data.user.home }}/Library/Managed Preferences/com.cloudflare.warp.plist" "/Library/Managed Preferences/com.cloudflare.warp.plist" && plutil -convert binary1 "/Library/Managed Preferences/com.cloudflare.warp.plist" StartCalendarInterval diff --git a/home/dot_local/etc/cloudflared/config.yaml.tmpl b/home/dot_local/etc/cloudflared/config.yaml.tmpl index 152b35e0..1f7bd831 100644 --- a/home/dot_local/etc/cloudflared/config.yaml.tmpl +++ b/home/dot_local/etc/cloudflared/config.yaml.tmpl @@ -1,6 +1,6 @@ -{{- $baseDomain := (join .host.hostname "." .host.domain) -}} +{{- $baseDomain := (join (join (.host.hostname ".") .host.domain)) -}} {{- if .host.qubes -}} -{{- $baseDomain := (join .host.hostname "-qube." .host.domain) -}} +{{- $baseDomain := (join (join (.host.hostname "-qube.") .host.domain)) -}} {{- end -}} --- tunnel: {{ if .host.qubes }}qube{{ else }}host{{ end }}-{{ .host.hostname }}