Merge pull request #181 from humanmade/es-packages

Add ES package support

Author: roborourke

docker/docker-compose.yml

@@ -137,6 +137,7 @@ services:
     mem_limit: ${ES_MEM_LIMIT:-1g}
     volumes:
       - es-data:/usr/share/elasticsearch/data
+      - ${VOLUME}/content/uploads/es-packages:/usr/share/elasticsearch/config/packages
     ports:
       - "9200"
     networks:
@@ -188,6 +189,7 @@ services:
       - "traefik.frontend.rule=HostRegexp:s3-${COMPOSE_PROJECT_NAME:-default}.altis.dev"
   s3-sync-to-host:
     image: minio/mc:RELEASE.2020-03-14T01-23-37Z
+    restart: unless-stopped
     depends_on:
       - s3
     volumes:
@@ -199,7 +201,7 @@ services:
       /bin/sh -c "
       mc mb -p local/s3-${COMPOSE_PROJECT_NAME:-default}
       && mc policy set public local/s3-${COMPOSE_PROJECT_NAME:-default}
-      && mc mirror --watch local/s3-${COMPOSE_PROJECT_NAME:-default} /content"
+      && mc mirror --watch --overwrite local/s3-${COMPOSE_PROJECT_NAME:-default} /content"
   tachyon:
     image: humanmade/tachyon:2.3.0
     ports:

inc/namespace.php

@@ -26,7 +26,7 @@ function bootstrap() {
 		define( 'S3_UPLOADS_BUCKET_URL', getenv( 'S3_UPLOADS_BUCKET_URL' ) );
 
 		add_filter( 's3_uploads_s3_client_params', function ( $params ) {
-			if ( defined( 'S3_UPLOADS_ENDPOINT' ) ) {
+			if ( defined( 'S3_UPLOADS_ENDPOINT' ) && S3_UPLOADS_ENDPOINT ) {
 				$params['endpoint'] = S3_UPLOADS_ENDPOINT;
 			}
 			return $params;
@@ -83,6 +83,10 @@ function bootstrap() {
 	}
 
 	add_filter( 'qm/output/file_path_map', __NAMESPACE__ . '\\set_file_path_map', 1 );
+
+	// Filter ES package IDs for local.
+	add_filter( 'altis.search.packages_dir', __NAMESPACE__ . '\\set_search_packages_dir' );
+	add_filter( 'altis.search.create_package_id', __NAMESPACE__ . '\\set_search_package_id', 10, 3 );
 }
 
 /**
@@ -122,3 +126,27 @@ function tools_submenus() {
 		add_management_page( $link['label'], $link['label'], 'manage_options', $link['url'] );
 	}
 }
+
+/**
+ * Override Elasticsearch package storage location to es-packages volume.
+ *
+ * This directory is shared with the Elasticsearch container.
+ *
+ * @return string
+ */
+function set_search_packages_dir() : string {
+	return sprintf( 's3://%s/uploads/es-packages', S3_UPLOADS_BUCKET );
+}
+
+/**
+ * Override the derived ES package file name for local server.
+ *
+ * @param string|null $id The package ID used for the file path in ES.
+ * @param string $slug The package slug.
+ * @param string $file The package file path on S3.
+ * @return string|null
+ */
+function set_search_package_id( $id, string $slug, string $file ) : ?string {
+	$id = sprintf( 'packages/%s', basename( $file ) );
+	return $id;
+}