Merge branch 'dev' into prod

backend/routes/default/frontend.data.js

@@ -12,7 +12,7 @@ const pool = mysql
   .promise();
 
 export const getUser = async () => {
-  const [rows] = await pool.query("SELECT username FROM usersNEW");
+  const [rows] = await pool.query("SELECT username FROM users");
 
   if (rows.length > 0) {
     const users = rows.map((r) => r.username);
@@ -23,7 +23,7 @@ export const getUser = async () => {
 };
 
 export const confirmUser = async (username) => {
-  const [rows] = await pool.query("SELECT * FROM usersNEW WHERE username = ?", [
+  const [rows] = await pool.query("SELECT * FROM users WHERE username = ?", [
     username,
   ]);
 

docker-compose.prod.yml

@@ -40,6 +40,8 @@ services:
     networks:
       ca-lose-internal:
         ipv4_address: 172.25.0.4
+      proxynet:
+        ipv4_address: 172.20.0.60
 
   # DNS Server für Hostname-Auflösung innerhalb des VPN
   dnsmasq: