diff --git a/internal/db/models/node_cluster_dao.go b/internal/db/models/node_cluster_dao.go index a7d3ff9b..8c4359e7 100644 --- a/internal/db/models/node_cluster_dao.go +++ b/internal/db/models/node_cluster_dao.go @@ -149,8 +149,8 @@ func (this *NodeClusterDAO) CreateCluster(tx *dbs.Tx, adminId int64, name string var dnsConfig = &dnsconfigs.ClusterDNSConfig{ NodesAutoSync: true, ServersAutoSync: true, - CNameRecords: []string{}, - CNameAsDomain: true, + CNAMERecords: []string{}, + CNAMEAsDomain: true, TTL: dnsTTL, IncludingLnNodes: true, } @@ -529,9 +529,9 @@ func (this *NodeClusterDAO) UpdateClusterDNS(tx *dbs.Tx, clusterId int64, dnsNam var dnsConfig = &dnsconfigs.ClusterDNSConfig{ NodesAutoSync: nodesAutoSync, ServersAutoSync: serversAutoSync, - CNameRecords: cnameRecords, + CNAMERecords: cnameRecords, TTL: ttl, - CNameAsDomain: cnameAsDomain, + CNAMEAsDomain: cnameAsDomain, IncludingLnNodes: includingLnNodes, } dnsJSON, err := json.Marshal(dnsConfig) diff --git a/internal/db/models/node_cluster_model_ext.go b/internal/db/models/node_cluster_model_ext.go index b412492c..3d02f048 100644 --- a/internal/db/models/node_cluster_model_ext.go +++ b/internal/db/models/node_cluster_model_ext.go @@ -16,12 +16,12 @@ func (this *NodeCluster) DecodeDNSConfig() (*dnsconfigs.ClusterDNSConfig, error) return &dnsconfigs.ClusterDNSConfig{ NodesAutoSync: false, ServersAutoSync: false, - CNameAsDomain: true, + CNAMEAsDomain: true, IncludingLnNodes: true, }, nil } var dnsConfig = &dnsconfigs.ClusterDNSConfig{ - CNameAsDomain: true, + CNAMEAsDomain: true, IncludingLnNodes: true, } err := json.Unmarshal(this.Dns, &dnsConfig) diff --git a/internal/db/models/server_dao.go b/internal/db/models/server_dao.go index 55313fa2..10270faf 100644 --- a/internal/db/models/server_dao.go +++ b/internal/db/models/server_dao.go @@ -1081,7 +1081,7 @@ func (this *ServerDAO) ComposeServerConfig(tx *dbs.Tx, server *Server, cacheMap if domain != nil { var cname = server.DnsName + "." + domain.Name config.CNameDomain = cname - if clusterDNSConfig.CNameAsDomain { + if clusterDNSConfig.CNAMEAsDomain { config.CNameAsDomain = true config.AliasServerNames = append(config.AliasServerNames, cname) } diff --git a/internal/rpc/services/service_dns_domain.go b/internal/rpc/services/service_dns_domain.go index a7241107..0db6c9fc 100644 --- a/internal/rpc/services/service_dns_domain.go +++ b/internal/rpc/services/service_dns_domain.go @@ -459,7 +459,7 @@ func (this *DNSDomainService) findClusterDNSChanges(cluster *models.NodeCluster, if len(cluster.Dns) > 0 { dnsConfig, _ := cluster.DecodeDNSConfig() if dnsConfig != nil { - cnameRecords = dnsConfig.CNameRecords + cnameRecords = dnsConfig.CNAMERecords if dnsConfig.TTL > 0 { ttl = dnsConfig.TTL } diff --git a/internal/rpc/services/service_node_cluster.go b/internal/rpc/services/service_node_cluster.go index b0db123e..5ea42037 100644 --- a/internal/rpc/services/service_node_cluster.go +++ b/internal/rpc/services/service_node_cluster.go @@ -493,9 +493,9 @@ func (this *NodeClusterService) FindEnabledNodeClusterDNS(ctx context.Context, r Provider: nil, NodesAutoSync: dnsConfig.NodesAutoSync, ServersAutoSync: dnsConfig.ServersAutoSync, - CnameRecords: dnsConfig.CNameRecords, + CnameRecords: dnsConfig.CNAMERecords, Ttl: dnsConfig.TTL, - CnameAsDomain: dnsConfig.CNameAsDomain, + CnameAsDomain: dnsConfig.CNAMEAsDomain, IncludingLnNodes: dnsConfig.IncludingLnNodes, }, nil } @@ -553,9 +553,9 @@ func (this *NodeClusterService) FindEnabledNodeClusterDNS(ctx context.Context, r Provider: pbProvider, NodesAutoSync: dnsConfig.NodesAutoSync, ServersAutoSync: dnsConfig.ServersAutoSync, - CnameRecords: dnsConfig.CNameRecords, + CnameRecords: dnsConfig.CNAMERecords, Ttl: dnsConfig.TTL, - CnameAsDomain: dnsConfig.CNameAsDomain, + CnameAsDomain: dnsConfig.CNAMEAsDomain, IncludingLnNodes: dnsConfig.IncludingLnNodes, DefaultRoute: defaultRoute, }, nil diff --git a/internal/tasks/dns_task_executor.go b/internal/tasks/dns_task_executor.go index f2d3f172..535d8755 100644 --- a/internal/tasks/dns_task_executor.go +++ b/internal/tasks/dns_task_executor.go @@ -468,7 +468,7 @@ func (this *DNSTaskExecutor) doCluster(taskId int64, clusterId int64) error { // 自动设置的CNAME var cnameRecords = []string{} if dnsConfig != nil { - cnameRecords = dnsConfig.CNameRecords + cnameRecords = dnsConfig.CNAMERecords } for _, cnameRecord := range cnameRecords { serverDNSNames = append(serverDNSNames, cnameRecord)