Skip to content

Commit

Permalink
Bring the small fixes from the proxy pr into their own pr (#961)
Browse files Browse the repository at this point in the history
## Description
This contains two small fixes that were noticed during the proxy poc pr.

## Related Issue

Related to #804 

## Type of change

- [X] Bug fix (non-breaking change which fixes an issue)

## Checklist before merging

- [X] (Optional) Changes have been linted locally with
[golangci-lint](https://github.com/golangci/golangci-lint). (NOTE: We
haven't turned on lint checks in the pipeline yet so linting may be hard
if it shows a lot of lint errors in places that weren't touched by
changes. Thus, linting is optional right now.)
  • Loading branch information
Racer159 authored Nov 1, 2022
1 parent 3bcb358 commit 95652f4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions packages/gitea/gitea-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ gitea:
server:
DISABLE_SSH: true
OFFLINE_MODE: true
ROOT_URL: http://zarf-gitea-http.zarf.svc.cluster.local:3000
database:
DB_TYPE: sqlite3
# Note that the init script checks to see if the IP & port of the database service is accessible, so make sure you set those to something that resolves as successful (since sqlite uses files on disk setting the port & ip won't affect the running of gitea).
Expand Down
2 changes: 1 addition & 1 deletion src/internal/template/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func (values Values) Apply(component types.ZarfComponent, path string) {
builtinMap["DATA_INJECTON_MARKER"] = config.GetDataInjectionMarker()
}

// Don't template component-specifric variables for every component
// Don't template component-specific variables for every component
switch component.Name {
case "zarf-agent":
builtinMap["AGENT_CRT"] = base64.StdEncoding.EncodeToString(values.agentTLS.Cert)
Expand Down

0 comments on commit 95652f4

Please sign in to comment.