work on login-server and community-server config

community_server

@@ -1 +1 @@
-Subproject commit 912c1f4d11f30bd5671c7e512fff02602c5d91b4
+Subproject commit 16edef524cf19aaf8919f8e91a4bbff263ea1423

configs/login_server/grd_login.properties

@@ -1,50 +1,50 @@
-HTTPServer.port = 1200
+HTTPServer.port = 1200
-JSONServer.port = 1201
+JSONServer.port = 1201
-Gradido.group_id = 1
+Gradido.group_id = 1
-
+
-crypto.server_admin_public  = f909a866baec97c5460b8d7a93b72d3d4d20cc45d9f15d78bd83944eb9286b7f
+crypto.server_admin_public  = f909a866baec97c5460b8d7a93b72d3d4d20cc45d9f15d78bd83944eb9286b7f
-crypto.server_key = a51ef8ac7ef1abf162fb7a65261acd7a
+crypto.server_key = a51ef8ac7ef1abf162fb7a65261acd7a
-crypto.app_secret = 21ffbbc616fe # TODO auto-generate in docker build step
+crypto.app_secret = 21ffbbc616fe # TODO auto-generate in docker build step
-
+
-
+
-
+
-# Server admin Passphrase 
+# 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 
+# nerve execute merit pool talk hockey basic win cargo spin disagree ethics swear price purchase say clutch decrease slow half forest reform cheese able 
-#
+#
-
+
-phpServer.url = http://community-server
+phpServer.url = http://localhost/
-phpServer.host = community-server
+phpServer.host = community-server
-phpServer.port = 80
+phpServer.port = 80
-
+
-loginServer.path = http://login-server
+loginServer.path = http://localhost/account
-loginServer.default_locale = de
+loginServer.default_locale = de
-loginServer.db.host = mariadb
+loginServer.db.host = mariadb
-loginServer.db.name = gradido_login
+loginServer.db.name = gradido_login
-loginServer.db.user = root
+loginServer.db.user = root
-loginServer.db.password = 
+loginServer.db.password = 
-loginServer.db.port = 3306
+loginServer.db.port = 3306
-
+
-email.disable = true
+email.disable = true
-#email.username =
+#email.username =
-#email.sender =
+#email.sender =
-#email.admin_receiver = 
+#email.admin_receiver = 
-#email.password = 
+#email.password = 
-#email.smtp.url =
+#email.smtp.url =
-#email.smtp.port = 
+#email.smtp.port = 
-
+
-#  binary is default, for debugging also json is possible
+#  binary is default, for debugging also json is possible
-#hedera.consensus.message_format = json
+#hedera.consensus.message_format = json
-# TESTNET or MAINNET, TESTNET is default
+# TESTNET or MAINNET, TESTNET is default
-hedera.nettype = TESTNET
+hedera.nettype = TESTNET
-
+
-# server setup types: test, staging or production
+# server setup types: test, staging or production
-ServerSetupType=test
+ServerSetupType=test
-
+
-
+
-# Session timeout in minutes
+# Session timeout in minutes
-# 
+# 
-session.timeout = 15
+session.timeout = 15
-
+
-# Disabling security features for faster develop and testing
+# Disabling security features for faster develop and testing
-unsecure.allow_passwort_via_json_request = 1
+unsecure.allow_passwort_via_json_request = 1
-unsecure.allow_auto_sign_transactions = 1
+unsecure.allow_auto_sign_transactions = 1

docker-compose.override.yml

@@ -29,19 +29,23 @@ services:
     build: 
       context: ./login_server/
       target: login_server_debug
+      dockerfile: Dockerfile.debug
     security_opt:
       - seccomp:unconfined
-    #cap-add:SYS_PTRACE
+    cap_add:
+      - SYS_PTRACE
     depends_on: 
       - mariadb
     networks: 
       - internal-net
+      #- external-net
     ports:
       - 1200:1200
       - 1201:1201
     volumes:
       - ./configs/login_server:/etc/grd_login
       - ./logs:/var/log/grd_login 
+      - conan:/root/.conan
   #  image: ocelotsocialnetwork/backend:development
   #  build:
   #    target: development
@@ -58,4 +62,5 @@ services:
    
 volumes:
   frontend_node_modules:
+  conan:
   # backend_node_modules:

docker-compose.yml

@@ -58,8 +58,8 @@ services:
     build: 
       context: ./login_server/
       target: login_server
-    depends_on: 
+    #depends_on: 
-      - mariadb
+      #- mariadb
     networks: 
       - internal-net
     ports:

login_server

@@ -1 +1 @@
-Subproject commit fa936dbc80860472a5cbc3d877cf130a0be916b3
+Subproject commit bf1b6bcec0a208e7b4ec8c91b6b5e42c84131114