[SCM] Samba Shared Repository - branch master updated
Noel Power
npower at samba.org
Fri Jan 28 10:23:01 UTC 2022
The branch, master has been updated
via 0eecfddd071 s3/rpc_server: install elasticsearch_mappings.json
from 36c861e25b1 printing/bgqd: Disable systemd notifications
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0eecfddd071ea54844c56516dd7adc761be03c27
Author: Ralph Boehme <slow at samba.org>
Date: Thu Jan 27 12:06:55 2022 +0100
s3/rpc_server: install elasticsearch_mappings.json
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 at samba.org>
Reviewed-by: Noel Power <npower at samba.org>
Autobuild-User(master): Noel Power <npower at samba.org>
Autobuild-Date(master): Fri Jan 28 10:22:31 UTC 2022 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/wscript_build | 3 +++
1 file changed, 3 insertions(+)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 04ff3424d47..83ceca2a45c 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -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='''
--
Samba Shared Repository
More information about the samba-cvs
mailing list