From 8c334ec751b91c00e7d4fa1620770f24c25e9b0b Mon Sep 17 00:00:00 2001
From: Anton Franzluebbers <ntsluebbers@gmail.com>
Date: Sat, 26 Mar 2022 19:06:19 +0000
Subject: [PATCH] minor control panel changes from server

---
 control-panel/config.json | 6 +++---
 control-panel/git_pull.sh | 1 +
 control-panel/src/main.rs | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 control-panel/git_pull.sh

diff --git a/control-panel/config.json b/control-panel/config.json
index 1b77ac6..9a7f6c0 100644
--- a/control-panel/config.json
+++ b/control-panel/config.json
@@ -1,5 +1,5 @@
 {
     "port": 8080,
-    "log_file": "/home/ntsfranz/Documents/VelNetServerRust/nohup.out",
-    "server_dir": "/home/ntsfranz/Documents/VelNetServerRust/"
-}
\ No newline at end of file
+    "log_file": "/home/ubuntu/VelNetServerRust2/nohup.out",
+    "server_dir": "/home/ubuntu/VelNetServerRust2/"
+}
diff --git a/control-panel/git_pull.sh b/control-panel/git_pull.sh
new file mode 100644
index 0000000..5535a8b
--- /dev/null
+++ b/control-panel/git_pull.sh
@@ -0,0 +1 @@
+sudo -u ubuntu bash -c "git pull" 
diff --git a/control-panel/src/main.rs b/control-panel/src/main.rs
index d5916ba..c5fde41 100644
--- a/control-panel/src/main.rs
+++ b/control-panel/src/main.rs
@@ -85,8 +85,8 @@ async fn restart_server() -> HttpResponse {
 #[get("/git_pull")]
 async fn git_pull() -> HttpResponse {
 
-    let output = Command::new("git")
-        .arg("pull")
+    let output = Command::new("sh")
+        .arg("git_pull.sh")
         .output()
         .expect("failed to execute process");