alma/NeahFront7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve .env merge conflict

Browse Source
This commit is contained in:
Alma 2025-04-14 00:24:55 +02:00
commit 0fe0526e4e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.env
View File

@ -11,6 +11,7 @@ NEXTCLOUD_URL=https://espace.slm-lab.net
NEXTCLOUD_CLIENT_ID=espace.slm-lab.net NEXTCLOUD_CLIENT_ID=espace.slm-lab.net
NEXTCLOUD_CLIENT_SECRET=YHLVMGpu0nGRaP7gMDpSjRr1ia6HiSr1 NEXTCLOUD_CLIENT_SECRET=YHLVMGpu0nGRaP7gMDpSjRr1ia6HiSr1
# Agenda/Calendar database (Prisma)
DATABASE_URL="postgresql://postgres:postgres@localhost:5432/calendar_db?schema=public" DATABASE_URL="postgresql://postgres:postgres@localhost:5432/calendar_db?schema=public"
# Sidebar iframes # Sidebar iframes
@ -47,9 +48,6 @@ ROCKET_CHAT_USER_ID=Tpuww59PJKsrGNQJB
LEANTIME_TOKEN=lt_lsdShQdoYHaPUWuL07XZR1Rf3GeySsIs_UDlll3VJPk5EwAuILpMC4BwzJ9MZFRrb LEANTIME_TOKEN=lt_lsdShQdoYHaPUWuL07XZR1Rf3GeySsIs_UDlll3VJPk5EwAuILpMC4BwzJ9MZFRrb
LEANTIME_API_URL=https://agilite.slm-lab.net LEANTIME_API_URL=https://agilite.slm-lab.net
DATABASE_URL="postgresql://alma:Sict33711###@cube.governance-labs.com:5432/rivacube?schema=public" DATABASE_URL="postgresql://postgres:postgres@localhost:5432/calendar_db?schema=public"
DB_USER=alma
DB_PASSWORD=Sict33711###
DB_NAME=rivacube
DB_HOST=cube.governance-labs.com