From 31c301e2224c2be40c01492302317d32c76d31d4 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Fri, 7 Jul 2023 08:45:25 +0000
Subject: [PATCH] Latest

---
 home/.chezmoi.yaml.tmpl                                     | 5 ++++-
 .../private_com.cloudflare.warp.plist.tmpl                  | 4 ++--
 home/dot_config/warp/private_mdm.xml.tmpl                   | 6 ++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/home/.chezmoi.yaml.tmpl b/home/.chezmoi.yaml.tmpl
index 246768b1..ffa788c6 100644
--- a/home/.chezmoi.yaml.tmpl
+++ b/home/.chezmoi.yaml.tmpl
@@ -1,5 +1,6 @@
 {{- $cloudflareR2AccountId := (default "84fa0d1b16ff8086dd958c468ce7fd59" (env "CLOUDFLARE_R2_ID")) -}}
 {{- $cloudflareUsername := (default "brian@megabyte.space" (env "CLOUDFLARE_USERNAME")) -}}
+{{- $cloudflareTeamsOrg := (default "manhattan" (env "CLOUDFLARE_TEAMS_ORG")) -}}
 {{- $desktopSession := true -}}
 {{- $domain := (default "megabyte.space" (env "PUBLIC_SERVICES_DOMAIN")) -}}
 {{- $email := (default "brian@megabyte.space" (env "PRIMARY_EMAIL")) -}}
@@ -127,6 +128,8 @@ gpg:
 data:
   host:
     arch: "{{ .chezmoi.arch }}"
+    cloudflare:
+      teamsOrg: "{{ $cloudflareTeamsOrg }}"
     cpu:
       cores: "{{ $cpuCores }}"
       threads: "{{ $cpuThreads }}"
@@ -144,7 +147,7 @@ data:
       - glurl: "https://gitlab.com/"
         runnerDescription: "Docker executor"
         runnerImage: "alpine:latest"
-        runnerTags: ""
+        runnerTags: "alpine,linux"
       - glurl: "https://gitlab.com/"
         baseVM: "debian"
         runnerDescription: "VirtualBox executor - Debian, OpenJDK 20"
diff --git a/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl b/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl
index 0f8ecd58..94ea7b28 100644
--- a/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl	
+++ b/home/Library/Managed Preferences/private_com.cloudflare.warp.plist.tmpl	
@@ -7,11 +7,11 @@
 	<key>onboarding</key>
 	<false />
 	<key>organization</key>
-	<string>manhattan</string>
+	<string>{{ .host.cloudflare.teamsOrg }}</string>
 	<key>service_mode</key>
 	<string>warp</string>
 	<key>support_url</key>
-	<string>https://megabyte.space</string>
+	<string>https://{{ .host.domain }}</string>
 	<key>auth_client_id</key>
 	<string>{{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID")) -}}{{- includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_ID" | decrypt | trim -}}{{- else -}}{{- env "CLOUDFLARE_TEAMS_CLIENT_ID" -}}{{- end -}}</string>
 	<key>auth_client_secret</key>
diff --git a/home/dot_config/warp/private_mdm.xml.tmpl b/home/dot_config/warp/private_mdm.xml.tmpl
index bda6605f..d8aaa39f 100644
--- a/home/dot_config/warp/private_mdm.xml.tmpl
+++ b/home/dot_config/warp/private_mdm.xml.tmpl
@@ -4,14 +4,12 @@
 	<true />
 	<key>onboarding</key>
 	<false />
-	<key>auto_connect</key>
-	<interger>60</interger>
 	<key>organization</key>
-	<string>manhattan</string>
+	<string>{{ .host.cloudflare.teamsOrg }}</string>
 	<key>service_mode</key>
 	<string>warp</string>
 	<key>support_url</key>
-	<string>https://megabyte.space</string>
+	<string>https://{{ .host.domain }}</string>
 	<key>auth_client_id</key>
 	<string>{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_ID" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_TEAMS_CLIENT_ID" -}}{{ end }}</string>
 	<key>auth_client_secret</key>