Resolve merge conflict and set server port to 80

.gitea/workflows/deploy.yml

@@ -18,15 +18,15 @@ jobs:
           key: ${{ secrets.DEPLOY_SSH_KEY }}
           port: 22
           script: |
-            cd /root/bwscheddebrock_trassenplaner || exit
+            cd /home/${{ secrets.DEPLOY_USER }}/bwscheddebrock_trassenplaner || exit
             git pull origin main
             
-            # .env-Datei generieren
-            echo "DB_HOST=postgis" > .env
-            echo "DB_PORT=5432" >> .env
-            echo "DB_USER=trassenplaner_tool_user" >> .env
+            # .env-Datei aus Gitea-Secrets generieren
+            echo "DB_HOST=${{ secrets.DB_HOST }}" > .env
+            echo "DB_PORT=${{ secrets.DB_PORT }}" >> .env
+            echo "DB_USER=${{ secrets.DB_USER }}" >> .env
             echo "DB_PASSWORD='${{ secrets.DB_PASSWORD }}'" >> .env
-            echo "DB_NAME=enwelo" >> .env
+            echo "DB_NAME=${{ secrets.DB_NAME }}" >> .env
             echo "DB_SCHEMA=wind_projekt_bwscheddebrock" >> .env
             
             docker compose up -d --build --force-recreate

server.js

@@ -158,7 +158,7 @@ app.get('/api/poi', async (req, res) => {
       SELECT 
         id, 
         ST_AsGeoJSON(ST_Transform(geom, 4326)) as geometry
-      FROM "netzverknüpfungspunkt"
+      FROM netzverknüpfungspunkt
     `;
     const result = await client.query(query);
     const geojson = {
@@ -320,6 +320,7 @@ app.patch('/api/owners/:id', async (req, res) => {
   }
 });
 
-app.listen(3000, () => {
-  console.log(`Server running at http://localhost:3000`);
+const PORT = process.env.PORT || 80;
+app.listen(PORT, '0.0.0.0', () => {
+  console.log(`Server running on port ${PORT}`);
 });