Merge branch 'acs-backend-enterprise' into ags-backend-enterprise

Merge branch 'ags-enterprise' into ags-backend-enterprise
Merge branch 'ags' into ags-enterprise
2021-04-02 09:14:39 -04:00 · 2021-04-02 09:14:38 -04:00 · 2021-04-02 09:14:31 -04:00 · 2021-04-02 09:14:31 -04:00 · 2021-04-02 09:13:57 -04:00 · 2021-04-02 09:13:56 -04:00
31 changed files with 66 additions and 311 deletions
@@ -1,16 +0,0 @@
-FROM alfresco/alfresco-content-repository-community:6.2.0-ga
-
-ARG USERNAME=alfresco
-ARG TOMCAT_DIR=/usr/local/tomcat
-
-USER root
-
-COPY catalina.policy /tmp/catalina.policy.ext
-COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.xml
-COPY *.amp ${TOMCAT_DIR}/amps/
-
-RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory && \
-	mkdir -p ${TOMCAT_DIR}/modules && \
-	cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
-
-USER ${USERNAME}
@@ -1,3 +0,0 @@
-## Usage
-
-Download all AMP files needed into this directory.  All of them will be copied into a new Docker image and installed into the Alfresco Platform web application.
@@ -1,4 +0,0 @@
-grant codeBase "file:${catalina.base}/modules/-" {
-    permission java.security.AllPermission;
-};
-
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Context>
-        <Resources>
-                <PreResources base="${catalina.base}/modules" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
-        </Resources>
-</Context>
-
@@ -1,3 +0,0 @@
-## Usage
-
-Download all JAR module files needed into this directory.  All of them will be dynamically loaded into the Docker container and loaded into the Alfresco Platform web application.
@@ -1,10 +0,0 @@
-FROM alfresco/alfresco-share:6.2.2
-
-ARG TOMCAT_DIR=/usr/local/tomcat
-
-COPY tomcat-share-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/share.xml
-COPY *.amp ${TOMCAT_DIR}/amps_share/
-
-RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory && \
-	mkdir -p ${TOMCAT_DIR}/modules
-
@@ -1,3 +0,0 @@
-## Usage
-
-Download all AMP files needed into this directory.  All of them will be copied into a new Docker image and installed into the Alfresco Share web application.
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Context>
-        <Resources>
-                <PreResources base="${catalina.base}/modules" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
-        </Resources>
-</Context>
-
@@ -1,3 +0,0 @@
-## Usage
-
-Download all JAR module files needed into this directory.  All of them will be dynamically loaded into the Docker container and loaded into the Alfresco Share web application.
@@ -5,8 +5,7 @@ version: "2"

 services:
    platform:
-        build: ./alfresco-content-repository/docker
-        image: local/alfresco-content-repository:6.2.0-ga
+        image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
        mem_limit: 1700m
        environment:
            JAVA_OPTS: "
@@ -18,25 +17,27 @@ services:
                -Dsolr.host=search
                -Dsolr.port=8983
                -Dsolr.secureComms=none
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
                -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
-                -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-                -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
-                -Djodconverter.url=http://transform-core-aio:8090/
-                -Dimg.url=http://transform-core-aio:8090/
-                -Dtika.url=http://transform-core-aio:8090/
-                -Dtransform.misc.url=http://transform-core-aio:8090/
                -Dcsrf.filter.enabled=false
                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80

-                -Dtransform.service.enabled=false
+                -Dtransform.service.enabled=true
+                -Dlocal.transform.service.enabled=false
+
+                -Dtransform.service.url=http://transform-router:8095
+                -Dsfs.url=http://shared-file-store:8099
+                -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
+                -Djodconverter.url=http://transform-engine-aio:8090
+                -Dimg.url=http://transform-engine-aio:8090
+                -Dtika.url=http://transform-engine-aio:8090
+                -Dtransform.misc.url=http://transform-engine-aio:8090
+
+                -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
                
                -Dsystem.content.eagerOrphanCleanup=true
                -Dsystem.content.orphanProtectDays=0
@@ -45,30 +46,33 @@ services:
        depends_on:
            - postgres-acs
            - activemq
+            - shared-file-store
        volumes:
-            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
+            - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
+    
+    transform-router:
+        image: quay.io/alfresco/alfresco-transform-router:1.3.1
+        environment:
+            ACTIVEMQ_URL: "nio://activemq:61616"
+            CORE_AIO_URL : "http://transform-core-aio:8090"
+            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
+        depends_on:
+            - activemq
+            - shared-file-store
    
    transform-core-aio:
        image: alfresco/alfresco-transform-core-aio:2.3.6
-    
-    share:
-        build: ./alfresco-share/docker
-        image: local/alfresco-share:6.2.2
-        mem_limit: 512m
        environment:
-            REPO_HOST: "platform"
-            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
-            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
-            JAVA_OPTS: "
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
-                -Dalfresco.host=${PROXY_HOST}
-                -Dalfresco.port=${PROXY_PORT}
-                -Dalfresco.protocol=${PROXY_PROTOCOL}
-                "
+            ACTIVEMQ_URL: "nio://activemq:61616"
+            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
+        depends_on:
+            - activemq
+            - shared-file-store
+
+    shared-file-store:
+        image: alfresco/alfresco-shared-file-store:0.10.0
        volumes:
-            - "./alfresco-share/modules:/usr/local/tomcat/modules:ro"
+            - shared-file-store-volume:/tmp/Alfresco/sfs
    
    postgres-acs:
        image: postgres:11.7
@@ -94,11 +98,36 @@ services:
        image: alfresco/alfresco-activemq:5.15.8
        mem_limit: 256m

+    sync:
+        image: quay.io/alfresco/service-sync:3.3.3.1
+        mem_limit: 512m
+        environment:
+            JAVA_OPTS : "
+                -Dsql.db.driver=org.postgresql.Driver
+                -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Dsql.db.username=alfresco
+                -Dsql.db.password=alfresco
+                -Dmessaging.broker.host=activemq
+                -Drepo.hostname=platform
+                -Drepo.port=8080
+                -Ddw.server.applicationConnectors[0].type=http
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+                "
+        depends_on:
+            - postgres-acs
+            - activemq
+
    proxy:
        build: ./nginx-ingress
-        image: local/nginx-ingress:acs-share
+        image: local/nginx-ingress:acs-sync
        ports:
            - 8080:8080
        depends_on:
            - platform
-            - share
+            - sync
+
+volumes:
+    shared-file-store-volume:
+        driver_opts:
+            type: tmpfs
+            device: tmpfs
@@ -1,16 +0,0 @@
-# Usage: .\download-jsconsole.ps1
-$THISDIR=$PSScriptRoot
-
-$GITHUB_TAG="v0.6.0-rc1"
-$MAVEN_VERSION="0.6.0"
-$BASEURL="https://github.com/share-extras/js-console/releases/download"
-
-$FILENAME="javascript-console-repo-${MAVEN_VERSION}.amp"
-$URL="${BASEURL}/${GITHUB_TAG}/${FILENAME}"
-$PATH="${THISDIR}/alfresco-content-repository/docker/${FILENAME}"
-Invoke-Expression "& '${THISDIR}\scripts\download-url.ps1' '${URL}' '${PATH}'"
-
-$FILENAME="javascript-console-share-${MAVEN_VERSION}.amp"
-$URL="${BASEURL}/${GITHUB_TAG}/${FILENAME}"
-$PATH="${THISDIR}/alfresco-share/docker/${FILENAME}"
-Invoke-Expression "& '${THISDIR}\scripts\download-url.ps1' '${URL}' '${PATH}'"
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Usage: ./download-jsconsole.sh
-THISDIR=`dirname "$(readlink -f "$0")"`
-
-GITHUB_TAG=v0.6.0-rc1
-MAVEN_VERSION=0.6.0
-BASEURL=https://github.com/share-extras/js-console/releases/download
-
-FILENAME=javascript-console-repo-${MAVEN_VERSION}.amp
-URL=${BASEURL}/${GITHUB_TAG}/${FILENAME}
-PATH=${THISDIR}/alfresco-content-repository/docker/${FILENAME}
-${THISDIR}/scripts/download-url.sh "${URL}" "${PATH}"
-
-FILENAME=javascript-console-share-${MAVEN_VERSION}.amp
-URL=${BASEURL}/${GITHUB_TAG}/${FILENAME}
-PATH=${THISDIR}/alfresco-share/docker/${FILENAME}
-${THISDIR}/scripts/download-url.sh "${URL}" "${PATH}"
@@ -4,8 +4,8 @@ if [[ $ACS_PLATFORM_URL ]]; then
  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi

-if [[ $ACS_SHARE_URL ]]; then
-  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
+if [[ $ACS_SYNC_URL ]]; then
+  sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
 fi

 if [[ $ACCESS_LOG ]]; then
@@ -48,12 +48,9 @@ http {
            # If using external proxy / load balancer (for initial redirect if no trailing slash)
            absolute_redirect off;
        }
-
-        location /share/ {
-            proxy_pass http://share:8080;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
+        
+        location /sync/ {
+            proxy_pass http://sync:9090/alfresco/;
        }
    }
 }
@@ -1,8 +0,0 @@
-REM Usage: .\download-maven-alfresco-private.bat org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
-@echo off
-set THISDIR_REL=%~dp0
-set THISDIR=%THISDIR_REL:~0,-1%
-
-set MAVEN_BASEURL=https://artifacts.alfresco.com/nexus/content/groups/private
-
-call "%THISDIR%\download-maven.bat" %MAVEN_BASEURL% %*
@@ -1,6 +0,0 @@
-# Usage: .\download-maven-alfresco-private.ps1 org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
-$THISDIR=$PSScriptRoot
-
-$MAVEN_BASEURL="https://artifacts.alfresco.com/nexus/content/groups/private"
-
-Invoke-Expression "& '${THISDIR}\download-maven.ps1' '${MAVEN_BASEURL}' $args"
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Usage: ./download-maven-alfresco-private.sh org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
-THISDIR=`dirname "$(readlink -f "$0")"`
-
-MAVEN_BASEDIR="https://artifacts.alfresco.com/nexus/content/groups/private"
-
-${THISDIR}/download-maven.sh "${MAVEN_BASEDIR}" $*
@@ -1,8 +0,0 @@
-REM Usage: .\download-maven-alfresco-public.bat org/maven/group/path maven-artifact-id 1.2.3 jar
-@echo off
-set THISDIR_REL=%~dp0
-set THISDIR=%THISDIR_REL:~0,-1%
-
-set MAVEN_BASEURL=https://artifacts.alfresco.com/nexus/content/groups/public
-
-call "%THISDIR%\download-maven.bat" %MAVEN_BASEURL% %*
@@ -1,6 +0,0 @@
-# Usage: .\download-maven-alfresco-public.ps1 org/maven/group/path maven-artifact-id 1.2.3 jar
-$THISDIR=$PSScriptRoot
-
-$MAVEN_BASEURL="https://artifacts.alfresco.com/nexus/content/groups/public"
-
-Invoke-Expression "& '${THISDIR}\download-maven.ps1' '${MAVEN_BASEURL}' $args"
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Usage: ./download-maven-alfresco-public.sh org/maven/group/path maven-artifact-id 1.2.3 jar
-THISDIR=`dirname "$(readlink -f "$0")"`
-
-MAVEN_BASEDIR="https://artifacts.alfresco.com/nexus/content/groups/public"
-
-${THISDIR}/download-maven.sh "${MAVEN_BASEDIR}" $*
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Usage: ./download-maven-inteligr8-private.sh org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
-THISDIR=`dirname "$(readlink -f "$0")"`
-
-MAVEN_BASEURL="http://repos.yateslong.us/nexus/repository/inteligr8"
-
-${THISDIR}/download-maven.sh "${MAVEN_BASEURL}" $*
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Usage: ./download-maven-inteligr8-public.sh org/maven/group/path maven-artifact-id 1.2.3 jar
-THISDIR=`dirname "$(readlink -f "$0")"`
-
-MAVEN_BASEURL="http://repos.yateslong.us/nexus/repositories/inteligr8-public"
-
-${THISDIR}/download-maven.sh "${MAVEN_BASEURL}" $*
@@ -1,18 +0,0 @@
-REM Usage: .\download-maven.bat https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar
-REM Usage: .\download-maven.bat https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
-@echo off
-set THISDIR_REL=%~dp0
-set THISDIR=%THISDIR_REL:~0,-1%
-
-set MAVEN_BASEURL=%1
-set MAVEN_GROUP_PATH=%2
-set MAVEN_ARTIFACT_ID=%3
-set MAVEN_ARTIFACT_VERSION=%4
-set MAVEN_PACKAGING=%5
-set HTTP_USERNAME=%6
-set HTTP_PASSWORD=%7
-
-set MAVEN_ARTIFACT_FILENAME=%MAVEN_ARTIFACT_ID%-%MAVEN_ARTIFACT_VERSION%.%MAVEN_PACKAGING%
-set MAVEN_URL=%MAVEN_BASEURL%/%MAVEN_GROUP_PATH%/%MAVEN_ARTIFACT_ID%/%MAVEN_ARTIFACT_VERSION%/%MAVEN_ARTIFACT_FILENAME%
-
-call "%THISDIR%\download-url.bat" %MAVEN_URL% %MAVEN_ARTIFACT_FILENAME% %HTTP_USERNAME% %HTTP_PASSWORD%
@@ -1,16 +0,0 @@
-# Usage: .\download-maven.ps1 https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar
-# Usage: .\download-maven.ps1 https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
-$THISDIR=$PSScriptRoot
-
-$MAVEN_BASEURL=$args[0]
-$MAVEN_GROUP_PATH=$args[1]
-$MAVEN_ARTIFACT_ID=$args[2]
-$MAVEN_ARTIFACT_VERSION=$args[3]
-$MAVEN_PACKAGING=$args[4]
-$HTTP_USERNAME=$args[5]
-$HTTP_PASSWORD=$args[6]
-
-$MAVEN_ARTIFACT_FILENAME="${MAVEN_ARTIFACT_ID}-${MAVEN_ARTIFACT_VERSION}.${MAVEN_PACKAGING}"
-$MAVEN_URL="${MAVEN_BASEURL}/${MAVEN_GROUP_PATH}/${MAVEN_ARTIFACT_ID}/${MAVEN_ARTIFACT_VERSION}/${MAVEN_ARTIFACT_FILENAME}"
-
-Invoke-Expression "& '${THISDIR}\download-url.ps1' '${MAVEN_URL}' '${MAVEN_ARTIFACT_FILENAME}' '${HTTP_USERNAME}' '${HTTP_PASSWORD}'"
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Usage: ./download-maven.sh https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar
-# Usage: ./download-maven.sh https://repo1.maven.org/maven2 org/maven/group/path maven-artifact-id 1.2.3 jar a_username a_password
-THISDIR=`dirname "$(readlink -f "$0")"`
-
-MAVEN_BASEURL=$1
-MAVEN_GROUP_PATH=$2
-MAVEN_ARTIFACT_ID=$3
-MAVEN_ARTIFACT_VERSION=$4
-MAVEN_PACKAGING=$5
-HTTP_USERNAME=$6
-HTTP_PASSWORD=$7
-
-MAVEN_ARTIFACT_FILENAME=${MAVEN_ARTIFACT_ID}-${MAVEN_ARTIFACT_VERSION}.${MAVEN_PACKAGING}
-MAVEN_URL=${MAVEN_BASEURL}/${MAVEN_GROUP_PATH}/${MAVEN_ARTIFACT_ID}/${MAVEN_ARTIFACT_VERSION}/${MAVEN_ARTIFACT_FILENAME}
-echo $MAVEN_URL
-
-${THISDIR}/download-url.sh "${MAVEN_URL}" "${MAVEN_ARTIFACT_FILENAME}" "${HTTP_USERNAME}" "${HTTP_PASSWORD}"
@@ -1,13 +0,0 @@
-REM Usage: .\download.bat https://www.a.url/to/download filename_for_downloaded.file
-REM Usage: .\download.bat https://www.a.url/to/download filename_for_downloaded.file a_username a_password
-@echo off
-set URL=%1
-set FILENAME=%2
-
-if NOT "%~3" == "" (
-    set USERNAME=%3
-    set PASSWORD=%4
-    curl -L -o %FILENAME% -u %USERNAME%:%PASSWORD% %URL%
-) else (
-    curl -L -o %FILENAME% %URL%
-)
@@ -1,16 +0,0 @@
-# Usage: .\download.ps1 https://www.a.url/to/download filename_for_downloaded.file
-# Usage: .\download.ps1 https://www.a.url/to/download filename_for_downloaded.file a_username a_password
-$URL=$args[0]
-$FILENAME=$args[1]
-
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-if ($args.count -gt 2) {
-    $USERNAME=$args[2]
-    $PASSWORD=$args[3]
-    
-    $AUTH_PAIR=[System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes("$($USERNAME):$($PASSWORD)"))
-    $AUTH_HEADERS=@{Authorization="Basic $AUTH_PAIR"}
-    Invoke-WebRequest -Uri "${URL}" -OutFile "${FILENAME}" -Headers ${AUTH_HEADERS}
-} else {
-    Invoke-WebRequest -Uri "${URL}" -OutFile "${FILENAME}"
-}
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Usage: ./download.sh https://www.a.url/to/download filename_for_downloaded.file
-# Usage: ./download.sh https://www.a.url/to/download filename_for_downloaded.file a_username a_password
-URL=$1
-FILENAME=$2
-
-if [ "$#" -gt 2 ]; then
-    USERNAME=$3
-    PASSWORD=$4
-    curl -L -o "${FILENAME}" -u "${USERNAME}:${PASSWORD}" ${URL}
-else
-    curl -L -o "${FILENAME}" ${URL}
-fi
@@ -1,11 +0,0 @@
-REM Usage: .\unpack.bat filename.zip
-REM Usage: .\unpack.bat filename.zip c:\
-@echo off
-set FILENAME=%1
-
-if NOT "%~2" == "" (
-    set DESTPATH=%2
-    powershell -command "Expand-Archive -Force -Path '%FILENAME%' -DestinationPath '%DESTPATH%'"
-) else (
-    powershell -command "Expand-Archive -Force -Path '%FILENAME%' -DestinationPath '%~dp0'"
-)
@@ -1,10 +0,0 @@
-# Usage: .\unpack.ps1 filename.zip
-# Usage: .\unpack.ps1 filename.zip c:\
-$FILENAME=$args[0]
-
-if ($args.count -gt 1) {
-    $DESTPATH=$args[1]
-    Expand-Archive -Force -Path "${FILENAME}" -DestinationPath "${DESTPATH}"
-} else {
-    Expand-Archive -Force -Path "${FILENAME}"
-}
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Usage: ./unpack.sh filename.zip
-# Usage: ./unpack.sh filename.zip /home/user
-FILENAME=$1
-
-if [ "$#" -gt 1 ]; then
-    DESTPATH=$2
-    unzip -d ${DESTPATH} ${FILENAME}
-else
-    unzip ${FILENAME}
-fi
Author	SHA1	Message	Date
brian	a50c3da468	Merge branch 'acs-backend-enterprise' into ags-backend-enterprise	2021-04-02 09:14:39 -04:00
brian	f8638e7a26	Merge branch 'ags-enterprise' into ags-backend-enterprise	2021-04-02 09:14:38 -04:00
brian	4d584785ff	Merge branch 'ags' into ags-enterprise	2021-04-02 09:14:31 -04:00
brian	96987b7ff1	Merge branch 'acs-enterprise' into ags-enterprise	2021-04-02 09:14:31 -04:00
brian	b6f2befafb	Merge branch 'acs-ats-enterprise' into acs-backend-enterprise	2021-04-02 09:13:57 -04:00
brian	c11990900c	Merge branch 'acs-sync-base' into acs-backend-enterprise	2021-04-02 09:13:56 -04:00
brian	e07cea5ffa	Merge branch 'acs-search' into acs-backend-enterprise	2021-04-02 09:13:54 -04:00
brian	6e09a9c0c9	Merge branch 'acs' into ags	2021-04-02 09:13:52 -04:00
brian	29f4ca7c54	Merge branch 'acs-ats-base' into acs-ats-enterprise	2021-04-02 09:13:50 -04:00
brian	73fea3d13d	Merge branch 'acs-enterprise' into acs-ats-enterprise	2021-04-02 09:13:49 -04:00
brian	910cc2e2cb	Merge branch 'acs' into acs-enterprise	2021-04-02 09:13:44 -04:00
brian	f10722dec9	Merge branch 'acs-base' into acs-sync-base	2021-04-02 09:13:22 -04:00
brian.long	39928d09fc	Merge branch 'ats-base' into acs-ats-base	2021-04-02 09:11:32 -04:00
brian.long	9859e68fe8	Merge branch 'acs-base' into acs-ats-base	2021-04-02 09:11:22 -04:00
brian.long	4dccd7892f	Merge branch 'base' into ats-base	2021-04-02 09:09:13 -04:00
brian	eaa6f1025d	Merge branch 'acs-backend-enterprise' into ags-backend-enterprise	2021-01-13 17:38:37 -05:00
brian.long	3b5fc8c096	fixed sync service config	2021-01-13 17:35:43 -05:00
brian.long	c9075398cd	Merge branch 'acs-backend-enterprise' into ags-backend-enterprise	2021-01-13 11:17:17 -05:00
brian.long	ac7e691100	Merge branch 'acs-sync-base' into acs-backend-enterprise	2021-01-13 11:09:18 -05:00
brian.long	15ccb5642b	using proxy values for sync url	2021-01-13 09:59:21 -05:00
brian.long	4349851dd9	Merge remote-tracking branch 'origin/acs-sync-base' into acs-backend-enterprise	2021-01-13 09:56:54 -05:00
brian.long	4f5a939b71	Merge remote-tracking branch 'origin/acs-backend-enterprise' into ags-backend-enterprise	2021-01-13 09:47:53 -05:00
brian.long	22b2583505	Merge branch 'acs-enterprise' into ags-enterprise	2021-01-13 09:45:50 -05:00
brian.long	9b3ba22ca1	Merge branch 'acs-search.acs' into acs-backend-enterprise.acs-search	2021-01-06 16:33:19 -05:00
brian.long	0999563353	Merge branch 'acs.acs-base' into ags.acs	2021-01-06 16:27:44 -05:00
brian.long	76dc8c7ad9	Merge branch 'acs-ats-base.acs-base' into acs-ats-enterprise.acs-ats-base	2021-01-06 16:22:31 -05:00
brian.long	b024fd8d7e	Merge branch 'ats-base.base' into acs-ats-base.ats-base	2021-01-06 16:21:36 -05:00
brian.long	8a36f91d06	Merge branch 'acs-base.proxy' into acs-ats-base.acs-base	2021-01-06 16:15:41 -05:00
brian.long	a56556b596	Merge branch 'acs-base.proxy' into acs-sync-base.acs-base	2021-01-06 15:54:27 -05:00
brian.long	d3b41dcc46	Merge branch 'base' into ats-base.base	2021-01-06 15:53:29 -05:00
brian.long	37de03317b	Merge branch 'acs-enterprise.acs-community' into acs-ats-enterprise.acs-enterprise	2021-01-06 15:40:03 -05:00
brian.long	dc9fb0abfa	added license dir	2021-01-06 15:39:29 -05:00
brian.long	68dc071342	configured ACS for ATS	2021-01-06 15:36:32 -05:00
brian.long	78ec9c2a94	Merge branch 'ats-base.base' into acs-ats-enterprise.ats-base	2021-01-06 15:25:16 -05:00
brian.long	cafee75cdc	set platform to v6.2.2.3	2021-01-06 15:21:05 -05:00
brian.long	295b0711b0	Merge branch 'acs-community.acs-base' into ags-community.acs-community	2021-01-06 12:24:10 -05:00
brian.long	bc6a8539f3	switched platform to AGS (not AMP module distributed anymore)	2021-01-06 10:24:47 -05:00
brian.long	b47583a716	Merge branch 'acs-base.proxy' into acs-ats-base.acs-base	2020-12-26 14:15:39 -05:00
brian.long	b1f3b14846	Merge branch 'acs-base.proxy' into acs-sync-base.acs-base	2020-12-25 23:37:08 -05:00
brian.long	04f44ef280	Merge branch 'acs-base.proxy' into acs-ats-base.acs-base	2020-12-25 23:32:53 -05:00
brian.long	ce9b143fb5	added ATS-only base config	2020-12-21 11:50:38 -05:00
brian.long	0b507962fa	added sync service config	2020-12-17 17:41:47 -05:00
brian.long	f73fdbb5ea	added volume to base shared file store config	2020-12-17 17:16:01 -05:00
brian.long	3b631bcd87	Merge branch 'acs-base.proxy' into acs-ats-base.acs-base	2020-12-17 16:29:45 -05:00
brian.long	d6f1c99c79	Merge branch 'acs-base.proxy' into acs-ats-base.acs-base	2020-12-17 16:25:37 -05:00
brian.long	6d35ffa551	Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base	2020-12-17 16:21:14 -05:00
brian.long	6c739c5795	Merge branch 'acs-base.acs-proxy' into acs-ats-base.acs-base	2020-12-17 16:18:18 -05:00
brian.long	487a677f6f	added service referencing variables	2020-12-17 12:48:48 -05:00
brian.long	0608045c1b	Merge branch 'acs-base.base' into acs-ats-base.acs-base	2020-12-17 12:46:35 -05:00
brian.long	79ef1f5868	added depends_on for ATS	2020-12-17 12:37:10 -05:00
brian.long	8c480402ed	Merge branch 'acs-base.base' into acs-ats-base.acs-base	2020-12-17 12:32:07 -05:00
brian.long	6858d201c2	Merge branch 'acs-base.base' into acs-ats-base.acs-base	2020-12-16 23:56:08 -05:00
brian.long	c1323a8171	added ATS minimum unconfigured services	2020-12-16 23:38:34 -05:00