From d20ea230da66538d1cbd5f7f242eb357879845f6 Mon Sep 17 00:00:00 2001
From: ma-04 <120931948+ma-04@users.noreply.github.com>
Date: Wed, 9 Apr 2025 11:40:09 +0600
Subject: [PATCH 1/2] fix(ols): cli not detecting ols site

---
 cmd/site.go                | 4 ++--
 internal/docker/compose.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/site.go b/cmd/site.go
index 01cbd8f..ed1953b 100644
--- a/cmd/site.go
+++ b/cmd/site.go
@@ -102,10 +102,10 @@ var execCmd = &cobra.Command{
 			return
 		}
 
-		// if the next argument is "php", "nginx" or "litespeed", use it as the service name
+		// if the next argument is "php", "nginx" or "openlitespeed", use it as the service name
 		// otherwise, use "php" as the default service name
 		composeArgs := []string{"exec"}
-		if args[0] == "php" || args[0] == "nginx" || args[0] == "litespeed" {
+		if args[0] == "php" || args[0] == "nginx" || args[0] == "openlitespeed" {
 			composeArgs = append(composeArgs, args[0])
 			args = args[1:]
 		} else {
diff --git a/internal/docker/compose.go b/internal/docker/compose.go
index c9d6712..59a8483 100644
--- a/internal/docker/compose.go
+++ b/internal/docker/compose.go
@@ -48,8 +48,8 @@ func getContainerName(composePath string) (string, error) {
 
 	if _, exists := config.Services["php"]; exists {
 		return "php", nil
-	} else if _, exists := config.Services["litespeed"]; exists {
-		return "litespeed", nil
+	} else if _, exists := config.Services["openlitespeed"]; exists {
+		return "openlitespeed", nil
 	}
 
 	return "", fmt.Errorf("no suitable container found")

From 46eff137c2ab433ea9f5e0752705c560321fa052 Mon Sep 17 00:00:00 2001
From: ma-04 <120931948+ma-04@users.noreply.github.com>
Date: Wed, 9 Apr 2025 12:02:39 +0600
Subject: [PATCH 2/2] fix(ols): set ols user to avoid using root user

---
 internal/docker/compose.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/internal/docker/compose.go b/internal/docker/compose.go
index 59a8483..2625f0d 100644
--- a/internal/docker/compose.go
+++ b/internal/docker/compose.go
@@ -61,6 +61,12 @@ func RunWPCLI(composePath string, args []string) error {
 		return err
 	}
 
-	wpArgs := append([]string{"exec", containerName, "wp"}, args...)
+	var wpArgs []string
+	if containerName == "openlitespeed" {
+		wpArgs = append([]string{"exec", "--user", "www-data", containerName, "wp"}, args...)
+	} else {
+		wpArgs = append([]string{"exec", containerName, "wp"}, args...)
+	}
+
 	return RunCompose(composePath, wpArgs...)
 }