Matthias-Claudius-Schule/ca-lose
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into prod

Browse Source
This commit is contained in:
Theis Gaedigk
2026-01-21 14:27:37 +01:00
parent 2adbfa75a5 697e84b5ea
commit 7cf1245ef6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/routes/default/frontend.data.js
View File

@@ -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,
]);

2
docker-compose.prod.yml
View File

@@ -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: