]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3/rpc_server: install elasticsearch_mappings.json
authorRalph Boehme <slow@samba.org>
Thu, 27 Jan 2022 11:06:55 +0000 (12:06 +0100)
committerNoel Power <npower@samba.org>
Fri, 28 Jan 2022 10:22:31 +0000 (10:22 +0000)
This was removed accidentally remvoed by
a7c65958a15149918415b7456d6f20ee8c9669d2 because the original code
only installed the json file if the mdssvc was built as module:

     if bld.SAMBA3_IS_ENABLED_MODULE('rpc_mdssvc_module'):
         bld.INSTALL_FILES(bld.env.SAMBA_DATADIR,
                           'mdssvc/elasticsearch_mappings.json')

Installing the json file should just depend on Elasticsearch support
being enabled, regardless of the removed module support.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14961

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Fri Jan 28 10:22:31 UTC 2022 on sn-devel-184

source3/rpc_server/wscript_build

index 04ff3424d475bcee7ac912404543a66d8a630b0d..83ceca2a45ca8457f41c15823cabe2182317c674 100644 (file)
@@ -250,6 +250,9 @@ if bld.env.spotlight_backend_es:
                           '''
     rpc_mdssvc_deps += ' http jansson'
 
+    bld.INSTALL_FILES(bld.env.SAMBA_DATADIR,
+                      'mdssvc/elasticsearch_mappings.json')
+
 bld.SAMBA3_BINARY('rpcd_mdssvc',
                   source='rpcd_mdssvc.c ' + rpc_mdssvc_sources,
                   deps='''