put generated go file in generated folder

RainZhai · Jul 28, 2016 · 4a8f264 · 4a8f264
1 parent f326eee
commit 4a8f264
Show file tree

Hide file tree

Showing 10 changed files with 8,293 additions and 22,623 deletions.
diff --git a/...ntern/flashlight/config/embeddedGlobal.go → ...hlight/config/generated/embeddedGlobal.go b/...ntern/flashlight/config/embeddedGlobal.go → ...hlight/config/generated/embeddedGlobal.go
diff --git a/...tern/flashlight/config/embeddedProxies.go → ...light/config/generated/embeddedProxies.go b/...tern/flashlight/config/embeddedProxies.go → ...light/config/generated/embeddedProxies.go
diff --git a/...getlantern/flashlight/config/fallbacks.go → .../flashlight/config/generated/fallbacks.go b/...getlantern/flashlight/config/fallbacks.go → .../flashlight/config/generated/fallbacks.go
@@ -1,10 +1,10 @@
-package config
+package generated
 
 import (
 	"github.com/getlantern/flashlight/client"
 )
 
-var fallbacks = map[string]*client.ChainedServerInfo{
+var Fallbacks = map[string]*client.ChainedServerInfo{
 	"fallback-139.59.240.127:443": &client.ChainedServerInfo{
 		Addr:      "139.59.240.127:443",
 		Cert:      "-----BEGIN CERTIFICATE-----\nMIIDvjCCAqagAwIBAgIENo3riDANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UEBhMCVVMxETAPBgNV\nBAgTCE5ldyBZb3JrMRMwEQYDVQQHEwpIZWxpY29wdGVyMR0wGwYDVQQKExRBY2hpZXZlIFByb3Bh\nZ2FuZGlzdDEbMBkGA1UECxMSUGx1bXBlciBXaW5kc3Rvcm1zMRMwEQYDVQQDEwpNZWxhbm9tYXRh\nMB4XDTE2MDQyNzE0NDMyOVoXDTE4MDQyNzE0NDMyOVowgYYxCzAJBgNVBAYTAlVTMREwDwYDVQQI\nEwhOZXcgWW9yazETMBEGA1UEBxMKSGVsaWNvcHRlcjEdMBsGA1UEChMUQWNoaWV2ZSBQcm9wYWdh\nbmRpc3QxGzAZBgNVBAsTElBsdW1wZXIgV2luZHN0b3JtczETMBEGA1UEAxMKTWVsYW5vbWF0YTCC\nASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIRW0X9GP3uW4Fm1+JIxkcrDN5TP7XWF36hW\nBvA4jTS7oaj/kGxN02++vXUBWPAD8oaj/3zERBD8UWtnQerCPsXu5aDdsp3e8D8Rhc/Fw98DGGKM\nuxCkXuVPbFzBMJx3ycxclZ8FPQlPYfHlDKnAoMNTfxiB1PIp60i/KddcaUnvDHRjWcqxGDVAkWBH\nCkiawj4Ve6mkgph/3/zVyPd+sSr5TX0zvvOZSTv68KxmbG8BAyuHzTqv5YSZpyDhYOVX7FY1J4Cr\nmPvYJdYj6oWc4np8Q/sDiglN8Xu7CDBFun3BE50rVzBlO9Fzbao1RMMKNAKrULX2xzKmN+Bco4KD\nyVkCAwEAAaMyMDAwDwYDVR0RBAgwBocEizvwfzAdBgNVHQ4EFgQUMCIpuKb41Pg3uvBmUNT/pRre\nPqswDQYJKoZIhvcNAQELBQADggEBAHdvPBXbPshQmjeypL9pnfaQocOfI1dWcVn35HVq2sWDZJ7x\npiQ1oXm324u2ab9DHMZxvmfI7p/oqzw7VGuOnSil3lq/6D3hFtRo1jUd5GNSdktpN37akh0hjrOv\nMtS8kkEt99Xhb5LYbEbHGFwB88q9Q36ve2VFOYNZ9JcbRIdgwKeHyVLOI0mSdkAyJ4am+LaGUUwH\nvrzpajqhUWYTiFPXJN/+kOJ5IhLnU4XQIl9xdzVZlltF7GdzQjrZ3TrbMR5n1aPF21Qp829hkgEr\n6ymeVKBXmkBZe10oz9+iKdN8Rt36gLi/UmwJ2vzj1EB6+HQAiJWeBn7Gr/o9yyAwRno=\n-----END CERTIFICATE-----\n",

diff --git a/...lantern/flashlight/config/proxiedsites.go → ...ashlight/config/generated/proxiedsites.go b/...lantern/flashlight/config/proxiedsites.go → ...ashlight/config/generated/proxiedsites.go
diff --git a/src/github.com/getlantern/flashlight/config/initializer.go b/src/github.com/getlantern/flashlight/config/initializer.go
@@ -3,8 +3,10 @@ package config
 import (
 	"time"
 
-	"github.com/getlantern/flashlight/client"
 	"github.com/getlantern/golog"
+
+	"github.com/getlantern/flashlight/client"
+	"github.com/getlantern/flashlight/config/generated"
 )
 
 var (
@@ -59,7 +61,7 @@ func Init(configDir string, flagsAsMap map[string]interface{},
 			return make(map[string]*client.ChainedServerInfo)
 		},
 		dispatch:     proxiesDispatch,
-		embeddedData: EmbeddedProxies,
+		embeddedData: generated.EmbeddedProxies,
 		sleep:        1 * time.Minute,
 	}
 
@@ -76,7 +78,7 @@ func Init(configDir string, flagsAsMap map[string]interface{},
 			return &Global{}
 		},
 		dispatch:     globalDispatch,
-		embeddedData: GlobalConfig,
+		embeddedData: generated.GlobalConfig,
 		sleep:        24 * time.Hour,
 	}