Merge pull request #201 from ironstar-io/fix/create-new-proxy-network…

…-early Fix/create new proxy network early
ironstar-io · Oct 10, 2019 · 28cdea8 · 28cdea8
2 parents 43e4cad + 3342416
commit 28cdea8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/services/tok/init.go b/services/tok/init.go
@@ -42,6 +42,7 @@ func Init(yes, statuscheck, noPullImagesFlag bool) {
 	// System readiness checks
 	version.Check()
 	docker.CheckClientVersion()
+	proxy.CreateProxyNetwork()
 	checkSyncConfig()
 
 	fmt.Println(aurora.Cyan("\n🚀  Tokaido is starting up!"))
@@ -56,7 +57,6 @@ func Init(yes, statuscheck, noPullImagesFlag bool) {
 	drupal.CheckSettings(cs)
 	docker.FindOrCreateTokCompose()
 	ssh.GenerateKeys()
-	proxy.CreateProxyNetwork()
 
 	docker.CreateDatabaseVolume()
 	docker.CreateSiteVolume()

diff --git a/system/tls/ca.go b/system/tls/ca.go
@@ -39,7 +39,7 @@ func createCA() (err error) {
 			CommonName:   constants.CommonName,
 		},
 		NotBefore:             time.Now(),
-		NotAfter:              time.Now().AddDate(10, 0, 0), // 10 years
+		NotAfter:              time.Now().AddDate(2, 0, 0), // 10 years
 		IsCA:                  true,
 		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth},
 		KeyUsage:              x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,

diff --git a/system/tls/certificate.go b/system/tls/certificate.go
@@ -40,7 +40,7 @@ func createWildcardCertificate() (err error) {
 		},
 		DNSNames:    []string{constants.WildcardHost},
 		NotBefore:   time.Now(),
-		NotAfter:    time.Now().AddDate(10, 0, 0),
+		NotAfter:    time.Now().AddDate(2, 0, 0),
 		ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
 	}
 
@@ -76,7 +76,7 @@ func createProjectCertificate(projectName, projectPath, commonName string) (err
 		},
 		DNSNames:    []string{commonName},
 		NotBefore:   time.Now(),
-		NotAfter:    time.Now().AddDate(10, 0, 0),
+		NotAfter:    time.Now().AddDate(2, 0, 0),
 		ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
 	}