From 6569eb5889b1257879661bf181a510c70ceddf8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ellensohn?= <bjoern.ellensohn@gmail.com>
Date: Mon, 25 Mar 2024 09:59:52 +0100
Subject: [PATCH] update: caddy now working

---
 .gitignore                               |   4 +-
 __pycache__/requests.cpython-310.pyc     | Bin 229 -> 0 bytes
 config/caddy/Caddyfile                   |  46 ++++++++---------------
 config/caddy/content/overview/index.html |  10 ++---
 scripts/ps4_controller_script.sh         |   7 ++++
 scripts/setup.sh                         |  16 ++++++++
 6 files changed, 47 insertions(+), 36 deletions(-)
 delete mode 100644 __pycache__/requests.cpython-310.pyc
 create mode 100755 scripts/ps4_controller_script.sh
 create mode 100755 scripts/setup.sh

diff --git a/.gitignore b/.gitignore
index 4d1c82f..0d0dd4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 .vscode
 config/npm/keys.json
-config/npm/logs
\ No newline at end of file
+config/npm/logs
+
+maps/
\ No newline at end of file
diff --git a/__pycache__/requests.cpython-310.pyc b/__pycache__/requests.cpython-310.pyc
deleted file mode 100644
index 4d77d6fbae06beb3f803d1149dda06fec635b4ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 229
zcmd1j<>g`kf_aP!QbU3CV-N=!FatRbKwPW<BvKes7;_k+7*ZJ)Fs3jqWQ<};Wlm+v
zVrgb%1j+<6XfnS9s$%e~Qp_kRDJZtm*U!n%&eY4vPfpCSvNSO<*4Ixg$kb0PEy>Vi
zy~R<KT3DJ|TvB|CIX$)H7GuRN)`FtUypmfiC8-r9D;bK|fo6e;Un=?;`MIh3Nm=<t
tdHU&@CHlz)#ql7s^<ie{6;$5hu*uC&Da}c>V+3j}W&;u&3|vfnOaQrKI<Ei#

diff --git a/config/caddy/Caddyfile b/config/caddy/Caddyfile
index ef88462..715bb37 100644
--- a/config/caddy/Caddyfile
+++ b/config/caddy/Caddyfile
@@ -1,23 +1,5 @@
-# http://loki {
-# 	root * /usr/share/caddy
-# 	file_server browse
-# }
-
-# http://loki/config {
-# 	reverse_proxy /config/* foxglove:8080
-# }
-
-# http://browse.loki {
-# 	root * /usr/share/caddy
-# 	file_server browse
-# }
-
-# http://config.loki {
-# 	reverse_proxy localhost:1337
-# }
-
-# http://control.loki {
-# 	reverse_proxy foxglove:8080
+# {
+# 	debug
 # }
 
 http://loki {
@@ -25,19 +7,23 @@ http://loki {
 	file_server browse
 
 	handle_path /config* {
-		#rewrite * /
-		reverse_proxy olivetin:1337
+		reverse_proxy http://olivetin:1337
 	}
 
 	handle_path /viz* {
-		#rewrite * /
-		reverse_proxy foxglove:8080
+		reverse_proxy http://foxglove:8080
 	}
 }
 
-# http://loki/config {
-# 	handle_path /config* {
-# 		rewrite * /
-# 		reverse_proxy olivetin:1337
-# 	}
-# }
+http://loki.local {
+	root * /usr/share/caddy
+	file_server browse
+
+	handle_path /config {
+		reverse_proxy http://olivetin:1337
+	}
+
+	handle_path /viz* {
+		reverse_proxy http://foxglove:8080
+	}
+}
diff --git a/config/caddy/content/overview/index.html b/config/caddy/content/overview/index.html
index afeccfd..71bc9d3 100644
--- a/config/caddy/content/overview/index.html
+++ b/config/caddy/content/overview/index.html
@@ -24,12 +24,12 @@
         <div id="NORM_SET">
             <table>
                 <tr>
-                    <td>SSD:</td>
-                    <td>CPS_bot_mini</td>
+                    <td>SSID:</td>
+                    <td>cps-loki</td>
                 </tr>
                 <tr>
                     <td>Password: </td>
-                    <td>pac999CPS</td>
+                    <td>cps-loki</td>
                 </tr>
             </table>
         </div>
@@ -37,11 +37,11 @@
 
     <div class="box" id="RIGHT">
         <div id="BLOCK_ONE">
-            <p class="mini-heads">Link to WebGui:</p>
+            <p class="mini-heads">Link to Configuration:</p>
             <!-- again -->
             <!-- Replace link at href -->
             <!-- hier Link zu WebGui -->
-            <a href="https://www.unileoben.ac.at/universitaet/lehrstuehle/institute/department-product-engineering/lehrstuhl-fuer-cyber-physical-systems/">
+            <a href="http://loki/config">
             <img src="qr_dummy_1.png" class="qr qr_2"></a>
             <br>
         </div>
diff --git a/scripts/ps4_controller_script.sh b/scripts/ps4_controller_script.sh
new file mode 100755
index 0000000..1767022
--- /dev/null
+++ b/scripts/ps4_controller_script.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Change directory to where docker-compose.yml is located
+cd /home/bjorn/git/cps_loki
+
+# Restart the teleop service using docker-compose
+docker compose restart teleop
diff --git a/scripts/setup.sh b/scripts/setup.sh
new file mode 100755
index 0000000..45e80c0
--- /dev/null
+++ b/scripts/setup.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# copy script to a system directory
+sudo cp ps4_controller_script.sh /etc/udev/rules.d
+
+# Set execute permissions for the script
+sudo chmod +x /etc/udev/rules.d/ps4_controller_script.sh
+
+# Create or append the udev rule
+echo 'ACTION=="add", SUBSYSTEM=="input", ATTRS{name}=="Wireless Controller", RUN+="/etc/udev/rules.d/ps4_controller_script.sh"' | sudo tee -a /etc/udev/rules.d/99-ps4-controller.rules
+
+# Reload udev rules
+sudo udevadm control --reload-rules
+
+# Provide user feedback
+echo "Setup completed. PS4 controller udev rule installed."
\ No newline at end of file