Latest
This commit is contained in:
parent
d5655ae7b1
commit
31c301e222
3 changed files with 8 additions and 7 deletions
|
@ -1,5 +1,6 @@
|
||||||
{{- $cloudflareR2AccountId := (default "84fa0d1b16ff8086dd958c468ce7fd59" (env "CLOUDFLARE_R2_ID")) -}}
|
{{- $cloudflareR2AccountId := (default "84fa0d1b16ff8086dd958c468ce7fd59" (env "CLOUDFLARE_R2_ID")) -}}
|
||||||
{{- $cloudflareUsername := (default "brian@megabyte.space" (env "CLOUDFLARE_USERNAME")) -}}
|
{{- $cloudflareUsername := (default "brian@megabyte.space" (env "CLOUDFLARE_USERNAME")) -}}
|
||||||
|
{{- $cloudflareTeamsOrg := (default "manhattan" (env "CLOUDFLARE_TEAMS_ORG")) -}}
|
||||||
{{- $desktopSession := true -}}
|
{{- $desktopSession := true -}}
|
||||||
{{- $domain := (default "megabyte.space" (env "PUBLIC_SERVICES_DOMAIN")) -}}
|
{{- $domain := (default "megabyte.space" (env "PUBLIC_SERVICES_DOMAIN")) -}}
|
||||||
{{- $email := (default "brian@megabyte.space" (env "PRIMARY_EMAIL")) -}}
|
{{- $email := (default "brian@megabyte.space" (env "PRIMARY_EMAIL")) -}}
|
||||||
|
@ -127,6 +128,8 @@ gpg:
|
||||||
data:
|
data:
|
||||||
host:
|
host:
|
||||||
arch: "{{ .chezmoi.arch }}"
|
arch: "{{ .chezmoi.arch }}"
|
||||||
|
cloudflare:
|
||||||
|
teamsOrg: "{{ $cloudflareTeamsOrg }}"
|
||||||
cpu:
|
cpu:
|
||||||
cores: "{{ $cpuCores }}"
|
cores: "{{ $cpuCores }}"
|
||||||
threads: "{{ $cpuThreads }}"
|
threads: "{{ $cpuThreads }}"
|
||||||
|
@ -144,7 +147,7 @@ data:
|
||||||
- glurl: "https://gitlab.com/"
|
- glurl: "https://gitlab.com/"
|
||||||
runnerDescription: "Docker executor"
|
runnerDescription: "Docker executor"
|
||||||
runnerImage: "alpine:latest"
|
runnerImage: "alpine:latest"
|
||||||
runnerTags: ""
|
runnerTags: "alpine,linux"
|
||||||
- glurl: "https://gitlab.com/"
|
- glurl: "https://gitlab.com/"
|
||||||
baseVM: "debian"
|
baseVM: "debian"
|
||||||
runnerDescription: "VirtualBox executor - Debian, OpenJDK 20"
|
runnerDescription: "VirtualBox executor - Debian, OpenJDK 20"
|
||||||
|
|
|
@ -7,11 +7,11 @@
|
||||||
<key>onboarding</key>
|
<key>onboarding</key>
|
||||||
<false />
|
<false />
|
||||||
<key>organization</key>
|
<key>organization</key>
|
||||||
<string>manhattan</string>
|
<string>{{ .host.cloudflare.teamsOrg }}</string>
|
||||||
<key>service_mode</key>
|
<key>service_mode</key>
|
||||||
<string>warp</string>
|
<string>warp</string>
|
||||||
<key>support_url</key>
|
<key>support_url</key>
|
||||||
<string>https://megabyte.space</string>
|
<string>https://{{ .host.domain }}</string>
|
||||||
<key>auth_client_id</key>
|
<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>
|
<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>
|
<key>auth_client_secret</key>
|
||||||
|
|
|
@ -4,14 +4,12 @@
|
||||||
<true />
|
<true />
|
||||||
<key>onboarding</key>
|
<key>onboarding</key>
|
||||||
<false />
|
<false />
|
||||||
<key>auto_connect</key>
|
|
||||||
<interger>60</interger>
|
|
||||||
<key>organization</key>
|
<key>organization</key>
|
||||||
<string>manhattan</string>
|
<string>{{ .host.cloudflare.teamsOrg }}</string>
|
||||||
<key>service_mode</key>
|
<key>service_mode</key>
|
||||||
<string>warp</string>
|
<string>warp</string>
|
||||||
<key>support_url</key>
|
<key>support_url</key>
|
||||||
<string>https://megabyte.space</string>
|
<string>https://{{ .host.domain }}</string>
|
||||||
<key>auth_client_id</key>
|
<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>
|
<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>
|
<key>auth_client_secret</key>
|
||||||
|
|
Loading…
Reference in a new issue