Merge branch 'proxy' into aims

.env

@@ -1,6 +1,4 @@
-ALFRESCO_DIR=~/alfresco
-ALFRESCO_LICENSE_DIR=~/alfresco/license
-
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+IDENTITY_SERVICE_BASEURL=http://auth.example.org:8080

docker-compose.yml

@@ -4,53 +4,27 @@
 version: "2"
 
 services:
-    platform:
-        image: alfresco/alfresco-governance-repository-community:V3.4-latest
-        mem_limit: 1700m
-        environment:
-            JAVA_OPTS: "
-                -Ddb.driver=org.postgresql.Driver
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dindex.subsystem.name=noindex
-                -Dalfresco.host=${PROXY_HOST}
-                -Dalfresco.port=${PROXY_PORT}
-                -Dalfresco.protocol=${PROXY_PROTOCOL}
-                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
-                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                -Ddeployment.method=DOCKER_COMPOSE
-                -Dcsrf.filter.enabled=false
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
 
-                -Dtransform.service.enabled=false
+    identity:
-                -Dlocal.transform.service.enabled=false
+        image: alfresco/alfresco-identity-service:1.3
-                
+        user: jboss
-                -Dsystem.content.eagerOrphanCleanup=true
+        environment:
-                -Dsystem.content.orphanProtectDays=0
+            KEYCLOAK_USER: admin
-                -Djodconverter.enabled=false
+            KEYCLOAK_PASSWORD: admin
-                "
+            KEYCLOAK_HOSTNAME: auth.example.org
-        depends_on:
+            KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json
-            - postgres-acs
+            KEYCLOAK_STATISTICS: enabled
-            - activemq
+        networks:
+            default:
+                aliases:
+                    - "auth.example.org"
+        volumes:
+            - ./keycloak-alfresco-realm.json:/tmp/keycloak-alfresco-realm.json:ro
     
-    postgres-acs:
-        image: postgres:11.7
-        mem_limit: 512m
-        environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-
-    activemq:
-        image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 256m
-
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs
+        image: local/nginx-ingress:aims
         ports:
             - 8080:8080
         depends_on:
-            - platform
+            - identity

keycloak-alfresco-realm.json

@@ -0,0 +1,47 @@
+{
+  "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"
+      }
+    }
+  ],
+  "requiredCredentials": [ "password" ],
+  "users": [
+    {
+      "username": "admin",
+      "email": "admin@app.activiti.com",
+      "enabled": true,
+      "credentials" : [
+        {
+          "type" : "password",
+          "value" : "admin"
+        }
+      ],
+      "realmRoles": [ "user", "admin" ]
+    }
+  ]
+}

nginx-ingress/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-if [[ $ACS_PLATFORM_URL ]]; then
+if [[ $AIMS_URL ]]; then
-  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/identity:8080%"$AIMS_URL"%g /etc/nginx/nginx.conf
 fi
 
 if [[ $ACCESS_LOG ]]; then

nginx-ingress/nginx.conf

@@ -19,31 +19,22 @@ 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;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_pass_header Set-Cookie;
-        
-        # Protect access to SOLR APIs
-        location ~ ^(/.*/service/api/solr/.*)$ {return 403;}
-        location ~ ^(/.*/s/api/solr/.*)$ {return 403;}
-        location ~ ^(/.*/wcservice/api/solr/.*)$ {return 403;}
-        location ~ ^(/.*/wcs/api/solr/.*)$ {return 403;}
 
-        location ~ ^(/.*/proxy/alfresco/api/solr/.*)$ {return 403 ;}
-        location ~ ^(/.*/-default-/proxy/alfresco/api/.*)$ {return 403;}
-        
-        # Protect access to Prometheus endpoint
-        location ~ ^(/.*/s/prometheus)$ {return 403;}
-        
         location / {
-            proxy_pass http://platform:8080;
+            return 301 $scheme://$http_host/auth;
         }
 
-        location /alfresco/ {
+        location /auth/ {
-            proxy_pass http://platform:8080;
+            proxy_pass http://identity:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;