Merge branch 'acs-search-base' into acs-search-persist

.env

@@ -1,3 +1,6 @@
+ALFRESCO_DIR=~/alfresco
+ALFRESCO_LICENSE_DIR=~/alfresco/license
+
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080

docker-compose.yml

@@ -4,8 +4,55 @@
 version: "2"
 
 services:
+    platform:
+        image: alfresco/alfresco-content-repository:latest
+        environment:
+            JAVA_OPTS: "
+                -Ddb.driver=org.postgresql.Driver
+                -Dsolr.host=search
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
+                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
+                "
+        depends_on:
+            - postgres-acs
+            - activemq
+        volumes:
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
+    
+    postgres-acs:
+        image: postgres:latest
+        volumes:
+            - acsdb-volume:/var/lib/postgresql/data:rw
+    
+    search:
+        image: alfresco/alfresco-search-services:latest
+        environment:
+            - SOLR_ALFRESCO_HOST=platform
+            - SOLR_SOLR_HOST=search
+        volumes:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
+
+    activemq:
+        image: alfresco/alfresco-activemq:latest
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
+
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:base
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
+        depends_on:
+            - platform
+
+volumes:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local
+    solrindex-volume:
+        driver: local

nginx-ingress/entrypoint.sh

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [[ $ACS_PLATFORM_URL ]]; then
+  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_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

@@ -25,5 +25,28 @@ http {
         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;
+        }
+
+        location /alfresco/ {
+            proxy_pass http://platform:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
     }
 }