Merge branch 'aps-persist-base' into aps-persist

.env

@@ -0,0 +1,9 @@
+ALFRESCO_DIR=~/alfresco
+ALFRESCO_LICENSE_DIR=~/alfresco/license
+
+PROXY_PROTOCOL=http
+PROXY_HOST=localhost
+PROXY_PORT=8080
+
+APS_TAG=2.4.1
+POSTGRES_TAG=13

docker-compose.yml

@@ -4,13 +4,70 @@ version: "3"
 
 services:
 
-    directory:
+    activiti-app:
-        image: osixia/openldap:1.4.0
+        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
-            LDAP_ORGANISATION: "Example Organization"
+            ACTIVITI_DATASOURCE_USERNAME: alfresco
-            LDAP_DOMAIN: example.org
+            ACTIVITI_DATASOURCE_PASSWORD: alfresco
-            LDAP_ADMIN_PASSWORD: admin
+            ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
-        command: "--copy-service --loglevel=debug"
+            ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
+            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+            JAVA_OPTS: "-Xms128m -Xmx256m"
+        depends_on:
+            - postgres-aps
         volumes:
-            - ./openldap-example.ldif:/container/service/slapd/assets/config/bootstrap/ldif/50-bootstrap.ldif:ro
+            - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
+            - apsbin-volume:/var/lib/postgresql/data:rw
+    
+    activiti-admin:
+        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
+        environment:
+            ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
+            ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
+            ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver
+            ACTIVITI_ADMIN_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
+            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
+            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
+            ACTIVITI_ADMIN_REST_APP_PORT: 8080
+            JAVA_OPTS: "-Xms64m -Xmx128m"
+        depends_on:
+            - postgres-aps-admin
+            - activiti-app
+    
+    postgres-aps:
+        image: postgres:${POSTGRES_TAG}
+        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:${POSTGRES_TAG}
+        environment:
+            POSTGRES_DB: activiti-admin
+            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
 
+    proxy:
+        build: ./nginx-ingress
+        image: local/nginx-ingress:aps
+        mem_limit: 256m
+        ports:
+            - 8080:8080
+        depends_on:
+            - activiti-app
+            - activiti-admin
+
+volumes:
+    apsbin-volume:
+        driver: local
+    apsdb-volume:
+        driver: local
+    apsadmindb-volume:
+        driver: local

nginx-ingress/Dockerfile

@@ -0,0 +1,8 @@
+FROM nginx:stable-alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT [ "/entrypoint.sh" ]

nginx-ingress/entrypoint.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [[ $APS_APP_URL ]]; then
+  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_URL"%g /etc/nginx/nginx.conf
+fi
+
+if [[ $APS_ADMIN_URL ]]; then
+  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_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 -g "daemon off;"

nginx-ingress/nginx.conf

@@ -0,0 +1,59 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    server {
+        listen *:8080;
+
+        client_max_body_size 0;
+
+        set  $allowOriginSite *;
+        proxy_pass_request_headers on;
+        proxy_pass_header Set-Cookie;
+
+        # External settings, do not remove
+        #ENV_ACCESS_LOG
+
+        proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+        proxy_redirect off;
+        proxy_buffering off;
+        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/activiti-app;
+        }
+
+        location /activiti-app/ {
+            proxy_pass http://activiti-app:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
+
+        location /activiti-admin/ {
+            proxy_pass http://activiti-admin:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
+    }
+}

openldap-example.ldif

@@ -1,80 +0,0 @@
-version: 1
-
-dn: uid=admin.1,dc=example,dc=org
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-objectClass: uidObject
-objectClass: simpleSecurityObject
-objectClass: mailAccount
-cn: #1
-sn: Administrator
-uid: admin.1
-userPassword: {SSHA}m2qOFBapko4Bky4vbQYCVyW4+KWeuswg/BqObw==
-mail: admin.1@example.org
-
-dn: uid=manager.1,dc=example,dc=org
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-objectClass: uidObject
-objectClass: simpleSecurityObject
-objectClass: mailAccount
-cn: #1
-sn: Manager
-uid: manager.1
-userPassword: {SSHA}m2qOFBapko4Bky4vbQYCVyW4+KWeuswg/BqObw==
-mail: manager.1@example.org
-
-dn: uid=user.1,dc=example,dc=org
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-objectClass: uidObject
-objectClass: simpleSecurityObject
-objectClass: mailAccount
-cn: #1
-sn: User
-uid: user.1
-userPassword: {SSHA}m2qOFBapko4Bky4vbQYCVyW4+KWeuswg/BqObw==
-mail: user.1@example.org
-
-dn: uid=user.2,dc=example,dc=org
-objectClass: organizationalPerson
-objectClass: person
-objectClass: top
-objectClass: uidObject
-objectClass: simpleSecurityObject
-objectClass: mailAccount
-cn: #2
-sn: User
-uid: user.2
-userPassword: {SSHA}m2qOFBapko4Bky4vbQYCVyW4+KWeuswg/BqObw==
-mail: user.2@example.org
-
-dn: cn=power-users,dc=example,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: power-users
-member: uid=manager.1,dc=example,dc=org
-
-dn: cn=admins,dc=example,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: admins
-member: uid=admin.1,dc=example,dc=org
-
-dn: cn=acs-users,dc=example,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: acs-users
-member: cn=power-users,dc=example,dc=org
-member: uid=user.1,dc=example,dc=org
-
-dn: cn=aps-users,dc=example,dc=org
-objectClass: groupOfNames
-objectClass: top
-cn: aps-users
-member: cn=power-users,dc=example,dc=org
-member: uid=user.2,dc=example,dc=org
-