From 25512974d27a12498b4faa893eaa38c5a6847970 Mon Sep 17 00:00:00 2001 From: Noah Date: Fri, 15 Mar 2024 17:51:45 -0500 Subject: [PATCH] Add per-site optional configuration (fix #15) --- config.go | 13 +++++----- main.go | 3 ++- site.go | 72 +++++++++++++++++++++++++++++++++++++++++++------------ 3 files changed, 65 insertions(+), 23 deletions(-) diff --git a/config.go b/config.go index ac39ca5..59800a1 100644 --- a/config.go +++ b/config.go @@ -2,20 +2,20 @@ package main import ( - "os" "encoding/json" "log" + "os" ) // Configuration stores information retrieved from a configuration file type Configuration struct { - port int + port int sites_dir string - matrix struct { + matrix struct { homeserver string - username string - password string - room_id string + username string + password string + room_id string } } @@ -39,4 +39,3 @@ func parseConfig(path string, config *Configuration) { config.matrix.password = matrix["password"].(string) config.matrix.room_id = matrix["room_id"].(string) } - diff --git a/main.go b/main.go index 7a8784a..97ece38 100644 --- a/main.go +++ b/main.go @@ -58,7 +58,8 @@ func handler(data map[string]interface{}) { } sendMessage(MatrixMessage{text: "⚪️ Starting server..."}) if site, exists, err = getSite(repo_name); err != nil { - deploy_error := newDeployError(1, "handler", "Failed to get site '%s' after creation!", fmt.Sprint(err)) + deploy_error := newDeployError(1, "handler", + fmt.Sprintf("Failed to get site '%s' after creation!", repo_name), fmt.Sprint(err)) deploy_error.SendOverMatrix() } if deploy_error := site.Start(); deploy_error.code != 0 { diff --git a/site.go b/site.go index e0a5743..9f8cea9 100644 --- a/site.go +++ b/site.go @@ -2,6 +2,7 @@ package main import ( + "encoding/json" "errors" "fmt" "log" @@ -15,23 +16,64 @@ import ( // Site contains information and methods used for management of a Lapis site. type Site struct { + name string + config SiteConfig +} + +// SiteConfig contains parsed data from a site's configuration file +type SiteConfig struct { + port int64 name string } // getSite gets a specific site and returns a Site struct and a bool indicating whether a site was found. func getSite(name string) (Site, bool, error) { - site_path := configuration.sites_dir+"/"+name - exists, err := fileExists(site_path); + site_path := configuration.sites_dir + "/" + name + exists, err := fileExists(site_path) if err != nil { return Site{}, false, errors.New(fmt.Sprintf("Failed to get site '%s'", name)) } if exists { - return Site{name: name}, true, nil + site := Site{name: name} + site.getConfig() // Get per-site config + return site, true, nil } else { return Site{}, false, nil } } +// getConfig parses a site's configuration file +func (site *Site) getConfig() (bool, error) { + path := fmt.Sprintf("%s/%s/deploy_config.json", configuration.sites_dir, site.name) + if exists, _ := fileExists(path); !exists { + return false, nil + } + file, _ := os.Open(path) + var data map[string]interface{} + err := json.NewDecoder(file).Decode(&data) + if err != nil { + log.Panic("Failed to parse config:", err) + } + file.Close() + // Parse the config + var config SiteConfig + config.name = data["name"].(string) + config.port = int64(data["port"].(float64)) + + site.config = config + + return true, nil +} + +// getName gets a website's configured name (falls back to technical name if one isn't configured) +func (site *Site) getName() string { + if site.config.name == "" { + return site.name + } else { + return site.config.name + } +} + // getAllSites gets every site installed. func getAllSites() ([]Site, DeployError) { sites_dir := configuration.sites_dir @@ -71,56 +113,56 @@ func startAllSites() DeployError { // Start attempts to start a Lapis server in the given repository. func (site *Site) Start() DeployError { - log.Printf("Starting Lapis server in repository %s...", site.name) + log.Printf("Starting Lapis server in %s...", site.getName()) old_cwd, _ := os.Getwd() defer syscall.Chdir(old_cwd) - syscall.Chdir(configuration.sites_dir+"/"+site.name) + syscall.Chdir(configuration.sites_dir + "/" + site.name) cmd := exec.Command("lapis", "serve") if err := cmd.Start(); err != nil { return newDeployError(1, "startSite", - fmt.Sprintf("Failed to start Lapis server in repository '%s'", site.name), "") + fmt.Sprintf("Failed to start Lapis server in '%s'", site.getName()), "") } go func() { cmd.Wait() }() - + return DeployError{} } // Restart attempts to restart the Lapis server in the given repository. func (site *Site) Restart() DeployError { - log.Printf("Restarting Lapis server on repository %s...", site.name) + log.Printf("Restarting Lapis server in %s...", site.getName()) old_cwd, _ := os.Getwd() defer syscall.Chdir(old_cwd) - syscall.Chdir(configuration.sites_dir+"/"+site.name) + syscall.Chdir(configuration.sites_dir + "/" + site.name) out, err := exec.Command("lapis", "build").CombinedOutput() if err != nil { return newDeployError(1, "restartSite", - fmt.Sprintf("Failed to run 'lapis build' in repository '%s'", site.name), string(out)) + fmt.Sprintf("Failed to run 'lapis build' in '%s'", site.getName()), string(out)) } log.Printf("[lapis build] %s", out) if !strings.Contains(string(out), "HUP") { return newDeployError(1, "restartSite", - "'lapis build' command returned unexpected value! (Lapis server not running?)", string(out)) + "Failed to restart Lapis server! (Lapis not running?)", string(out)) } return DeployError{} } // Update attempts to pull or clone a repository using the given name and url -func (site *Site) Update() DeployError { - log.Printf("Pulling down repository %s...", site.name) - repo,err := git.Open(configuration.sites_dir+"/"+site.name) +func (site *Site) Update() DeployError { + log.Printf("Pulling down repository %s...", site.getName()) + repo, err := git.Open(configuration.sites_dir + "/" + site.name) if err != nil { return newDeployError(1, "updateSite", fmt.Sprintf("Failed to open git repository '%s'", site.name), fmt.Sprint(err)) } if err = repo.Pull(); err != nil { return newDeployError(1, "updateSite", - fmt.Sprintf("Failed to pull down git repository '%s'", site.name), fmt.Sprint(err)) + fmt.Sprintf("Failed to pull down git repository '%s'", site.getName()), fmt.Sprint(err)) } return DeployError{} }