From 30d995e48eac01e997637deb39ffd65d2008e18f Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Thu, 18 Feb 2021 14:00:05 +0100 Subject: [PATCH] last fixes, now login-server and community-server are running with docker :) --- configs/community_server/app.php | 2 +- configs/login_server/grd_login.properties | 5 ++--- login_server | 2 +- nginx/nginx.conf | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/community_server/app.php b/configs/community_server/app.php index d96d402e7..c862a8d9a 100644 --- a/configs/community_server/app.php +++ b/configs/community_server/app.php @@ -394,7 +394,7 @@ return [ // Gradido specific configuration // Login Server ip and port 'LoginServer' => [ - 'host' => 'login-server', + 'host' => 'http://login-server', 'port' => 1201 ], diff --git a/configs/login_server/grd_login.properties b/configs/login_server/grd_login.properties index 3908d5c95..7719bc563 100644 --- a/configs/login_server/grd_login.properties +++ b/configs/login_server/grd_login.properties @@ -4,9 +4,8 @@ Gradido.group_id = 1 crypto.server_admin_public = f909a866baec97c5460b8d7a93b72d3d4d20cc45d9f15d78bd83944eb9286b7f crypto.server_key = a51ef8ac7ef1abf162fb7a65261acd7a -crypto.app_secret = 21ffbbc616fe # TODO auto-generate in docker build step - - +# TODO auto-generate in docker build step +crypto.app_secret = 21ffbbc616fe # Server admin Passphrase # nerve execute merit pool talk hockey basic win cargo spin disagree ethics swear price purchase say clutch decrease slow half forest reform cheese able diff --git a/login_server b/login_server index bf1b6bcec..a89e0c8e1 160000 --- a/login_server +++ b/login_server @@ -1 +1 @@ -Subproject commit bf1b6bcec0a208e7b4ec8c91b6b5e42c84131114 +Subproject commit a89e0c8e1360edfac81b3e73923690f7f1da7b5e diff --git a/nginx/nginx.conf b/nginx/nginx.conf index f8333626e..064395336 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -69,7 +69,7 @@ server { } location / { - try_files \$uri \$uri/ /index.php?\$args; + try_files $uri $uri/ /index.php?$args; } # access_log /var/log/nginx/access.log main;