Refactored config system again
All checks were successful
Build (artifact) / build (push) Successful in 27s
All checks were successful
Build (artifact) / build (push) Successful in 27s
This commit is contained in:
@@ -20,7 +20,7 @@ func PullCerts(config *common.AppConfig, gitWorkspace *common.GitWorkspace) erro
|
||||
return nil
|
||||
}
|
||||
|
||||
func DecryptAndWriteCertificates(certsDir string, config *common.AppConfig, domainConfig *common.DomainConfig, gitWorkspace *common.GitWorkspace) error {
|
||||
func DecryptAndWriteCertificates(certsDir string, config *common.AppConfig, domainConfig *common.ClientDomainConfig, gitWorkspace *common.GitWorkspace) error {
|
||||
// Get files in repo
|
||||
fileInfos, err := gitWorkspace.FS.ReadDir("/")
|
||||
if err != nil {
|
||||
@@ -59,7 +59,7 @@ func DecryptAndWriteCertificates(certsDir string, config *common.AppConfig, doma
|
||||
continue
|
||||
}
|
||||
|
||||
dataRoot := common.EffectiveDataRoot(config, domainConfig)
|
||||
dataRoot := common.EffectiveDataRoot(config, domainConfig.Certificates.DataRoot)
|
||||
err = WriteCommitHash(headRef.Hash().String(), dataRoot)
|
||||
if err != nil {
|
||||
fmt.Printf("Error writing commit hash: %v\n", err)
|
||||
|
||||
@@ -39,7 +39,7 @@ func LocalCommitHash(domain string, certsDir string) (string, error) {
|
||||
return strings.TrimSpace(string(data)), nil
|
||||
}
|
||||
|
||||
func RemoteCommitHash(domain string, gitSource common.GitSource, config *common.AppConfig, domainConfig *common.DomainConfig) (string, error) {
|
||||
func RemoteCommitHash(domain string, gitSource common.GitSource, config *common.AppConfig, domainConfig *common.ClientDomainConfig) (string, error) {
|
||||
switch gitSource {
|
||||
case common.Gitea:
|
||||
return getRemoteCommitHashGitea(config.Git.OrgName, domain+domainConfig.Repo.RepoSuffix, "master", config)
|
||||
|
||||
Reference in New Issue
Block a user