From 9a509a4f71c28fc7b5e2eb603d7824aab5eedb29 Mon Sep 17 00:00:00 2001
From: Anthony <anthonykewl20@gmail.com>
Date: Fri, 3 Nov 2023 01:27:25 +0800
Subject: [PATCH] Revert changes

---
 manifest.jps | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/manifest.jps b/manifest.jps
index 3a21d1e..417e2d1 100644
--- a/manifest.jps
+++ b/manifest.jps
@@ -64,22 +64,9 @@ menu:
   loadingText: "Loading users..."
   action: "list_users"
   caption: "List Users"
-  successText: "Users listed successfully!"
-  logsPath: "/home/jelastic/add-sftp-user-addon/logs/sftp-users.log"
-  logsNodeGroup: cp
 
 actions:
   add_sftp_user:
-<<<<<<< HEAD
-    - cmd[cp]: 
-        user: root
-        commands: bash /home/jelastic/add-sftp-user-addon/add-sftp.sh ${globals.username} ${globals.password}
-    - if ("${response.exitStatus}" != "0"):
-        return: sftpError
-    - setGlobals:
-        username: "${fn.extract(response.out, "\"USERNAME\": \"(.*?)\"")}"
-        password: "${fn.extract(response.out, "\"PASSWORD\": \"(.*?)\"")}"
-=======
     - cmd[cp]:  # Use cmd action to check if user exists
         commands: id ${globals.username} || echo "User not found"
     - if ("${response.out}" == "User not found"):  # If user doesn't exist
@@ -95,7 +82,6 @@ actions:
             commands: id ${globals.username} || echo "User not found"
         - if ("${response.out}" != "User not found"):
             return: userExistsError
->>>>>>> parent of 200dc95 (Optimize user creation and logging)
     - return: sftpSuccess
   change_password:
     - cmd[cp]: 
@@ -119,7 +105,7 @@ actions:
   list_users:
     - cmd[cp]: 
         user: root
-        commands: "grep -oP '^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} - user\\d{5}' /home/litespeed/add-sftp-user-addon/logs/script_output.log | while read line; do printf \"%s\\n\" \"$line\"; done"
+        commands: "journalctl -u sshd | grep 'user[0-9]\\{5\\}' | awk '{printf \"Created: %s %s %s Username: %s\\n\", $1, $2, $3, $NF}' | sort -u"
     - return: listUsers
 
 responses: