Merge branch 'acs-mysql-base' into acs-mysql

.env

@@ -1,4 +1,6 @@
+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,32 +4,53 @@
 version: "2"
 
 services:
-
+    platform:
-    identity:
+        image: alfresco/alfresco-content-repository-community:6.2.0-ga
-        image: alfresco/alfresco-identity-service:1.3
+        mem_limit: 1700m
-        user: jboss
         environment:
-            KEYCLOAK_USER: admin
+            JAVA_OPTS: "
-            KEYCLOAK_PASSWORD: admin
+                -Ddb.driver=com.mysql.jdbc.Driver
-            KEYCLOAK_HOSTNAME: auth.example.org
+                -Ddb.username=alfresco
-            KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json
+                -Ddb.password=alfresco
-            KEYCLOAK_STATISTICS: enabled
+                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
-        networks:
+                -Dindex.subsystem.name=noindex
-            default:
+                -Dalfresco.host=${PROXY_HOST}
-                aliases:
+                -Dalfresco.port=${PROXY_PORT}
-                    - "auth.example.org"
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
-        volumes:
+                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
-            - ./keycloak-alfresco-realm.json:/tmp/keycloak-alfresco-realm.json:ro
+                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-            - keycloak-volume:/opt/jboss/keycloak/standalone/data:rw
+                -Ddeployment.method=DOCKER_COMPOSE
+                -Dcsrf.filter.enabled=false
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+
+                -Dtransform.service.enabled=false
+                -Dlocal.transform.service.enabled=false
+                
+                -Dsystem.content.eagerOrphanCleanup=true
+                -Dsystem.content.orphanProtectDays=0
+                -Djodconverter.enabled=false
+                "
+        depends_on:
+            - mysql-acs
+            - activemq
     
+    mysql-acs:
+        image: mysql:5.7
+        mem_limit: 512m
+        environment:
+            - MYSQL_RANDOM_ROOT_PASSWORD=true
+            - MYSQL_PASSWORD=alfresco
+            - MYSQL_USER=alfresco
+            - MYSQL_DATABASE=alfresco
+
+    activemq:
+        image: alfresco/alfresco-activemq:5.15.8
+        mem_limit: 256m
+
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:aims
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
-            - identity
+            - platform
-
-volumes:
-    keycloak-volume:
-        driver: local

keycloak-alfresco-realm.json

@@ -1,47 +0,0 @@
-{
-  "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 [[ $AIMS_URL ]]; then
+if [[ $ACS_PLATFORM_URL ]]; then
-  sed -i s%http:\/\/identity:8080%"$AIMS_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
 if [[ $ACCESS_LOG ]]; then

nginx-ingress/nginx.conf

@@ -19,22 +19,31 @@ 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 / {
-            return 301 $scheme://$http_host/auth;
+            proxy_pass http://platform:8080;
         }
 
-        location /auth/ {
+        location /alfresco/ {
-            proxy_pass http://identity:8080;
+            proxy_pass http://platform:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;