revert merge with apache/master. cherry-pick additions/bugfixes

Signed-off-by: sami <sami@appscode.com>
ops-center · Sep 16, 2024 · acaf471 · acaf471
1 parent ae44f63
commit acaf471
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/server/apps/distributed-app/docker-composeOLD.yml b/server/apps/distributed-app/docker-composeOLD.yml
@@ -14,14 +14,11 @@ services:
         condition: service_started
       s3:
         condition: service_started
-    image: shn27/distributed-james-test:chibenwa-fix-and
+    image: sami7786/distributed-james-test:revertmerge
     container_name: james
     hostname: james.local
-    #volumes:
-     # - ./docker-configuration/jvm.properties:/root/conf/jvm.properties
-      #- ./docker-configuration/webadmin.properties:/root/conf/webadmin.properties
-      #- ./docker-configuration/jmap.properties:/root/conf/jmap.properties
-      #- ./docker-configuration/cassandra.properties:/root/conf/cassandra.properties
+    volumes:
+      - $PWD/jmap.properties:/root/conf/jmap.properties
     command:
       - --generate-keystore
     networks:

diff --git a/server/apps/distributed-app/jmap.properties b/server/apps/distributed-app/jmap.properties
@@ -34,6 +34,10 @@ jwt.publickeypem.url=file://conf/rs256-4096-public.pem
 # This enables a higher resilience, but the projection needs to be correctly populated. False by default.
 # view.email.query.enabled=true
 
+# If you want to specify authentication strategies for Jmap draft version
+# For custom Authentication Strategy not inside package "org.apache.james.jmap.http", you have to specify its FQDN
+# authentication.strategy.draft=AccessTokenAuthenticationStrategy,JWTAuthenticationStrategy,QueryParameterAccessTokenAuthenticationStrategy
+
 # If you want to specify authentication strategies for Jmap rfc-8621 version
 # For custom Authentication Strategy not inside package "org.apache.james.jmap.http", you have to specify its FQDN
 

diff --git a/server/apps/distributed-app/pom.xml b/server/apps/distributed-app/pom.xml
@@ -446,9 +446,9 @@
                         <image>eclipse-temurin:11-jre-jammy</image>
                     </from>
                     <to>
-                        <image>shn27/distributed-james-test</image>
+                        <image>sami7786/distributed-james-test</image>
                         <tags>
-                            <tag>MailetGroup</tag>
+                            <tag>revertmerge</tag>
                         </tags>
                     </to>
                     <container>