Merge branch 'dbp-persist' into dbp-persist-aims

.env

@@ -4,3 +4,6 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+IDENTITY_SERVICE_PROTOCOL=http
+IDENTITY_SERVICE_HOST=auth.example.org
+IDENTITY_SERVICE_PORT=8080

docker-compose.yml

@@ -1,12 +1,12 @@
 # Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
 # Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
-version: "2"
+version: "2.1"
 
 services:
     platform:
         image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
-        mem_limit: 1700m
+        mem_limit: 2g
         environment:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
@@ -47,20 +47,31 @@ services:
                 -Dtransform.misc.url=http://transform-engine-aio:8090
 
                 -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
+
+                -Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm
+                -Didentity-service.authentication.defaultAdministratorUserNames=admin.1
+                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
                 
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            - postgres-acs
+            postgres-acs:
-            - activemq
+                condition: service_started
-            - shared-file-store
+            activemq:
+                condition: service_started
+            shared-file-store:
+                condition: service_started
+            identity:
+                condition: service_healthy
         volumes:
             - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     transform-router:
         image: quay.io/alfresco/alfresco-transform-router:1.3.1
+        mem_limit: 128m
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -71,6 +82,7 @@ services:
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
+        mem_limit: 1g
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@@ -80,12 +92,10 @@ services:
 
     shared-file-store:
         image: alfresco/alfresco-shared-file-store:0.10.0
+        mem_limit: 256m
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
-    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
-    
     share:
         image: quay.io/alfresco/alfresco-governance-share-enterprise:V3.4-latest
         mem_limit: 512m
@@ -100,20 +110,32 @@ services:
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
+                -Daims.enabled=true
+                -Daims.realm=alfresco
+                -Daims.resource=acs-share
+                -Daims.authServerUrl=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
+                -Daims.sslRequired=none
+                -Daims.publicClient=true
+                -Daims.autodetectBearerOnly=true
+                -Daims.alwaysRefreshToken=true
+                -Daims.principalAttribute=preferred_username
+                -Daims.enableBasicAuth=true
                 "
     
     postgres-acs:
         image: postgres:11.7
-        mem_limit: 512m
+        mem_limit: 128m
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
             - POSTGRES_DB=alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
+        volumes:
+            - acsdb-volume:/var/lib/postgresql/data:rw
     
     search:
         image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 2g
+        mem_limit: 1g
         environment:
             - SOLR_ALFRESCO_HOST=platform
             - SOLR_ALFRESCO_PORT=8080
@@ -121,10 +143,14 @@ services:
             - SOLR_SOLR_PORT=8983
             - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
             - ALFRESCO_SECURE_COMMS=none
+        volumes:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 256m
+        mem_limit: 512m
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     sync:
         image: quay.io/alfresco/service-sync:3.3.3.1
@@ -140,6 +166,8 @@ services:
                 -Drepo.port=8080
                 -Ddw.server.applicationConnectors[0].type=http
                 -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
+                -Didentity-service.resource=acs-sync
                 "
         depends_on:
             - postgres-acs
@@ -151,7 +179,17 @@ services:
         environment:
             BASE_PATH: ./
             APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
-            APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
+            APP_CONFIG_BPM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
+            APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/workspace/#/preview/s"
+            APP_CONFIG_PROVIDER: "ALL"
+            APP_CONFIG_PLUGIN_PROCESS_SERVICE: "true"
+            #APP_CONFIG_PLUGIN_PROCESS_AUTOMATION: "true"
+            APP_CONFIG_AUTH_TYPE: OAUTH
+            APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth/realms/alfresco"
+            APP_CONFIG_OAUTH2_CLIENTID: alfresco
+            APP_CONFIG_OAUTH2_IMPLICIT_FLOW: "true"
+            APP_CONFIG_OAUTH2_REDIRECT_LOGIN: "/workspace/"
+            APP_CONFIG_OAUTH2_REDIRECT_LOGOUT: "/workspace/logout"
 
     activiti-app:
         image: alfresco/process-services:1.11.1.1
@@ -166,11 +204,15 @@ services:
             ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
             ACTIVITI_ES_REST_CLIENT_PORT: 9200
             ACTIVITI_ES_REST_CLIENT_SCHEMA: http
+            IDENTITY_SERVICE_ENABLED: "true"
+            IDENTITY_SERVICE_AUTH: ${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
+            IDENTITY_SERVICE_CONTENT_SSO_REDIRECT_URI: ${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/activiti-app/app/rest/integration/sso/confirm-auth-request
             JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
         depends_on:
             - postgres-aps
         volumes:
             - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+            - apsbin-volume:/var/lib/postgresql/data:rw
     
     activiti-admin:
         image: alfresco/process-services-admin:1.11.1.1
@@ -190,12 +232,14 @@ services:
     
     postgres-aps:
         image: postgres:11.6
-        mem_limit: 256m
+        mem_limit: 128m
         environment:
             POSTGRES_DB: activiti
             POSTGRES_USER: alfresco
             POSTGRES_PASSWORD: alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
+        volumes:
+            - apsdb-volume:/var/lib/postgresql/data:rw
     
     postgres-aps-admin:
         image: postgres:11.6
@@ -205,6 +249,8 @@ services:
             POSTGRES_USER: alfresco
             POSTGRES_PASSWORD: alfresco
         command: postgres -c max_connections=50 -c log_min_messages=LOG
+        volumes:
+            - apsadmindb-volume:/var/lib/postgresql/data:rw
     
     search-aps:
         image: elasticsearch:7.6.0
@@ -218,10 +264,37 @@ services:
                 hard: -1
         depends_on:
             - activiti-app
+        volumes:
+            - esindex-volume:/var/lib/postgresql/data:rw
+
+    identity:
+        image: alfresco/alfresco-identity-service:1.4.0
+        mem_limit: 512m
+        user: jboss
+        environment:
+            KEYCLOAK_USER: admin
+            KEYCLOAK_PASSWORD: admin
+            KEYCLOAK_HOSTNAME: ${IDENTITY_SERVICE_HOST}
+            KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json
+            KEYCLOAK_STATISTICS: enabled
+        networks:
+            default:
+                aliases:
+                    - "${IDENTITY_SERVICE_HOST}"
+        healthcheck:
+            test: ["CMD", "curl", "-f", "http://localhost:8080/auth/realms/alfresco"]
+            interval: 10s
+            timeout: 10s
+            # Really long startup times on Windows
+            retries: 18
+        volumes:
+            - ./keycloak-alfresco-realm.json:/tmp/keycloak-alfresco-realm.json:ro
+            - keycloak-volume:/opt/jboss/keycloak/standalone/data:rw
     
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync-share-adw-aps
+        image: local/nginx-ingress:acs-sync-share-adw-aps-aims
+        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on:
@@ -231,9 +304,28 @@ services:
             - digital-workspace
             - activiti-app
             - activiti-admin
+            - identity
 
 volumes:
     shared-file-store-volume:
         driver_opts:
             type: tmpfs
             device: tmpfs
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local
+    solrindex-volume:
+        driver: local
+    apsbin-volume:
+        driver: local
+    apsdb-volume:
+        driver: local
+    apsadmindb-volume:
+        driver: local
+    esindex-volume:
+        driver: local
+    keycloak-volume:
+        driver: local

keycloak-alfresco-realm.json

@@ -0,0 +1,80 @@
+{
+  "realm": "alfresco",
+  "enabled": true,
+  "sslRequired": "external",
+  "registrationAllowed": false,
+  "roles": {
+    "realm": [ {
+      "name": "user",
+      "description": "User privileges"
+    }, {
+      "name": "admin",
+      "description": "Administrator privileges"
+    } ]
+  },
+  "clients": [
+    {
+      "clientId": "alfresco",
+      "name": "Alfresco Products",
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "redirectUris": [ "*" ],
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": true,
+      "directAccessGrantsEnabled": false,
+      "publicClient": true,
+      "protocol": "openid-connect",
+      "attributes": {
+        "login_theme": "alfresco"
+      }
+    },
+    {
+      "clientId": "acs-share",
+      "name": "ACS Share",
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "redirectUris": [ "*" ],
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "publicClient": true,
+      "protocol": "openid-connect",
+      "attributes": {
+        "login_theme": "alfresco"
+      }
+    },
+    {
+      "clientId": "acs-sync",
+      "name": "Alfresco Sync Service Clients",
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "redirectUris": [
+        "http://127.0.0.1*",
+        "http://localhost*"
+      ],
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "publicClient": true,
+      "protocol": "openid-connect",
+      "attributes": {
+        "login_theme": "alfresco"
+      }
+    }
+  ],
+  "requiredCredentials": [ "password" ],
+  "users": [
+    {
+      "username": "admin",
+      "email": "admin@app.activiti.com",
+      "enabled": true,
+      "credentials" : [
+        {
+          "type" : "password",
+          "value" : "admin"
+        }
+      ],
+      "realmRoles": [ "user", "admin" ]
+    }
+  ]
+}

nginx-ingress/entrypoint.sh

@@ -24,6 +24,10 @@ if [[ $APS_ADMIN_URL ]]; then
   sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_URL"%g /etc/nginx/nginx.conf
 fi
 
+if [[ $AIMS_URL ]]; then
+  sed -i s%http:\/\/identity:8080%"$AIMS_URL"%g /etc/nginx/nginx.conf
+fi
+
 if [[ $ACCESS_LOG ]]; then
   sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -19,7 +19,10 @@ http {
 
         proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
         proxy_redirect off;
-        proxy_buffering off;
+#        proxy_buffering off;
+        proxy_buffer_size	64k;
+        proxy_buffers		4 256k;
+        proxy_busy_buffers_size	256k;
         proxy_set_header Host              $http_host;
         proxy_set_header X-Real-IP         $remote_addr;
         proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
@@ -69,9 +72,6 @@ http {
 
         location /share/ {
             proxy_pass http://share:8080;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
         }
         
         location /workspace/ {
@@ -80,5 +80,12 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
+
+        location /auth/ {
+            proxy_pass http://identity:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
     }
 }