From e276649fc59a41611db9af9a4b3fbb4b15c896be Mon Sep 17 00:00:00 2001 From: pk Date: Wed, 28 Aug 2024 12:42:07 +0200 Subject: [PATCH] Add version and fix port search. --- config.yml => .hoster.yml | 0 cmd/hoster_cli/hoster.go | 7 ++++--- internals/helpers/findHostConfigs.go | 9 +++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) rename config.yml => .hoster.yml (100%) diff --git a/config.yml b/.hoster.yml similarity index 100% rename from config.yml rename to .hoster.yml diff --git a/cmd/hoster_cli/hoster.go b/cmd/hoster_cli/hoster.go index 1c37968..0016ed4 100644 --- a/cmd/hoster_cli/hoster.go +++ b/cmd/hoster_cli/hoster.go @@ -20,8 +20,9 @@ func main() { conf.LoadConfig(".hoster.yml") app := &cli.App{ - Name: "hoster", - Usage: "Hoster", + Name: "hoster", + Usage: "Hoster", + Version: "1.0.0", Commands: []*cli.Command{ { Name: "new", @@ -50,7 +51,7 @@ func main() { projectFolder := filepath.Join(projectRoot, name) - existingProjects, err := helpers.FindHostConfigs(sitesEnabled) + existingProjects, err := helpers.FindHostConfigs(sitesAvail) if err != nil { return err } diff --git a/internals/helpers/findHostConfigs.go b/internals/helpers/findHostConfigs.go index a49e082..18d6d9a 100644 --- a/internals/helpers/findHostConfigs.go +++ b/internals/helpers/findHostConfigs.go @@ -28,7 +28,7 @@ func FindHostConfigs(path string) ([]types.Project, error) { return projects, nil } -var portRegex = regexp.MustCompile(`listen\s+(\d+)`) +var portRegex = regexp.MustCompile(`proxy_pass http://.+:(\d+)`) var serverNameRegex = regexp.MustCompile(`server_name\s+(.+);`) func parseHostFile(filePath string, project *types.Project) error { @@ -47,8 +47,13 @@ func parseHostFile(filePath string, project *types.Project) error { continue } - if strings.HasPrefix(line, "listen ") { + if strings.HasPrefix(line, "proxy_pass ") { port := portRegex.FindStringSubmatch(line) + + if len(port) == 0 { + continue + } + project.InternalPort, err = strconv.Atoi(port[1]) if err != nil { return err