Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Generate a self signed cert on ds creation/update (#6024)#6231

Merged
zrhoffman merged 1 commit intoapache:6.0.xfrom
zrhoffman:SelfSignedDefaultCert-6.0-bp
Sep 21, 2021
Merged

Generate a self signed cert on ds creation/update (#6024)#6231
zrhoffman merged 1 commit intoapache:6.0.xfrom
zrhoffman:SelfSignedDefaultCert-6.0-bp

Conversation

@zrhoffman
Copy link
Copy Markdown
Member

Backport of #6024 for 6.0.x

Resolved conflict:

diff --cc traffic_ops/traffic_ops_golang/config/config.go
index 3041441aec,b7be58ae24..0000000000
--- a/traffic_ops/traffic_ops_golang/config/config.go
+++ b/traffic_ops/traffic_ops_golang/config/config.go
@@@ -58,7 -58,9 +58,13 @@@ type Config struct 
  	InfluxEnabled          bool
  	InfluxDBConfPath       string `json:"influxdb_conf_path"`
  	Version                string
++<<<<<<< HEAD
 +	UseIMS                 bool `json:"use_ims"`
++=======
+ 	UseIMS                 bool                    `json:"use_ims"`
+ 	RoleBasedPermissions   bool                    `json:"role_based_permissions"`
+ 	DefaultCertificateInfo *DefaultCertificateInfo `json:"default_certificate_info"`
++>>>>>>> 7d0472dc25 (Generate a self signed cert on ds creation/update (#6024))
  }
  
  // ConfigHypnotoad carries http setting for hypnotoad (mojolicious) server

* Generate a self signed cert on ds creation/update

* Added nil check for example urls, fixed test that was failing

* updated per comments

* fixed tests

* more test fixing

* added default cert verification test

* added default cert config to cdn.conf

* updated gofmt

* added nil check

* added default cert config validation and updated db tx use

(cherry picked from commit 7d0472d)
@zrhoffman zrhoffman added the backport an upstream change merged into an older release label Sep 21, 2021
@zrhoffman zrhoffman added this to the 6.0.0 milestone Sep 21, 2021
@zrhoffman zrhoffman merged this pull request into apache:6.0.x Sep 21, 2021
@zrhoffman zrhoffman deleted the SelfSignedDefaultCert-6.0-bp branch September 21, 2021 22:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport an upstream change merged into an older release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants