Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-09-27 13:03:29 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2019-09-27 13:04:13 +0300
commit06aeccc03e3626c10c6a0c87e917d21125d6e8a8 (patch)
treea5adecbf2fbca3f9eb4458dad12ba44d934bfa2a /internal/source/disk
parentf025a4ffe992051054a64d91c28408ff6916f4f4 (diff)
Remove the concept of a custom domain from domain package
Diffstat (limited to 'internal/source/disk')
-rw-r--r--internal/source/disk/domain_test.go1
-rw-r--r--internal/source/disk/map.go8
2 files changed, 3 insertions, 6 deletions
diff --git a/internal/source/disk/domain_test.go b/internal/source/disk/domain_test.go
index 80772d37..4140241e 100644
--- a/internal/source/disk/domain_test.go
+++ b/internal/source/disk/domain_test.go
@@ -362,7 +362,6 @@ func TestDomainNoCertificate(t *testing.T) {
func TestDomainCertificate(t *testing.T) {
testDomain := &domain.Domain{
- Customized: true, // TODO
Location: "group/project2",
Name: "test.domain.com",
CertificateCert: fixture.Certificate,
diff --git a/internal/source/disk/map.go b/internal/source/disk/map.go
index c330a2ea..09902241 100644
--- a/internal/source/disk/map.go
+++ b/internal/source/disk/map.go
@@ -36,7 +36,6 @@ func (dm Map) updateDomainMap(domainName string, domain *domain.Domain) {
func (dm Map) addDomain(rootDomain, groupName, projectName string, config *domainConfig) {
newDomain := &domain.Domain{
Name: strings.ToLower(config.Domain),
- Customized: true, // TODO remove
CertificateCert: config.Certificate,
CertificateKey: config.Key,
Location: filepath.Join(groupName, projectName),
@@ -58,10 +57,9 @@ func (dm Map) updateGroupDomain(rootDomain, groupName, projectPath string, https
}
groupDomain = &domain.Domain{
- Name: domainName,
- Customized: false, // TODO remove
- Location: groupName,
- Resolver: groupResolver,
+ Name: domainName,
+ Location: groupName,
+ Resolver: groupResolver,
}
}