Merge pull request #10 from SDKAAA/main

[Add] FJ logs debug in files & Console, bumped KC to 24.0.5
icrc-global-cyber-hub · Jun 4, 2024 · 9116b81 · 9116b81
2 parents 6a5013d + 0dff66a
commit 9116b81
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/forgejo/.env b/forgejo/.env
@@ -9,6 +9,8 @@ FORGEJO_EXTERNAL_HTTP_PORT=30002
 FORGEJO_EXTERNAL_SSH_PORT=222
 FORGEJO_DOMAIN=localhost
 FORGEJO_APP_NAME='ForgeJo Test App Name'
+FORGEJO_LOG_LEVEL=Debug # [Trace, Debug, Info, Warn, Error, Critical, Fatal, None]
+FORGEJO_LOG_MODE=console,file
 # More configuration parameters are available here:
 # https://forgejo.org/docs/latest/admin/config-cheat-sheet/
 # https://docs.gitea.com/next/administration/config-cheat-sheet
diff --git a/forgejo/auto_config_fj_findings.txt b/forgejo/auto_config_fj_findings.txt
@@ -11,6 +11,8 @@ oauth2_key: forgejo
 oauth2_secret: 1pq0gKIrKY5Vi7EZeeqNXcsrRnGJWA4J
 # OpenID Connect Auto Discovery URL: http://YOUR-KEYCLOAK-IP:YOUR-KEYCLOAK-PORT/realms/YOUR-REALM-NAME/.well-known/openid-configuration
 open_id_connect_auto_discovery_url: http://keycloak:53531/realms/Humanitarians/.well-known/openid-configuration
+Required claim name: user_type
+Required claim value: forgejo_user
 
 security_protocol: 0
 port: 0

diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml
@@ -47,6 +47,9 @@ services:
       - FORGEJO__service__DEFAULT_USER_VISIBILITY=public
       - FORGEJO__service__DEFAULT_ORG_VISIBILITY=public
       - FORGEJO__service__DEFAULT_ORG_MEMBER_VISIBLE=false
+      - FORGEJO__log__LEVEL=${FORGEJO_LOG_LEVEL}
+      - FORGEJO__log__MODE=${FORGEJO_LOG_MODE}
+      - FORGEJO__log__logger.access.MODE=${FORGEJO_LOG_MODE}
 
     restart: unless-stopped
     networks:

diff --git a/keycloak/cli_init/.env b/keycloak/cli_init/.env
@@ -13,9 +13,10 @@ keycloak_path=/opt/keycloak/bin
 group_name=forgejogroup
 user1=user1
 user1_pwd=user1
-user1_email=[email protected]
+user1_email=[email protected]
 user2=user2
 user2_pwd=user2
+user2_email=[email protected]
 group_attribute_key=user_type
 group_attribute_value=forgejo_user
 client_scope=forgejoclientscope

diff --git a/keycloak/docker-compose.yml b/keycloak/docker-compose.yml
@@ -12,7 +12,7 @@ services:
   keycloak:
     #hostname: ${KEYCLOAK_DOMAIN} # not sure which hostname to use
     container_name: keycloak
-    image: quay.io/keycloak/keycloak:24.0.4-0 #latest
+    image: quay.io/keycloak/keycloak:24.0.5-0 #latest
     ports:
       - ${KEYCLOAK_EXTERNAL_PORT}:${KEYCLOAK_INTERNAL_PORT}
     environment: