Cleanup

Author: Shaun Davis

cmd/main.go

@@ -35,8 +35,6 @@ func main() {
 		}
 	}
 
-	// TODO - This is just for dev'ing and will need to change.  Additional users will be added by users
-	// and this will break things.
 	if err := setDefaultHBA(); err != nil {
 		PanicHandler(err)
 	}
@@ -109,42 +107,6 @@ func setDirOwnership() {
 	}
 }
 
-// func setDefaultConfiguration() error {
-
-// 	mem, err := memTotal()
-// 	if err != nil {
-// 		return errors.Wrap(err, "error fetching total system memory")
-// 	}
-
-// 	workMem := max(4, (mem / 64))
-// 	maintenanceWorkMem := max(64, (mem / 20))
-
-// 	pgConfig := map[string]string{
-// 		"listen_addresses":           "fdaa:0:2e26:a7b:ab8:0:5fd4:2",
-// 		"max_connections":            "100",
-// 		"port":                       "5432",
-// 		"shared_buffers":             fmt.Sprintf("%dMB", mem/4),
-// 		"effective_cache_size":       fmt.Sprintf("%dMB", 3*mem/4),
-// 		"maintenance_work_mem":       fmt.Sprintf("%dMB", maintenanceWorkMem),
-// 		"work_mem":                   fmt.Sprintf("%dMB", workMem),
-// 		"dynamic_shared_memory_type": "posix",
-// 		"max_wal_size":               "1GB",
-// 		"min_wal_size":               "80MB",
-// 	}
-
-// 	file, err := os.OpenFile("/data/postgres/postgresql.conf", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755)
-// 	if err != nil {
-// 		log.Fatal(err)
-// 	}
-// 	defer file.Close()
-// 	for key, value := range pgConfig {
-// 		str := fmt.Sprintf("%s = '%s'\n", key, value)
-// 		file.WriteString(str)
-// 	}
-
-// 	return nil
-// }
-
 type HBAEntry struct {
 	Type     string
 	Database string
@@ -163,22 +125,6 @@ func setDefaultHBA() error {
 		Method:   "trust",
 	})
 
-	entries = append(entries, HBAEntry{
-		Type:     "host",
-		Database: "all",
-		User:     "postgres",
-		Address:  "0.0.0.0/0",
-		Method:   "md5",
-	})
-
-	entries = append(entries, HBAEntry{
-		Type:     "host",
-		Database: "all",
-		User:     "postgres",
-		Address:  "::0/0",
-		Method:   "md5",
-	})
-
 	entries = append(entries, HBAEntry{
 		Type:     "host",
 		Database: "all",

pkg/flypg/node.go

@@ -21,7 +21,6 @@ type Credentials struct {
 type Node struct {
 	AppName             string
 	PrivateIP           net.IP
-	Region              string
 	DataDir             string
 	SUCredentials       Credentials
 	OperatorCredentials Credentials
@@ -32,14 +31,9 @@ func NewNode() (*Node, error) {
 	node := &Node{
 		AppName: "local",
 		PGPort:  5432,
-		Region:  "local",
 		DataDir: "/data",
 	}
 
-	if region := os.Getenv("FLY_REGION"); region != "" {
-		node.Region = region
-	}
-
 	if appName := os.Getenv("FLY_APP_NAME"); appName != "" {
 		node.AppName = appName
 	}