From 73a8bf44cf694a0d52b52633a54b3b6474b38049 Mon Sep 17 00:00:00 2001 From: Marcel Clausen Date: Thu, 8 Sep 2022 21:00:15 +0200 Subject: [PATCH 1/9] first try with manticore --- Dockerfile | 13 +- Makefile | 12 +- README.md | 4 +- conf/00_db.conf.part | 23 +- conf/bafu.conf.part | 128 +++++----- conf/bod.conf.part | 10 +- conf/dritte.conf.part | 6 +- conf/edi.conf.part | 14 +- conf/evd.conf.part | 44 ++-- conf/kogis.conf.part | 4 +- conf/lubis.conf.part | 16 +- conf/search.conf.part | 479 ----------------------------------- conf/stopo.conf.part | 96 +++---- conf/uvek.conf.part | 186 +++++++------- conf/vbs.conf.part | 18 +- dev_sphinx.env | 30 +++ docker-compose.yml | 27 ++ scripts/docker-cmd.sh | 6 +- scripts/docker-entry.sh | 14 +- scripts/index-sync-rotate.sh | 4 +- 20 files changed, 356 insertions(+), 778 deletions(-) delete mode 100644 conf/search.conf.part create mode 100644 dev_sphinx.env create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index 34c7d74d..cdb3a0d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,10 @@ -FROM python:3.9.9-slim-buster as sphinxsearch_base +FROM manticoresearch/manticore:5.0.2 as manticore_base RUN apt-get update && \ apt-get install -y \ cron \ - default-mysql-client \ - gettext-base \ gosu \ - procps \ rsync \ - sphinxsearch && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ gosu nobody true && \ @@ -23,8 +19,9 @@ FROM sphinxsearch_base as sphinxsearch_geodata RUN groupadd -r geodata -g 2500 && \ useradd -u 2500 -r -g geodata -s /sbin/nologin --create-home geodata && \ # create mountpoint folders with geodata ownership - install -o geodata -g geodata -d /var/lib/sphinxsearch/data/index/ && \ - install -o geodata -p geodata -d /var/lib/sphinxsearch/data/index_efs/ && \ + install -o geodata -g geodata -d /var/lib/manticore/data/index/ && \ + install -o geodata -p geodata -d /var/lib/manticore/data/index_efs/ && \ + install -o geodata -p geodata -d /var/lib/container_probes/ && \ # TODO: redirect logs to stdout # only working if container is running as root # ln -sv /dev/stdout /var/log/sphinxsearch/query.log && \ # ln -sv /dev/stdout /var/log/sphinxsearch/searchd.log && \ @@ -42,6 +39,8 @@ FROM sphinxsearch_geodata COPY --chown=geodata:geodata scripts/docker-* scripts/index-sync-rotate.sh scripts/pg2sphinx_trigger.py scripts/checker.sh / COPY --chown=geodata:geodata conf /conf/ +USER geodata + # default CMD ENTRYPOINT [ "/docker-entry.sh" ] # run service with the following script if no CMDs are sent to docker run / default diff --git a/Makefile b/Makefile index 0251e9b7..0e63cd9f 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ PPID := $(shell echo $$PPID) export DOCKER_EXEC := docker run \ --rm \ -t \ - -v $(SPHINX_EFS):/var/lib/sphinxsearch/data/index/ \ + -v $(SPHINX_EFS):/var/lib/manticore/data/index/ \ --env-file $(ENV_FILE) \ --name $(DOCKER_LOCAL_TAG)_maintenance_$(PPID)\ $(DOCKER_IMG_LOCAL_TAG) @@ -87,7 +87,7 @@ export DOCKER_EXEC := docker run \ export DOCKER_EXEC_LOCAL := docker run \ --rm \ -t \ - -v $(CURRENT_DIR)/conf/:/var/lib/sphinxsearch/data/index/ \ + -v $(CURRENT_DIR)/conf/:/var/lib/manticore/data/index/ \ --env-file $(ENV_FILE) \ --name $(DOCKER_LOCAL_TAG)_maintenance_$(PPID) \ $(DOCKER_IMG_LOCAL_TAG) @@ -289,8 +289,8 @@ dockerrun: dockerbuild sphinx_efs --restart=always \ -d \ -p $(SPHINX_PORT):$(SPHINX_PORT) \ - -v $(SPHINX_EFS):/var/lib/sphinxsearch/data/index_efs/ \ - -v ${DOCKER_INDEX_VOLUME}:/var/lib/sphinxsearch/data/index/ \ + -v $(SPHINX_EFS):/var/lib/manticore/data/index_efs/ \ + -v ${DOCKER_INDEX_VOLUME}:/var/lib/manticore/data/index/ \ --env-file $(ENV_FILE) \ --name $(DOCKER_LOCAL_TAG) \ $(DOCKER_IMG_LOCAL_TAG) @@ -302,8 +302,8 @@ dockerrundebug: dockerbuild sphinx_efs --rm \ -it \ -p $(SPHINX_PORT):$(SPHINX_PORT) \ - -v $(SPHINX_EFS):/var/lib/sphinxsearch/data/index_efs/ \ - -v ${DOCKER_INDEX_VOLUME}:/var/lib/sphinxsearch/data/index/ \ + -v $(SPHINX_EFS):/var/lib/manticore/data/index_efs/ \ + -v ${DOCKER_INDEX_VOLUME}:/var/lib/manticore/data/index/ \ --env-file $(ENV_FILE) \ --name $(DOCKER_LOCAL_TAG) \ $(DOCKER_IMG_LOCAL_TAG) diff --git a/README.md b/README.md index 6c587a1d..52ef653c 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Object | Path **PID:** | /var/run/sphinxsearch.pid | **Searchd Log** | /var/log/sphinxsearch/searchd.log | **Query Log:** | /var/log/sphinxsearch/query.log | -**Indexes:** | /var/lib/sphinxsearch/data/index/ | +**Indexes:** | /var/lib/manticore/data/index/ | **Configuration:**| /etc/sphinxsearch/sphinx.conf | ### Search Daemon: @@ -167,6 +167,6 @@ $ make deploy-int-config db=zeitreihen You can use this command to synchronize the remote sphinx config with the remote indices: * create all the missing indexes * remove orphaned indexes -The sphinx configuration will not be deployed. The command can be used with integration or production: +The sphinx configuration will not be deployed. The command can be used with integration or production: * ``$ make deploy-int-clean_index`` * ``$ make deploy-prod-clean_index`` diff --git a/conf/00_db.conf.part b/conf/00_db.conf.part index 78ac52f2..7d447347 100644 --- a/conf/00_db.conf.part +++ b/conf/00_db.conf.part @@ -36,20 +36,23 @@ indexer searchd { - listen = $SPHINX_PORT + listen = 9312 + listen = 9306:mysql41 + listen = /var/run/mysqld/mysqld.sock:mysql41 + listen = 127.0.0.1:9312 + listen = 9308:http # syslog -> logstash -> kibana - log = /var/log/sphinxsearch/searchd.log + #log = /var/log/sphinxsearch/searchd.log # syslog -> logstash -> kibana - query_log = /var/log/sphinxsearch/query.log - pid_file = /var/run/sphinxsearch/searchd.pid + #query_log = /var/log/sphinxsearch/query.log + #pid_file = /var/run/sphinxsearch/searchd.pid + pid_file = manticoresearch.pid # mysql listener listen = localhost:9306:mysql41 preopen_indexes = 0 - # dist_threads should be number of cpus/cores - dist_threads = $CPUS - read_timeout = 5 - max_children = 50 + # max_threads_per_query should be number of cpus/cores + max_threads_per_query = 8 + network_timeout = 5 binlog_path = watchdog = 1 - ondisk_attrs_default = 1 -} +} \ No newline at end of file diff --git a/conf/bafu.conf.part b/conf/bafu.conf.part index 4ec3d0e3..be21e2c0 100644 --- a/conf/bafu.conf.part +++ b/conf/bafu.conf.part @@ -1162,7 +1162,7 @@ index ch_bafu_hydrologie_wassertemperaturmessstationen type = plain dict=crc source = src_ch_bafu_hydrologie_wassertemperaturmessstationen - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_wassertemperaturmessstationen + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_wassertemperaturmessstationen min_infix_len = 2 expand_keywords = 1 } @@ -1170,376 +1170,376 @@ index ch_bafu_hydrologie_wassertemperaturmessstationen index ch_bafu_alpweiden_herdenschutzhunde : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_alpweiden_herdenschutzhunde - path = /var/lib/sphinxsearch/data/index/ch_bafu_alpweiden_herdenschutzhunde + path = /var/lib/manticore/data/index/ch_bafu_alpweiden_herdenschutzhunde } index ch_bafu_karst_einzugsgebiete : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_karst_einzugsgebiete - path = /var/lib/sphinxsearch/data/index/ch_bafu_karst_einzugsgebiete + path = /var/lib/manticore/data/index/ch_bafu_karst_einzugsgebiete } index ch_bafu_karst_unterirdische_fliesswege : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_karst_unterirdische_fliesswege - path = /var/lib/sphinxsearch/data/index/ch_bafu_karst_unterirdische_fliesswege + path = /var/lib/manticore/data/index/ch_bafu_karst_unterirdische_fliesswege } index ch_bafu_karst_einzugsgebietseinheiten : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_karst_einzugsgebietseinheiten - path = /var/lib/sphinxsearch/data/index/ch_bafu_karst_einzugsgebietseinheiten + path = /var/lib/manticore/data/index/ch_bafu_karst_einzugsgebietseinheiten } index ch_bafu_karst_ausdehnung_grundwasservorkommen : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_karst_ausdehnung_grundwasservorkommen - path = /var/lib/sphinxsearch/data/index/ch_bafu_karst_ausdehnung_grundwasservorkommen + path = /var/lib/manticore/data/index/ch_bafu_karst_ausdehnung_grundwasservorkommen } index ch_bafu_bundesinventare_bln : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_bln - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_bln + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_bln } index ch_bafu_karst_quellen_schwinden : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_karst_quellen_schwinden - path = /var/lib/sphinxsearch/data/index/ch_bafu_karst_quellen_schwinden + path = /var/lib/manticore/data/index/ch_bafu_karst_quellen_schwinden } index ch_bafu_wrz_wildruhezonen_portal : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_wrz_wildruhezonen_portal - path = /var/lib/sphinxsearch/data/index/ch_bafu_wrz_wildruhezonen_portal + path = /var/lib/manticore/data/index/ch_bafu_wrz_wildruhezonen_portal } index ch_bafu_wrz_jagdbanngebiete_select : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_wrz_jagdbanngebiete_select - path = /var/lib/sphinxsearch/data/index/ch_bafu_wrz_jagdbanngebiete_select + path = /var/lib/manticore/data/index/ch_bafu_wrz_jagdbanngebiete_select } index ch_bafu_gewaesserschutz_klaeranlagen_anteilq347 : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_gewaesserschutz_klaeranlagen_anteilq347 - path = /var/lib/sphinxsearch/data/index/ch_bafu_gewaesserschutz_klaeranlagen_anteilq347 + path = /var/lib/manticore/data/index/ch_bafu_gewaesserschutz_klaeranlagen_anteilq347 } index ch_bafu_gewaesserschutz_klaeranlagen_ausbaugroesse : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_gewaesserschutz_klaeranlagen_ausbaugroesse - path = /var/lib/sphinxsearch/data/index/ch_bafu_gewaesserschutz_klaeranlagen_ausbaugroesse + path = /var/lib/manticore/data/index/ch_bafu_gewaesserschutz_klaeranlagen_ausbaugroesse } index ch_bafu_gewaesserschutz_klaeranlagen_reinigungstyp : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_gewaesserschutz_klaeranlagen_reinigungstyp - path = /var/lib/sphinxsearch/data/index/ch_bafu_gewaesserschutz_klaeranlagen_reinigungstyp + path = /var/lib/manticore/data/index/ch_bafu_gewaesserschutz_klaeranlagen_reinigungstyp } index ch_bafu_vec25_gewaessernetz_2000 : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_vec25_gewaessernetz_2000 - path = /var/lib/sphinxsearch/data/index/ch_bafu_vec25_gewaessernetz_2000 + path = /var/lib/manticore/data/index/ch_bafu_vec25_gewaessernetz_2000 } index ch_bafu_vec25_seen : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_vec25_seen - path = /var/lib/sphinxsearch/data/index/ch_bafu_vec25_seen + path = /var/lib/manticore/data/index/ch_bafu_vec25_seen } index ch_bafu_hydrologischer_atlas_flussgebiete : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologischer_atlas_flussgebiete - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologischer_atlas_flussgebiete + path = /var/lib/manticore/data/index/ch_bafu_hydrologischer_atlas_flussgebiete } index ch_bafu_hydrologischer_atlas_bilanzgebiete : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologischer_atlas_bilanzgebiete - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologischer_atlas_bilanzgebiete + path = /var/lib/manticore/data/index/ch_bafu_hydrologischer_atlas_bilanzgebiete } index ch_bafu_hydrologischer_atlas_basisgebiete : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologischer_atlas_basisgebiete - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologischer_atlas_basisgebiete + path = /var/lib/manticore/data/index/ch_bafu_hydrologischer_atlas_basisgebiete } index ch_bafu_hydrologie_gewaesserzustandsmessstationen : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologie_gewaesserzustandsmessstationen - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_gewaesserzustandsmessstationen + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_gewaesserzustandsmessstationen } index ch_bafu_hydrologie_q347 : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologie_q347 - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_q347 + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_q347 } index ch_bafu_wasser_teileinzugsgebiete_2 : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_wasser_teileinzugsgebiete_2 - path = /var/lib/sphinxsearch/data/index/ch_bafu_wasser_teileinzugsgebiete_2 + path = /var/lib/manticore/data/index/ch_bafu_wasser_teileinzugsgebiete_2 } index ch_bafu_hydrologie_niedrigwasserstatistik : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologie_niedrigwasserstatistik - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_niedrigwasserstatistik + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_niedrigwasserstatistik } index ch_bafu_typisierung_fliessgewaesser : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_typisierung_fliessgewaesser - path = /var/lib/sphinxsearch/data/index/ch_bafu_typisierung_fliessgewaesser + path = /var/lib/manticore/data/index/ch_bafu_typisierung_fliessgewaesser } index ch_bafu_bundesinventare_auen : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_auen - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_auen + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_auen } index ch_bafu_bundesinventare_auen_anhang2 : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_auen_anhang2 - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_auen_anhang2 + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_auen_anhang2 } index ch_bafu_bundesinventare_auen_vegetation_alpin : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_auen_vegetation_alpin - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_auen_vegetation_alpin + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_auen_vegetation_alpin } index ch_bafu_bundesinventare_amphibien : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_amphibien - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_amphibien + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_amphibien } index ch_bafu_bundesinventare_amphibien_anhang4 : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_amphibien_anhang4 - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_amphibien_anhang4 + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_amphibien_anhang4 } index ch_bafu_bundesinventare_amphibien_wanderobjekte : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_amphibien_wanderobjekte - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_amphibien_wanderobjekte + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_amphibien_wanderobjekte } index ch_bafu_amphibienwanderung_verkehrskonflikte : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_amphibienwanderung_verkehrskonflikte - path = /var/lib/sphinxsearch/data/index/ch_bafu_amphibienwanderung_verkehrskonflikte + path = /var/lib/manticore/data/index/ch_bafu_amphibienwanderung_verkehrskonflikte } index ch_bafu_bundesinventare_flachmoore : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_flachmoore - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_flachmoore + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_flachmoore } index ch_bafu_bundesinventare_hochmoore : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_hochmoore - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_hochmoore + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_hochmoore } index ch_bafu_bundesinventare_moorlandschaften : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_moorlandschaften - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_moorlandschaften + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_moorlandschaften } index ch_bafu_bundesinventare_trockenwiesen_trockenweiden : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_trockenwiesen_trockenweiden - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_trockenwiesen_trockenweiden + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_trockenwiesen_trockenweiden } index ch_bafu_bundesinventare_trockenwiesen_trockenweiden_anhang2 : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_trockenwiesen_trockenweiden_anhang2 - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_trockenwiesen_trockenweiden_anhang2 + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_trockenwiesen_trockenweiden_anhang2 } index ch_bafu_waldreservate : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_waldreservate - path = /var/lib/sphinxsearch/data/index/ch_bafu_waldreservate + path = /var/lib/manticore/data/index/ch_bafu_waldreservate } index ch_bafu_hydrologie_untersuchungsgebiete_stationen : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologie_untersuchungsgebiete_stationen - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_untersuchungsgebiete_stationen + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_untersuchungsgebiete_stationen } index ch_bafu_hydrologie_untersuchungsgebiete : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologie_untersuchungsgebiete - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_untersuchungsgebiete + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_untersuchungsgebiete } index ch_bafu_hydrologie_hochwassergrenzwertpegel : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologie_hochwassergrenzwertpegel - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_hochwassergrenzwertpegel + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_hochwassergrenzwertpegel } index ch_bafu_hydrologischer_atlas_kantonale_messstationen : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologischer_atlas_kantonale_messstationen - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologischer_atlas_kantonale_messstationen + path = /var/lib/manticore/data/index/ch_bafu_hydrologischer_atlas_kantonale_messstationen } index ch_bafu_hydrologie_daueruntersuchung_fliessgewaesser : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologie_daueruntersuchung_fliessgewaesser - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_daueruntersuchung_fliessgewaesser + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_daueruntersuchung_fliessgewaesser } index ch_bafu_gewaesserschutz_badewasserqualitaet : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_gewaesserschutz_badewasserqualitaet - path = /var/lib/sphinxsearch/data/index/ch_bafu_gewaesserschutz_badewasserqualitaet + path = /var/lib/manticore/data/index/ch_bafu_gewaesserschutz_badewasserqualitaet } index ch_bafu_strukturguete_hochrhein_sohle : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_strukturguete_hochrhein_sohle - path = /var/lib/sphinxsearch/data/index/ch_bafu_strukturguete_hochrhein_sohle + path = /var/lib/manticore/data/index/ch_bafu_strukturguete_hochrhein_sohle } index ch_bafu_strukturguete_hochrhein_linkesufer : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_strukturguete_hochrhein_linkesufer - path = /var/lib/sphinxsearch/data/index/ch_bafu_strukturguete_hochrhein_linkesufer + path = /var/lib/manticore/data/index/ch_bafu_strukturguete_hochrhein_linkesufer } index ch_bafu_strukturguete_hochrhein_linkesumfeld : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_strukturguete_hochrhein_linkesumfeld - path = /var/lib/sphinxsearch/data/index/ch_bafu_strukturguete_hochrhein_linkesumfeld + path = /var/lib/manticore/data/index/ch_bafu_strukturguete_hochrhein_linkesumfeld } index ch_bafu_strukturguete_hochrhein_rechtesumfeld : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_strukturguete_hochrhein_rechtesumfeld - path = /var/lib/sphinxsearch/data/index/ch_bafu_strukturguete_hochrhein_rechtesumfeld + path = /var/lib/manticore/data/index/ch_bafu_strukturguete_hochrhein_rechtesumfeld } index ch_bafu_strukturguete_hochrhein_rechtesufer : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_strukturguete_hochrhein_rechtesufer - path = /var/lib/sphinxsearch/data/index/ch_bafu_strukturguete_hochrhein_rechtesufer + path = /var/lib/manticore/data/index/ch_bafu_strukturguete_hochrhein_rechtesufer } index ch_bafu_mittlere_abfluesse : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_mittlere_abfluesse - path = /var/lib/sphinxsearch/data/index/ch_bafu_mittlere_abfluesse + path = /var/lib/manticore/data/index/ch_bafu_mittlere_abfluesse } index ch_bafu_mittlere_abfluesse_zukunft : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_mittlere_abfluesse_zukunft - path = /var/lib/sphinxsearch/data/index/ch_bafu_mittlere_abfluesse_zukunft + path = /var/lib/manticore/data/index/ch_bafu_mittlere_abfluesse_zukunft } index ch_bafu_feststoffe_geschiebemessnetz : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_feststoffe_geschiebemessnetz - path = /var/lib/sphinxsearch/data/index/ch_bafu_feststoffe_geschiebemessnetz + path = /var/lib/manticore/data/index/ch_bafu_feststoffe_geschiebemessnetz } index ch_bafu_hydrologie_hochwasserstatistik : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologie_hochwasserstatistik - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_hochwasserstatistik + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_hochwasserstatistik } index ch_bafu_auen_vegetationskarten : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_auen_vegetationskarten - path = /var/lib/sphinxsearch/data/index/ch_bafu_auen_vegetationskarten + path = /var/lib/manticore/data/index/ch_bafu_auen_vegetationskarten } index ch_bafu_schutzgebiete_paerke_nationaler_bedeutung : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_schutzgebiete_paerke_nationaler_bedeutung - path = /var/lib/sphinxsearch/data/index/ch_bafu_schutzgebiete_paerke_nationaler_bedeutung + path = /var/lib/manticore/data/index/ch_bafu_schutzgebiete_paerke_nationaler_bedeutung } index ch_bafu_schutzgebiete_paerke_nationaler_bedeutung_perimeter : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_schutzgebiete_paerke_nationaler_bedeutung_perimeter - path = /var/lib/sphinxsearch/data/index/ch_bafu_schutzgebiete_paerke_nationaler_bedeutung_perimeter + path = /var/lib/manticore/data/index/ch_bafu_schutzgebiete_paerke_nationaler_bedeutung_perimeter } index ch_bafu_hydrogeologie_markierversuche : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrogeologie_markierversuche - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrogeologie_markierversuche + path = /var/lib/manticore/data/index/ch_bafu_hydrogeologie_markierversuche } index ch_bafu_bundesinventare_vogelreservate : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_bundesinventare_vogelreservate - path = /var/lib/sphinxsearch/data/index/ch_bafu_bundesinventare_vogelreservate + path = /var/lib/manticore/data/index/ch_bafu_bundesinventare_vogelreservate } index ch_bafu_grundwasserkoerper : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_grundwasserkoerper - path = /var/lib/sphinxsearch/data/index/ch_bafu_grundwasserkoerper + path = /var/lib/manticore/data/index/ch_bafu_grundwasserkoerper } index ch_bafu_fauna_wildtierkorridor_national : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_fauna_wildtierkorridor_national - path = /var/lib/sphinxsearch/data/index/ch_bafu_fauna_wildtierkorridor_national + path = /var/lib/manticore/data/index/ch_bafu_fauna_wildtierkorridor_national } index ch_bafu_auen_ausserhalb_bundesinventar : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_auen_ausserhalb_bundesinventar - path = /var/lib/sphinxsearch/data/index/ch_bafu_auen_ausserhalb_bundesinventar + path = /var/lib/manticore/data/index/ch_bafu_auen_ausserhalb_bundesinventar } index ch_bafu_auen_ausserhalb_bundesinventar_alpin : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_auen_ausserhalb_bundesinventar_alpin - path = /var/lib/sphinxsearch/data/index/ch_bafu_auen_ausserhalb_bundesinventar_alpin + path = /var/lib/manticore/data/index/ch_bafu_auen_ausserhalb_bundesinventar_alpin } index ch_bafu_wasser_vorfluter : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_wasser_vorfluter - path = /var/lib/sphinxsearch/data/index/ch_bafu_wasser_vorfluter + path = /var/lib/manticore/data/index/ch_bafu_wasser_vorfluter } index ch_bafu_wasser_gebietsauslaesse : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_wasser_gebietsauslaesse - path = /var/lib/sphinxsearch/data/index/ch_bafu_wasser_gebietsauslaesse + path = /var/lib/manticore/data/index/ch_bafu_wasser_gebietsauslaesse } index ch_bafu_hydrologie_hydromessstationen : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_hydrologie_hydromessstationen - path = /var/lib/sphinxsearch/data/index/ch_bafu_hydrologie_hydromessstationen + path = /var/lib/manticore/data/index/ch_bafu_hydrologie_hydromessstationen } index ch_bafu_gefahren_gefaehrdungszonen : ch_bafu_hydrologie_wassertemperaturmessstationen { source = src_ch_bafu_gefahren_gefaehrdungszonen - path = /var/lib/sphinxsearch/data/index/ch_bafu_gefahren_gefaehrdungszonen + path = /var/lib/manticore/data/index/ch_bafu_gefahren_gefaehrdungszonen } diff --git a/conf/bod.conf.part b/conf/bod.conf.part index 93a9f0da..37e1c01d 100644 --- a/conf/bod.conf.part +++ b/conf/bod.conf.part @@ -117,30 +117,30 @@ index layers index layers_de : layers { source = src_layers_de - path = /var/lib/sphinxsearch/data/index/layers_de + path = /var/lib/manticore/data/index/layers_de preopen = 1 } index layers_fr : layers { source = src_layers_fr - path = /var/lib/sphinxsearch/data/index/layers_fr + path = /var/lib/manticore/data/index/layers_fr } index layers_en : layers { source = src_layers_en - path = /var/lib/sphinxsearch/data/index/layers_en + path = /var/lib/manticore/data/index/layers_en } index layers_it : layers { source = src_layers_it - path = /var/lib/sphinxsearch/data/index/layers_it + path = /var/lib/manticore/data/index/layers_it } index layers_rm : layers { source = src_layers_rm - path = /var/lib/sphinxsearch/data/index/layers_rm + path = /var/lib/manticore/data/index/layers_rm } diff --git a/conf/dritte.conf.part b/conf/dritte.conf.part index 519a071f..0b5ff0a9 100644 --- a/conf/dritte.conf.part +++ b/conf/dritte.conf.part @@ -61,7 +61,7 @@ index ch_pronatura_waldreservate type = plain dict=crc source = src_ch_pronatura_waldreservate - path = /var/lib/sphinxsearch/data/index/ch_pronatura_waldreservate + path = /var/lib/manticore/data/index/ch_pronatura_waldreservate min_infix_len = 2 expand_keywords = 1 } @@ -70,13 +70,13 @@ index ch_pronatura_waldreservate index ch_sem_sachplan_asyl_anhoerung : ch_pronatura_waldreservate { source = src_ch_sem_sachplan_asyl_anhoerung - path = /var/lib/sphinxsearch/data/index/ch_sem_sachplan_asyl_anhoerung + path = /var/lib/manticore/data/index/ch_sem_sachplan_asyl_anhoerung } index ch_sem_sachplan_asyl_kraft : ch_pronatura_waldreservate { source = src_ch_sem_sachplan_asyl_kraft - path = /var/lib/sphinxsearch/data/index/ch_sem_sachplan_asyl_kraft + path = /var/lib/manticore/data/index/ch_sem_sachplan_asyl_kraft } diff --git a/conf/edi.conf.part b/conf/edi.conf.part index a0328df7..bd9a4b3d 100644 --- a/conf/edi.conf.part +++ b/conf/edi.conf.part @@ -144,7 +144,7 @@ index ch_bfs_generalisierte_grenzen_agglomerationen_g1 type = plain dict=crc source = src_ch_bfs_generalisierte_grenzen_agglomerationen_g1 - path = /var/lib/sphinxsearch/data/index/ch_bfs_generalisierte_grenzen_agglomerationen_g1 + path = /var/lib/manticore/data/index/ch_bfs_generalisierte_grenzen_agglomerationen_g1 min_infix_len = 2 expand_keywords = 1 } @@ -152,37 +152,37 @@ index ch_bfs_generalisierte_grenzen_agglomerationen_g1 index ch_bfs_generalisierte_grenzen_agglomerationen_g2 : ch_bfs_generalisierte_grenzen_agglomerationen_g1 { source = src_ch_bfs_generalisierte_grenzen_agglomerationen_g2 - path = /var/lib/sphinxsearch/data/index/ch_bfs_generalisierte_grenzen_agglomerationen_g2 + path = /var/lib/manticore/data/index/ch_bfs_generalisierte_grenzen_agglomerationen_g2 } index ch_bfs_landschaftswandel : ch_bfs_generalisierte_grenzen_agglomerationen_g1 { source = src_ch_bfs_landschaftswandel - path = /var/lib/sphinxsearch/data/index/ch_bfs_landschaftswandel + path = /var/lib/manticore/data/index/ch_bfs_landschaftswandel } index ch_bfs_gebaeude_wohnungs_register : ch_bfs_generalisierte_grenzen_agglomerationen_g1 { min_infix_len = 1 source = src_ch_bfs_gebaeude_wohnungs_register - path = /var/lib/sphinxsearch/data/index/ch_bfs_gebaeude_wohnungs_register + path = /var/lib/manticore/data/index/ch_bfs_gebaeude_wohnungs_register ondisk_attrs = 0 } index ch_bak_bundesinventar_schuetzenswerte_ortsbilder : ch_bfs_generalisierte_grenzen_agglomerationen_g1 { source = src_ch_bak_bundesinventar_schuetzenswerte_ortsbilder - path = /var/lib/sphinxsearch/data/index/ch_bak_bundesinventar_schuetzenswerte_ortsbilder + path = /var/lib/manticore/data/index/ch_bak_bundesinventar_schuetzenswerte_ortsbilder } index ch_bak_bundesinventar_schuetzenswerte_ortsbilder_fotos : ch_bfs_generalisierte_grenzen_agglomerationen_g1 { source = src_ch_bak_bundesinventar_schuetzenswerte_ortsbilder_fotos - path = /var/lib/sphinxsearch/data/index/ch_bak_bundesinventar_schuetzenswerte_ortsbilder_fotos + path = /var/lib/manticore/data/index/ch_bak_bundesinventar_schuetzenswerte_ortsbilder_fotos } index ch_bag_radioaktivitaet_atmosphaere : ch_bfs_generalisierte_grenzen_agglomerationen_g1 { source = src_ch_bag_radioaktivitaet_atmosphaere - path = /var/lib/sphinxsearch/data/index/ch_bag_radioaktivitaet_atmosphaere + path = /var/lib/manticore/data/index/ch_bag_radioaktivitaet_atmosphaere } diff --git a/conf/evd.conf.part b/conf/evd.conf.part index b6258b00..9cd86a47 100644 --- a/conf/evd.conf.part +++ b/conf/evd.conf.part @@ -403,7 +403,7 @@ index ch_blw_klimaeignung_typ type = plain dict=crc source = src_ch_blw_klimaeignung_typ - path = /var/lib/sphinxsearch/data/index/ch_blw_klimaeignung_typ + path = /var/lib/manticore/data/index/ch_blw_klimaeignung_typ min_infix_len = 2 expand_keywords = 1 } @@ -411,125 +411,125 @@ index ch_blw_klimaeignung_typ index ch_blw_klimaeignung_koernermais : ch_blw_klimaeignung_typ { source = src_ch_blw_klimaeignung_koernermais - path = /var/lib/sphinxsearch/data/index/ch_blw_klimaeignung_koernermais + path = /var/lib/manticore/data/index/ch_blw_klimaeignung_koernermais } index ch_blw_klimaeignung_spezialkulturen : ch_blw_klimaeignung_typ { source = src_ch_blw_klimaeignung_spezialkulturen - path = /var/lib/sphinxsearch/data/index/ch_blw_klimaeignung_spezialkulturen + path = /var/lib/manticore/data/index/ch_blw_klimaeignung_spezialkulturen } index ch_blw_klimaeignung_zwischenfruchtbau : ch_blw_klimaeignung_typ { source = src_ch_blw_klimaeignung_zwischenfruchtbau - path = /var/lib/sphinxsearch/data/index/ch_blw_klimaeignung_zwischenfruchtbau + path = /var/lib/manticore/data/index/ch_blw_klimaeignung_zwischenfruchtbau } index ch_blw_klimaeignung_kartoffeln : ch_blw_klimaeignung_typ { source = src_ch_blw_klimaeignung_kartoffeln - path = /var/lib/sphinxsearch/data/index/ch_blw_klimaeignung_kartoffeln + path = /var/lib/manticore/data/index/ch_blw_klimaeignung_kartoffeln } index ch_blw_klimaeignung_getreidebau : ch_blw_klimaeignung_typ { source = src_ch_blw_klimaeignung_getreidebau - path = /var/lib/sphinxsearch/data/index/ch_blw_klimaeignung_getreidebau + path = /var/lib/manticore/data/index/ch_blw_klimaeignung_getreidebau } index ch_blw_klimaeignung_futterbau : ch_blw_klimaeignung_typ { source = src_ch_blw_klimaeignung_futterbau - path = /var/lib/sphinxsearch/data/index/ch_blw_klimaeignung_futterbau + path = /var/lib/manticore/data/index/ch_blw_klimaeignung_futterbau } index ch_blw_klimaeignung_kulturland : ch_blw_klimaeignung_typ { source = src_ch_blw_klimaeignung_kulturland - path = /var/lib/sphinxsearch/data/index/ch_blw_klimaeignung_kulturland + path = /var/lib/manticore/data/index/ch_blw_klimaeignung_kulturland } index ch_blw_niederschlagshaushalt : ch_blw_klimaeignung_typ { source = src_ch_blw_niederschlagshaushalt - path = /var/lib/sphinxsearch/data/index/ch_blw_niederschlagshaushalt + path = /var/lib/manticore/data/index/ch_blw_niederschlagshaushalt } index ch_blw_bodeneignung_kulturtyp : ch_blw_klimaeignung_typ { source = src_ch_blw_bodeneignung_kulturtyp - path = /var/lib/sphinxsearch/data/index/ch_blw_bodeneignung_kulturtyp + path = /var/lib/manticore/data/index/ch_blw_bodeneignung_kulturtyp } index ch_blw_bodeneignung_gruendigkeit : ch_blw_klimaeignung_typ { source = src_ch_blw_bodeneignung_gruendigkeit - path = /var/lib/sphinxsearch/data/index/ch_blw_bodeneignung_gruendigkeit + path = /var/lib/manticore/data/index/ch_blw_bodeneignung_gruendigkeit } index ch_blw_bodeneignung_skelettgehalt : ch_blw_klimaeignung_typ { source = src_ch_blw_bodeneignung_skelettgehalt - path = /var/lib/sphinxsearch/data/index/ch_blw_bodeneignung_skelettgehalt + path = /var/lib/manticore/data/index/ch_blw_bodeneignung_skelettgehalt } index ch_blw_bodeneignung_wasserspeichervermoegen : ch_blw_klimaeignung_typ { source = src_ch_blw_bodeneignung_wasserspeichervermoegen - path = /var/lib/sphinxsearch/data/index/ch_blw_bodeneignung_wasserspeichervermoegen + path = /var/lib/manticore/data/index/ch_blw_bodeneignung_wasserspeichervermoegen } index ch_blw_bodeneignung_naehrstoffspeichervermoegen : ch_blw_klimaeignung_typ { source = src_ch_blw_bodeneignung_naehrstoffspeichervermoegen - path = /var/lib/sphinxsearch/data/index/ch_blw_bodeneignung_naehrstoffspeichervermoegen + path = /var/lib/manticore/data/index/ch_blw_bodeneignung_naehrstoffspeichervermoegen } index ch_blw_bodeneignung_wasserdurchlaessigkeit : ch_blw_klimaeignung_typ { source = src_ch_blw_bodeneignung_wasserdurchlaessigkeit - path = /var/lib/sphinxsearch/data/index/ch_blw_bodeneignung_wasserdurchlaessigkeit + path = /var/lib/manticore/data/index/ch_blw_bodeneignung_wasserdurchlaessigkeit } index ch_blw_bodeneignung_vernaessung : ch_blw_klimaeignung_typ { source = src_ch_blw_bodeneignung_vernaessung - path = /var/lib/sphinxsearch/data/index/ch_blw_bodeneignung_vernaessung + path = /var/lib/manticore/data/index/ch_blw_bodeneignung_vernaessung } index ch_blw_bodeneignung_kulturland : ch_blw_klimaeignung_typ { source = src_ch_blw_bodeneignung_kulturland - path = /var/lib/sphinxsearch/data/index/ch_blw_bodeneignung_kulturland + path = /var/lib/manticore/data/index/ch_blw_bodeneignung_kulturland } index ch_blw_ursprungsbezeichnungen_fleisch : ch_blw_klimaeignung_typ { source = src_ch_blw_ursprungsbezeichnungen_fleisch - path = /var/lib/sphinxsearch/data/index/ch_blw_ursprungsbezeichnungen_fleisch + path = /var/lib/manticore/data/index/ch_blw_ursprungsbezeichnungen_fleisch } index ch_blw_ursprungsbezeichnungen_kaese : ch_blw_klimaeignung_typ { source = src_ch_blw_ursprungsbezeichnungen_kaese - path = /var/lib/sphinxsearch/data/index/ch_blw_ursprungsbezeichnungen_kaese + path = /var/lib/manticore/data/index/ch_blw_ursprungsbezeichnungen_kaese } index ch_blw_ursprungsbezeichnungen_konditoreiwaren : ch_blw_klimaeignung_typ { source = src_ch_blw_ursprungsbezeichnungen_konditoreiwaren - path = /var/lib/sphinxsearch/data/index/ch_blw_ursprungsbezeichnungen_konditoreiwaren + path = /var/lib/manticore/data/index/ch_blw_ursprungsbezeichnungen_konditoreiwaren } index ch_blw_ursprungsbezeichnungen_pflanzen : ch_blw_klimaeignung_typ { source = src_ch_blw_ursprungsbezeichnungen_pflanzen - path = /var/lib/sphinxsearch/data/index/ch_blw_ursprungsbezeichnungen_pflanzen + path = /var/lib/manticore/data/index/ch_blw_ursprungsbezeichnungen_pflanzen } index ch_blw_ursprungsbezeichnungen_spirituosen : ch_blw_klimaeignung_typ { source = src_ch_blw_ursprungsbezeichnungen_spirituosen - path = /var/lib/sphinxsearch/data/index/ch_blw_ursprungsbezeichnungen_spirituosen + path = /var/lib/manticore/data/index/ch_blw_ursprungsbezeichnungen_spirituosen } diff --git a/conf/kogis.conf.part b/conf/kogis.conf.part index 05e5ed6a..f3e37cd7 100644 --- a/conf/kogis.conf.part +++ b/conf/kogis.conf.part @@ -46,11 +46,11 @@ index ch_swisstopo_fixpunkte_hfp2 min_infix_len = 2 expand_keywords = 1 source = src_ch_swisstopo_fixpunkte_hfp2 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_fixpunkte_hfp2 + path = /var/lib/manticore/data/index/ch_swisstopo_fixpunkte_hfp2 } index ch_swisstopo_fixpunkte_lfp2 : ch_swisstopo_fixpunkte_hfp2 { source = src_ch_swisstopo_fixpunkte_lfp2 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_fixpunkte_lfp2 + path = /var/lib/manticore/data/index/ch_swisstopo_fixpunkte_lfp2 } diff --git a/conf/lubis.conf.part b/conf/lubis.conf.part index 15afe2e8..0f747a6a 100644 --- a/conf/lubis.conf.part +++ b/conf/lubis.conf.part @@ -159,7 +159,7 @@ index ch_swisstopo_lubis_bildstreifen type = plain dict=crc source = src_ch_swisstopo_lubis_bildstreifen - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_lubis_bildstreifen + path = /var/lib/manticore/data/index/ch_swisstopo_lubis_bildstreifen min_infix_len = 2 expand_keywords = 1 } @@ -167,41 +167,41 @@ index ch_swisstopo_lubis_bildstreifen index ch_swisstopo_lubis_luftbilder_schraegaufnahmen : ch_swisstopo_lubis_bildstreifen { source = src_ch_swisstopo_lubis_luftbilder_schraegaufnahmen - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_lubis_luftbilder_schraegaufnahmen + path = /var/lib/manticore/data/index/ch_swisstopo_lubis_luftbilder_schraegaufnahmen } index ch_swisstopo_lubis_luftbilder_farbe : ch_swisstopo_lubis_bildstreifen { source = src_ch_swisstopo_lubis_luftbilder_farbe - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_lubis_luftbilder_farbe + path = /var/lib/manticore/data/index/ch_swisstopo_lubis_luftbilder_farbe } index ch_swisstopo_lubis_luftbilder_schwarzweiss : ch_swisstopo_lubis_luftbilder_farbe { source = src_ch_swisstopo_lubis_luftbilder_schwarzweiss - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_lubis_luftbilder_schwarzweiss + path = /var/lib/manticore/data/index/ch_swisstopo_lubis_luftbilder_schwarzweiss } index ch_swisstopo_lubis_luftbilder_infrarot : ch_swisstopo_lubis_luftbilder_farbe { source = src_ch_swisstopo_lubis_luftbilder_infrarot - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_lubis_luftbilder_infrarot + path = /var/lib/manticore/data/index/ch_swisstopo_lubis_luftbilder_infrarot } index ch_swisstopo_lubis_luftbilder_dritte_kantone : ch_swisstopo_lubis_luftbilder_farbe { source = src_ch_swisstopo_lubis_luftbilder_dritte_kantone - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_lubis_luftbilder_dritte_kantone + path = /var/lib/manticore/data/index/ch_swisstopo_lubis_luftbilder_dritte_kantone } index ch_swisstopo_lubis_luftbilder_dritte_firmen : ch_swisstopo_lubis_luftbilder_farbe { source = src_ch_swisstopo_lubis_luftbilder_dritte_firmen - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_lubis_luftbilder_dritte_firmen + path = /var/lib/manticore/data/index/ch_swisstopo_lubis_luftbilder_dritte_firmen } index ch_swisstopo_lubis_terrestrische_aufnahmen : ch_swisstopo_lubis_luftbilder_farbe { source = src_ch_swisstopo_lubis_terrestrische_aufnahmen - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_lubis_terrestrische_aufnahmen + path = /var/lib/manticore/data/index/ch_swisstopo_lubis_terrestrische_aufnahmen } diff --git a/conf/search.conf.part b/conf/search.conf.part deleted file mode 100644 index 4bd2f52e..00000000 --- a/conf/search.conf.part +++ /dev/null @@ -1,479 +0,0 @@ -## SOURCES - -source src_swisssearch : def_pqsql -{ - sql_attr_uint = num - sql_attr_uint = rank - sql_attr_uint = zoomlevel - sql_attr_string = label - sql_attr_string = objectclass - sql_attr_string = feature_id - sql_attr_string = origin - sql_attr_string = geom_st_box2d - sql_attr_string = geom_st_box2d_lv95 - sql_attr_float = x - sql_attr_float = y - sql_attr_float = x_lv95 - sql_attr_float = y_lv95 - sql_attr_float = lat - sql_attr_float = lon - sql_field_string = detail - sql_field_string = geom_quadindex -} - -source src_address : src_swisssearch -{ - sql_db=edi_${DBSTAGING} - sql_query = \ - SELECT bgdi_id AS id \ - , egid_edid::character varying(15) AS feature_id \ - , remove_accents(concat_ws(' ', replace(concat(array_to_string(strname, ' '), ' ', deinr),'',deinr), dplz4, dplzname, ggdenr, ggdename, 'ch', gdekt)) as detail \ - , concat(replace(concat(array_to_string(strname, ' | '), ' ', deinr),'',deinr), ' ', dplz4, ' ', dplzname,'') as label \ - , NULL as objectclass \ - , 'address'::text AS origin \ - , geom_quadindex \ - , box2d(st_transform(the_geom, 21781)) AS geom_st_box2d \ - , box2d(st_transform(the_geom, 2056)) AS geom_st_box2d_lv95 \ - , 7::integer as rank \ - , st_y(st_transform(the_geom, 21781)) AS x \ - , st_x(st_transform(the_geom, 21781)) AS y \ - , st_x(st_transform(the_geom, 2056)) AS y_lv95 \ - , st_y(st_transform(the_geom, 2056)) AS x_lv95 \ - , st_y(st_transform(the_geom,4326)) as lat \ - , st_x(st_transform(the_geom,4326)) as lon \ - , NULLIF(regexp_replace(deinr::text, '[^0-9]'::text, ''::text, 'g'::text), ''::text)::integer AS num \ - , 10 as zoomlevel \ - FROM bfs.gwr_chsdi -} - -source src_parcel : src_swisssearch -{ - sql_db=stopo_${DBSTAGING} - sql_query = \ - SELECT id \ - , NULL::text as feature_id \ - , detail \ - , NULL as objectclass \ - , label \ - , origin \ - , bgdi_quadindex as geom_quadindex \ - , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ - , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ - , 10::integer as rank \ - , x \ - , y \ - , st_x(st_transform(the_geom_point,2056)) as y_lv95 \ - , st_y(st_transform(the_geom_point,2056)) as x_lv95 \ - , st_y(st_transform(the_geom_point,4326)) as lat \ - , st_x(st_transform(the_geom_point,4326)) as lon \ - , num \ - , 10 as zoomlevel \ - from vd.parzellen_sphinx -} - -source src_swissnames3d : src_swisssearch -{ - sql_db=stopo_${DBSTAGING} - sql_query = \ - WITH swissnames_search as \ - ( \ - select * FROM \ - ( \ - SELECT \ - uuid::text as feature_id \ - , 6::integer as rank \ - , remove_accents(concat_ws(' ', name, (regexp_matches(bgdi_label_sphinx, E' - (.*)$'))[1])) as name \ - , objektklasse as objectclass \ - , bgdi_label_sphinx \ - , bgdi_quadindex \ - , the_geom \ - , st_y(st_transform(st_geometryn(the_geom,1), 21781)) as x \ - , st_x(st_transform(st_geometryn(the_geom,1), 21781)) as y \ - , st_y(st_transform(st_geometryn(the_geom,1), 2056)) as x_lv95 \ - , st_x(st_transform(st_geometryn(the_geom,1), 2056)) as y_lv95 \ - , st_y(st_transform(st_geometryn(the_geom,1),4326)) as lat \ - , st_x(st_transform(st_geometryn(the_geom,1),4326)) as lon \ - , 1 as num \ - , 9 as zoomlevel \ - , objektart \ - FROM tlm.swissnames3d_point \ - UNION ALL \ - SELECT \ - uuid::text as feature_id \ - , 6::integer as rank \ - , remove_accents(concat_ws(' ', name, (regexp_matches(bgdi_label_sphinx, E' - (.*)$'))[1])) as name \ - , objektklasse as objectclass \ - , bgdi_label_sphinx \ - , bgdi_quadindex \ - , the_geom \ - , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as x \ - , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as y \ - , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as x_lv95 \ - , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as y_lv95 \ - , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \ - , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lon \ - , 1 as num \ - , 9 as zoomlevel \ - , objektart \ - FROM tlm.swissnames3d_line \ - UNION ALL \ - SELECT \ - uuid::text as feature_id \ - , 6::integer as rank \ - , remove_accents(concat_ws(' ', name, (regexp_matches(bgdi_label_sphinx, E' - (.*)$'))[1])) as name \ - , objektklasse as objectclass \ - , bgdi_label_sphinx \ - , bgdi_quadindex \ - , the_geom \ - , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as x \ - , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as y \ - , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as x_lv95 \ - , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as y_lv95 \ - , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \ - , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lon \ - , 1 as num \ - , 9 as zoomlevel \ - , objektart \ - FROM tlm.swissnames3d_poly \ - WHERE objektart != 'Ort' \ - UNION ALL \ - SELECT \ - uuid::text as feature_id \ - , 5::integer as rank \ - , remove_accents(concat_ws(' ', name, (regexp_matches(bgdi_label_sphinx, E' - (.*)$'))[1])) as name \ - , objektklasse as objectclass \ - , bgdi_label_sphinx \ - , bgdi_quadindex \ - , the_geom \ - , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as x \ - , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as y \ - , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as x_lv95 \ - , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as y_lv95 \ - , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \ - , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lon \ - , 1 as num \ - , 9 as zoomlevel \ - , objektart \ - FROM tlm.swissnames3d_poly \ - WHERE objektart = 'Ort' \ - ) sub \ - WHERE objektart not like 'Haltestelle%' \ - ) \ - select distinct on (feature_id, detail) row_number() OVER(ORDER BY 1 asc) as id , * FROM \ - ( \ - SELECT \ - coalesce(b.feature_id,s.feature_id) as feature_id, \ - remove_accents(coalesce(b.name,s.name)) as detail, \ - coalesce(b.objektklasse ,s.objectclass) as objectclass, \ - coalesce(b.bgdi_label_sphinx,s.bgdi_label_sphinx) as label, \ - 'gazetteer' as origin, \ - coalesce(b.bgdi_quadindex,s.bgdi_quadindex) as geom_quadindex, \ - box2d(st_transform(coalesce(b.the_geom,s.the_geom), 21781)) as geom_st_box2d, \ - box2d(st_transform(coalesce(b.the_geom,s.the_geom), 2056)) as geom_st_box2d_lv95, \ - coalesce(b.rank,s.rank) as rank, \ - coalesce(b.x,s.x) as x, \ - coalesce(b.y,s.y) as y, \ - coalesce(b.x_lv95,s.x_lv95) as x_lv95, \ - coalesce(b.y_lv95,s.y_lv95) as y_lv95, \ - coalesce(b.lat,s.lat) as lat, \ - coalesce(b.lon,s.lon) as lon, \ - 1 as num, \ - coalesce(b.zoomlevel,s.zoomlevel) as zoomlevel \ - FROM swissnames_search s \ - left outer join tlm.dkm_search b ON s.feature_id = b.feature_id \ - UNION ALL \ - SELECT \ - b.feature_id as feature_id, \ - remove_accents(b.name) as detail, \ - remove_accents(b.objektklasse) as objectclass, \ - b.bgdi_label_sphinx as label, \ - 'gazetteer' as origin, \ - b.bgdi_quadindex as geom_quadindex, \ - box2d(st_transform(b.the_geom, 21781)) as geom_st_box2d, \ - box2d(st_transform(b.the_geom, 2056)) as geom_st_box2d_lv95, \ - b.rank as rank, \ - b.x as x, \ - b.y as y, \ - b.x_lv95 as x_lv95, \ - b.y_lv95 as y_lv95, \ - b.lat as lat, \ - b.lon as lon, \ - 1 as num, \ - b.zoomlevel as zoomlevel \ - FROM swissnames_search s \ - inner join tlm.dkm_search b on s.name = b.name and s.objectclass = 'TLM_GEBAEUDE' and s.feature_id <> b.feature_id \ - ) s -} - -source src_gg25 : src_swisssearch -{ - sql_db=stopo_${DBSTAGING} - sql_query = \ - SELECT \ - row_number() OVER(ORDER BY id asc) as id \ - , id::text as feature_id \ - , remove_accents(concat_ws(' ', trim(gemname), trim(k.ak))) as detail \ - , NULL as objectclass \ - , concat('', trim(gemname), ' (', k.ak, ')') as label \ - , 'gg25'::text as origin \ - , quadindex(g.the_geom) as geom_quadindex \ - , box2d(st_transform(g.the_geom, 21781)) as geom_st_box2d \ - , box2d(st_transform(g.the_geom, 2056)) as geom_st_box2d_lv95 \ - , 2::integer as rank \ - , st_y(st_transform(ST_PointOnSurface(g.the_geom), 21781)) AS x \ - , st_x(st_transform(ST_PointOnSurface(g.the_geom), 21781)) AS y \ - , st_y(st_transform(ST_PointOnSurface(g.the_geom), 2056)) AS x_lv95 \ - , st_x(st_transform(ST_PointOnSurface(g.the_geom), 2056)) AS y_lv95 \ - , st_y(st_transform(ST_PointOnSurface(g.the_geom),4326)) as lat \ - , st_x(st_transform(ST_PointOnSurface(g.the_geom),4326)) as lon \ - , -1 as zoomlevel \ - , 1 as num \ - FROM tlm.swissboundaries_gemeinden_uebersetzt g left join tlm.swissboundaries_kantone k on k.kantonsnr = g.kantonsnr -} - -source src_kantone : src_swisssearch -{ - sql_db=stopo_${DBSTAGING} - sql_query = \ - SELECT \ - kantonsnr::integer as id \ - , kantonsnr::text as feature_id \ - , remove_accents(concat_ws(' ', name, ak)) as detail \ - , NULL as objectclass \ - , concat('', trim(name), '') as label \ - , 'kantone'::text as origin \ - , quadindex(the_geom) as geom_quadindex \ - , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ - , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ - , 4::integer as rank \ - , st_y(st_transform(ST_PointOnSurface(the_geom), 21781)) AS x \ - , st_x(st_transform(ST_PointOnSurface(the_geom), 21781)) AS y \ - , st_y(st_transform(ST_PointOnSurface(the_geom), 2056)) AS x_lv95 \ - , st_x(st_transform(ST_PointOnSurface(the_geom), 2056)) AS y_lv95 \ - , st_y(st_transform(ST_PointOnSurface(the_geom),4326)) as lat \ - , st_x(st_transform(ST_PointOnSurface(the_geom),4326)) as lon \ - , -1 as zoomlevel \ - , 1 as num \ - FROM tlm.swissboundaries_kantone -} - -source src_district : src_swisssearch -{ - sql_db=stopo_${DBSTAGING} - sql_query = \ - SELECT \ - id::integer as id \ - , id::text as feature_id \ - , name::text as detail \ - , NULL as objectclass \ - , concat('', trim(name), '') as label \ - , 'district'::text as origin \ - , quadindex(the_geom) as geom_quadindex \ - , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ - , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ - , 3::integer as rank \ - , st_y(st_transform(ST_PointOnSurface(the_geom), 21781)) AS x \ - , st_x(st_transform(ST_PointOnSurface(the_geom), 21781)) AS y \ - , st_y(st_transform(ST_PointOnSurface(the_geom), 2056)) AS x_lv95 \ - , st_x(st_transform(ST_PointOnSurface(the_geom), 2056)) AS y_lv95 \ - , st_y(st_transform(ST_PointOnSurface(the_geom),4326)) as lat \ - , st_x(st_transform(ST_PointOnSurface(the_geom),4326)) as lon \ - , -1 as zoomlevel \ - , 1 as num \ - FROM tlm.swissboundaries_bezirke -} - -source src_zipcode : src_swisssearch -{ - sql_db=stopo_${DBSTAGING} - sql_query = \ - SELECT \ - gid as id \ - , os_uuid::text as feature_id \ - , plz::text as detail \ - , concat('', plz, ' - ', trim(langtext), ' (', trim(canton), ')') as label \ - , NULL as objectclass \ - , 'zipcode' as origin \ - , quadindex(the_geom) as geom_quadindex \ - , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ - , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ - , 1::integer as rank \ - , st_y(st_transform(st_setsrid(st_point(label_x,label_y),2056),21781)) as x \ - , st_x(st_transform(st_setsrid(st_point(label_x,label_y),2056),21781)) as y \ - , st_y(st_transform(st_setsrid(st_point(label_x,label_y),2056),2056)) as x_lv95 \ - , st_x(st_transform(st_setsrid(st_point(label_x,label_y),2056),2056)) as y_lv95 \ - , st_y(st_transform(st_setsrid(st_point(label_x,label_y),2056),4326)) as lat \ - , st_x(st_transform(st_setsrid(st_point(label_x,label_y),2056),4326)) as lon \ - , -1 as zoomlevel \ - , 1 as num \ - FROM vd.gabmo_plz p -} - -source src_haltestellen : src_swisssearch -{ - sql_db=uvek_${DBSTAGING} - sql_query = \ - SELECT \ - bgdi_id as id \ - , xtf_id::text as feature_id \ - , remove_accents(concat_ws(' ', name, nummer, betriebspunkttyp_bezeichnung_de, verkehrsmittel_bezeichnung_de))::text as detail \ - , NULL as objectclass \ - , concat_ws('','', lower(concat_ws('_','Haltestellen', trim(verkehrsmittel_bezeichnung_de))) , ' ','',trim(name),'') as label \ - , 'gazetteer'::text as origin \ - , quadindex(the_geom) as geom_quadindex \ - , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ - , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ - , 8::integer as rank \ - , st_y(st_transform(st_geometryn(the_geom,1), 21781)) as x \ - , st_x(st_transform(st_geometryn(the_geom,1), 21781)) as y \ - , st_y(st_transform(st_geometryn(the_geom,1), 2056)) as x_lv95 \ - , st_x(st_transform(st_geometryn(the_geom,1), 2056)) as y_lv95 \ - , st_y(st_transform(st_geometryn(the_geom,1),4326)) as lat \ - , st_x(st_transform(st_geometryn(the_geom,1),4326)) as lon \ - , -1 as zoomlevel \ - , 1 as num \ - FROM bav.oev_haltestellen -} - -## INDICES - -index zipcode -{ - source = src_zipcode - wordforms = /var/lib/sphinxsearch/data/index/wordforms_main.txt - path = /var/lib/sphinxsearch/data/index/zipcode - type = plain - min_infix_len = 1 - preopen = 1 - dict=crc - infix_fields = detail,geom_quadindex -} - -index district : zipcode -{ - source = src_district - path = /var/lib/sphinxsearch/data/index/district - ondisk_attrs = 0 -} - -index kantone : zipcode -{ - source = src_kantone - path = /var/lib/sphinxsearch/data/index/kantone - ondisk_attrs = 0 -} - -index gg25 : zipcode -{ - source = src_gg25 - path = /var/lib/sphinxsearch/data/index/gg25 - ondisk_attrs = 0 -} - -index swissnames3d : zipcode -{ - source = src_swissnames3d - path = /var/lib/sphinxsearch/data/index/swissnames3d - ondisk_attrs = 0 -} - -index haltestellen : zipcode -{ - source = src_haltestellen - path = /var/lib/sphinxsearch/data/index/haltestellen - ondisk_attrs = 0 -} - -index parcel : zipcode -{ - source = src_parcel - path = /var/lib/sphinxsearch/data/index/parcel - ondisk_attrs = 0 -} - -index address : zipcode -{ - source = src_address - path = /var/lib/sphinxsearch/data/index/address - ondisk_attrs = 0 -} - -# swisssearch fuzzy metaphone -index district_metaphone : zipcode -{ - morphology = metaphone - source = src_district - path = /var/lib/sphinxsearch/data/index/district_metaphone - preopen = 0 -} - -index kantone_metaphone : zipcode -{ - morphology = metaphone - source = src_kantone - path = /var/lib/sphinxsearch/data/index/kantone_metaphone - preopen = 0 -} - -index gg25_metaphone : zipcode -{ - morphology = metaphone - source = src_gg25 - path = /var/lib/sphinxsearch/data/index/gg25_metaphone - preopen = 0 -} - -index swissnames3d_metaphone : zipcode -{ - morphology = metaphone - source = src_swissnames3d - path = /var/lib/sphinxsearch/data/index/swissnames3d_metaphone - preopen = 0 -} - -index haltestellen_metaphone : zipcode -{ - morphology = metaphone - source = src_haltestellen - path = /var/lib/sphinxsearch/data/index/haltestellen_metaphone - preopen = 0 -} - -index address_metaphone: zipcode -{ - morphology = metaphone - source = src_address - path = /var/lib/sphinxsearch/data/index/address_metaphone - preopen = 0 -} - -# only create on demand -#index address_geocoding : zipcode -#{ -# source = src_address_geocoding -# path = /var/lib/sphinxsearch/data/index/address_geocoding -#} - -index swisssearch -{ - type = distributed - local = zipcode - local = district - local = kantone - local = gg25 - local = swissnames3d - local = haltestellen - local = parcel - local = address -} - -index swisssearch_fuzzy -{ - type = distributed - local = district_metaphone - local = kantone_metaphone - local = gg25_metaphone - local = swissnames3d_metaphone - local = haltestellen_metaphone - local = address_metaphone -} diff --git a/conf/stopo.conf.part b/conf/stopo.conf.part index ea78a81c..fb509a01 100644 --- a/conf/stopo.conf.part +++ b/conf/stopo.conf.part @@ -881,7 +881,7 @@ index ch_swisstopo_verschiebungsvektoren_tsp1 type = plain dict=crc source = src_ch_swisstopo_verschiebungsvektoren_tsp1 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_verschiebungsvektoren_tsp1 + path = /var/lib/manticore/data/index/ch_swisstopo_verschiebungsvektoren_tsp1 min_infix_len = 2 expand_keywords = 1 } @@ -889,281 +889,281 @@ index ch_swisstopo_verschiebungsvektoren_tsp1 index ch_swisstopo_landesschwerenetz : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_landesschwerenetz - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_landesschwerenetz + path = /var/lib/manticore/data/index/ch_swisstopo_landesschwerenetz } index ch_swisstopo_verschiebungsvektoren_tsp2 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_verschiebungsvektoren_tsp2 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_verschiebungsvektoren_tsp2 + path = /var/lib/manticore/data/index/ch_swisstopo_verschiebungsvektoren_tsp2 } index ch_swisstopo_swissboundaries3d_bezirk_flaeche_fill : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_swissboundaries3d_bezirk_flaeche_fill - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_swissboundaries3d_bezirk_flaeche_fill + path = /var/lib/manticore/data/index/ch_swisstopo_swissboundaries3d_bezirk_flaeche_fill } index ch_swisstopo_swissboundaries3d_gemeinde_flaeche_fill : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_swissboundaries3d_gemeinde_flaeche_fill - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_swissboundaries3d_gemeinde_flaeche_fill + path = /var/lib/manticore/data/index/ch_swisstopo_swissboundaries3d_gemeinde_flaeche_fill } index ch_swisstopo_swissboundaries3d_kanton_flaeche_fill : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_swissboundaries3d_kanton_flaeche_fill - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_swissboundaries3d_kanton_flaeche_fill + path = /var/lib/manticore/data/index/ch_swisstopo_swissboundaries3d_kanton_flaeche_fill } index ch_swisstopo_vd_ortschaftenverzeichnis_plz : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_vd_ortschaftenverzeichnis_plz - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_vd_ortschaftenverzeichnis_plz + path = /var/lib/manticore/data/index/ch_swisstopo_vd_ortschaftenverzeichnis_plz } index ch_swisstopo_vec200_names_namedlocation : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_vec200_names_namedlocation - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_vec200_names_namedlocation + path = /var/lib/manticore/data/index/ch_swisstopo_vec200_names_namedlocation } index ch_swisstopo_geologie_bohrungen_tiefer_500 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_bohrungen_tiefer_500 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_bohrungen_tiefer_500 + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_bohrungen_tiefer_500 } index ch_swisstopo_geologie_geoevents_demnaechst : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_geoevents_demnaechst - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_geoevents_demnaechst + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_geoevents_demnaechst } index ch_swisstopo_geologie_geoevents_anfrage : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_geoevents_anfrage - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_geoevents_anfrage + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_geoevents_anfrage } index ch_swisstopo_geologie_geowege : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_geowege - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_geowege + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_geowege } index ch_swisstopo_geologie_geosites : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_geosites - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_geosites + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_geosites } index ch_swisstopo_geologie_geothermische_potenzialstudien_regional : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_geothermische_potenzialstudien_reg - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_geothermische_potenzialstudien_regional + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_geothermische_potenzialstudien_regional } index ch_swisstopo_geologie_geotechnik_ziegeleien_1907 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_geotechnik_ziegeleien_1907 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_geotechnik_ziegeleien_1907 + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_geotechnik_ziegeleien_1907 } index ch_swisstopo_geologie_rohstoffe_vererzungen : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_vererzungen - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_vererzungen + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_vererzungen } index ch_swisstopo_geologie_rohstoffe_industrieminerale : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_industrieminerale - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_industrieminerale + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_industrieminerale } index ch_swisstopo_geologie_rohstoffe_kohlen_bitumen_erdgas : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_kohlen_bitumen_erdgas - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_kohlen_bitumen_erdgas + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_kohlen_bitumen_erdgas } index ch_swisstopo_geologie_rohstoffe_naturwerksteine_abbau : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_naturwerksteine_abbau - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_naturwerksteine_abbau + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_naturwerksteine_abbau } index ch_swisstopo_geologie_rohstoffe_gebrochene_gesteine_abbau : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_gebrochene_gesteine_abbau - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_gebrochene_gesteine_abbau + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_gebrochene_gesteine_abbau } index ch_swisstopo_geologie_rohstoffe_gips_abbau_verarbeitung : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_gips_abbau_verarbeitung - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_gips_abbau_verarbeitung + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_gips_abbau_verarbeitung } index ch_swisstopo_geologie_rohstoffe_salz_abbau_verarbeitung : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_salz_abbau_verarbeitung - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_salz_abbau_verarbeitung + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_salz_abbau_verarbeitung } index ch_swisstopo_geologie_rohstoffe_zement_abbau_verarbeitung : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_zement_abbau_verarbeitung - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_zement_abbau_verarbeitung + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_zement_abbau_verarbeitung } index ch_swisstopo_geologie_rohstoffe_ziegel_verarbeitung : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_ziegel_verarbeitung - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_ziegel_verarbeitung + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_ziegel_verarbeitung } index ch_swisstopo_geologie_rohstoffe_ziegel_abbau : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_rohstoffe_ziegel_abbau - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_rohstoffe_ziegel_abbau + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_rohstoffe_ziegel_abbau } index ch_swisstopo_geologie_gisgeol_punkte : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gisgeol_punkte - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gisgeol_punkte + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gisgeol_punkte } index ch_swisstopo_geologie_gisgeol_linien : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gisgeol_linien - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gisgeol_linien + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gisgeol_linien } index ch_swisstopo_geologie_gisgeol_flaechen_1x1km : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gisgeol_flaechen_1x1km - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gisgeol_flaechen_1x1km + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gisgeol_flaechen_1x1km } index ch_swisstopo_geologie_gisgeol_flaechen_10x10km : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gisgeol_flaechen_10x10km - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gisgeol_flaechen_10x10km + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gisgeol_flaechen_10x10km } index ch_swisstopo_geologie_gisgeol_flaechen_10to100km2 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gisgeol_flaechen_10to100km2 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gisgeol_flaechen_10to100km2 + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gisgeol_flaechen_10to100km2 } index ch_swisstopo_geologie_gisgeol_flaechen_100to1000km2 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gisgeol_flaechen_100to1000km2 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gisgeol_flaechen_100to1000km2 + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gisgeol_flaechen_100to1000km2 } index ch_swisstopo_geologie_gisgeol_flaechen_1000to21000km2 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gisgeol_flaechen_1000to21000km2 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gisgeol_flaechen_1000to21000km2 + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gisgeol_flaechen_1000to21000km2 } index ch_swisstopo_geologie_gisgeol_flaechen_gt21000km2 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gisgeol_flaechen_gt21000km2 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gisgeol_flaechen_gt21000km2 + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gisgeol_flaechen_gt21000km2 } index ch_swisstopo_geologie_gisgeol_flaechen_lt10km2 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gisgeol_flaechen_lt10km2 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gisgeol_flaechen_lt10km2 + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gisgeol_flaechen_lt10km2 } index ch_swisstopo_geologie_gravimetrischer_atlas_messpunkte : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gravimetrischer_atlas_messpunkte - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gravimetrischer_atlas_messpunkte + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gravimetrischer_atlas_messpunkte } index ch_swisstopo_geologie_tiefengeothermie_projekte : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_tiefengeothermie_projekte - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_tiefengeothermie_projekte + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_tiefengeothermie_projekte } index ch_swisstopo_vd_geometa_periodische_nachfuehrung : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_vd_geometa_periodische_nachfuehrung - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_vd_geometa_periodische_nachfuehrung + path = /var/lib/manticore/data/index/ch_swisstopo_vd_geometa_periodische_nachfuehrung } index ch_swisstopo_transformation_bezugsrahmen_hoehe : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_transformation_bezugsrahmen_hoehe - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_transformation_bezugsrahmen_hoehe + path = /var/lib/manticore/data/index/ch_swisstopo_transformation_bezugsrahmen_hoehe } index ch_swisstopo_geologie_geologischer_atlas_profile : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_geologischer_atlas_profile - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_geologischer_atlas_profile + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_geologischer_atlas_profile } index ch_swisstopo_hebungsraten : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_hebungsraten - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_hebungsraten + path = /var/lib/manticore/data/index/ch_swisstopo_hebungsraten } index ch_swisstopo_lotabweichungen : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_lotabweichungen - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_lotabweichungen + path = /var/lib/manticore/data/index/ch_swisstopo_lotabweichungen } index ch_swisstopo_amtliches_strassenverzeichnis : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_amtliches_strassenverzeichnis - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_amtliches_strassenverzeichnis + path = /var/lib/manticore/data/index/ch_swisstopo_amtliches_strassenverzeichnis } index ch_swisstopo_amtliches_gebaeudeadressverzeichnis : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_amtliches_gebaeudeadressverzeichnis - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_amtliches_gebaeudeadressverzeichnis + path = /var/lib/manticore/data/index/ch_swisstopo_amtliches_gebaeudeadressverzeichnis } index ch_swisstopo_vec25_gewaessernetz_referenz : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_vec25_gewaessernetz_referenz - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_vec25_gewaessernetz_referenz + path = /var/lib/manticore/data/index/ch_swisstopo_vec25_gewaessernetz_referenz } index ch_swisstopo_geologie_felslabore : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_felslabore - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_felslabore + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_felslabore } index ch_swisstopo_geologie_gletscherausdehnung : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_geologie_gletscherausdehnung - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_geologie_gletscherausdehnung + path = /var/lib/manticore/data/index/ch_swisstopo_geologie_gletscherausdehnung } index ch_swisstopo_fixpunkte_hfp1 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_fixpunkte_hfp1 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_fixpunkte_hfp1 + path = /var/lib/manticore/data/index/ch_swisstopo_fixpunkte_hfp1 } index ch_swisstopo_fixpunkte_lfp1 : ch_swisstopo_verschiebungsvektoren_tsp1 { source = src_ch_swisstopo_fixpunkte_lfp1 - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_fixpunkte_lfp1 + path = /var/lib/manticore/data/index/ch_swisstopo_fixpunkte_lfp1 } diff --git a/conf/uvek.conf.part b/conf/uvek.conf.part index a8b6d5ba..29ac3898 100644 --- a/conf/uvek.conf.part +++ b/conf/uvek.conf.part @@ -1732,7 +1732,7 @@ index ch_astra_ivs_nat type = plain dict=crc source = src_ch_astra_ivs_nat - path = /var/lib/sphinxsearch/data/index/ch_astra_ivs_nat + path = /var/lib/manticore/data/index/ch_astra_ivs_nat min_infix_len = 2 expand_keywords = 1 } @@ -1740,229 +1740,229 @@ index ch_astra_ivs_nat index ch_astra_ivs_nat_verlaeufe : ch_astra_ivs_nat { source = src_ch_astra_ivs_nat_verlaeufe - path = /var/lib/sphinxsearch/data/index/ch_astra_ivs_nat_verlaeufe + path = /var/lib/manticore/data/index/ch_astra_ivs_nat_verlaeufe } index ch_astra_ivs_reg_loc : ch_astra_ivs_nat { source = src_ch_astra_ivs_reg_loc - path = /var/lib/sphinxsearch/data/index/ch_astra_ivs_reg_loc + path = /var/lib/manticore/data/index/ch_astra_ivs_reg_loc } index ch_bav_schienennetz : ch_astra_ivs_nat { source = src_ch_bav_schienennetz - path = /var/lib/sphinxsearch/data/index/ch_bav_schienennetz + path = /var/lib/manticore/data/index/ch_bav_schienennetz } index ch_bav_haltestellen_oev : ch_astra_ivs_nat { source = src_ch_bav_haltestellen_oev - path = /var/lib/sphinxsearch/data/index/ch_bav_haltestellen_oev + path = /var/lib/manticore/data/index/ch_bav_haltestellen_oev } index ch_bav_seilbahnen_bundeskonzession : ch_astra_ivs_nat { source = src_ch_bav_seilbahnen_bundeskonzession - path = /var/lib/sphinxsearch/data/index/ch_bav_seilbahnen_bundeskonzession + path = /var/lib/manticore/data/index/ch_bav_seilbahnen_bundeskonzession } index ch_astra_strassenverkehrszaehlung_messstellen_uebergeordnet : ch_astra_ivs_nat { source = src_ch_astra_strassenverkehrszaehlung_messstellen_uebergeordnet - path = /var/lib/sphinxsearch/data/index/ch_astra_strassenverkehrszaehlung_messstellen_uebergeordnet + path = /var/lib/manticore/data/index/ch_astra_strassenverkehrszaehlung_messstellen_uebergeordnet } index ch_astra_strassenverkehrszaehlung_messstellen_regional_lokal : ch_astra_ivs_nat { source = src_ch_astra_strassenverkehrszaehlung_lokal - path = /var/lib/sphinxsearch/data/index/ch_astra_strassenverkehrszaehlung_messstellen_regional_lokal + path = /var/lib/manticore/data/index/ch_astra_strassenverkehrszaehlung_messstellen_regional_lokal } index ch_astra_strassenverkehrszaehlung_uebergeordnet : ch_astra_ivs_nat { source = src_ch_astra_strassenverkehrszaehlung_uebergeordnet - path = /var/lib/sphinxsearch/data/index/ch_astra_strassenverkehrszaehlung_uebergeordnet + path = /var/lib/manticore/data/index/ch_astra_strassenverkehrszaehlung_uebergeordnet } index ch_astra_unfaelle_personenschaeden_motorraeder : ch_astra_ivs_nat { source = src_ch_astra_unfaelle_personenschaeden_motorraeder - path = /var/lib/sphinxsearch/data/index/ch_astra_unfaelle_personenschaeden_motorraeder + path = /var/lib/manticore/data/index/ch_astra_unfaelle_personenschaeden_motorraeder } index ch_astra_unfaelle_personenschaeden_fussgaenger : ch_astra_ivs_nat { source = src_ch_astra_unfaelle_personenschaeden_fussgaenger - path = /var/lib/sphinxsearch/data/index/ch_astra_unfaelle_personenschaeden_fussgaenger + path = /var/lib/manticore/data/index/ch_astra_unfaelle_personenschaeden_fussgaenger } index ch_astra_unfaelle_personenschaeden_fahrraeder : ch_astra_ivs_nat { source = src_ch_astra_unfaelle_personenschaeden_fahrraeder - path = /var/lib/sphinxsearch/data/index/ch_astra_unfaelle_personenschaeden_fahrraeder + path = /var/lib/manticore/data/index/ch_astra_unfaelle_personenschaeden_fahrraeder } index ch_astra_unfaelle_personenschaeden_getoetete : ch_astra_ivs_nat { source = src_ch_astra_unfaelle_personenschaeden_getoetete - path = /var/lib/sphinxsearch/data/index/ch_astra_unfaelle_personenschaeden_getoetete + path = /var/lib/manticore/data/index/ch_astra_unfaelle_personenschaeden_getoetete } index ch_astra_unfaelle_personenschaeden_alle : ch_astra_ivs_nat { source = src_ch_astra_unfaelle_personenschaeden_alle - path = /var/lib/sphinxsearch/data/index/ch_astra_unfaelle_personenschaeden_alle + path = /var/lib/manticore/data/index/ch_astra_unfaelle_personenschaeden_alle } index ch_bakom_notruf : ch_astra_ivs_nat { source = src_ch_bakom_notruf - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf + path = /var/lib/manticore/data/index/ch_bakom_notruf } index ch_bakom_notruf_112_festnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_112_festnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_112_festnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_112_festnetz } index ch_bakom_notruf_117_festnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_117_festnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_117_festnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_117_festnetz } index ch_bakom_notruf_118_festnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_118_festnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_118_festnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_118_festnetz } index ch_bakom_notruf_143_festnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_143_festnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_143_festnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_143_festnetz } index ch_bakom_notruf_144_festnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_144_festnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_144_festnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_144_festnetz } index ch_bakom_notruf_145_festnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_145_festnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_145_festnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_145_festnetz } index ch_bakom_notruf_147_festnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_147_festnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_147_festnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_147_festnetz } index ch_bakom_notruf_112_mobilnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_112_mobilnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_112_mobilnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_112_mobilnetz } index ch_bakom_notruf_117_mobilnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_117_mobilnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_117_mobilnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_117_mobilnetz } index ch_bakom_notruf_118_mobilnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_118_mobilnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_118_mobilnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_118_mobilnetz } index ch_bakom_notruf_143_mobilnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_143_mobilnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_143_mobilnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_143_mobilnetz } index ch_bakom_notruf_144_mobilnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_144_mobilnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_144_mobilnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_144_mobilnetz } index ch_bakom_notruf_145_mobilnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_145_mobilnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_145_mobilnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_145_mobilnetz } index ch_bakom_notruf_147_mobilnetz : ch_astra_ivs_nat { source = src_ch_bakom_notruf_147_mobilnetz - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_147_mobilnetz + path = /var/lib/manticore/data/index/ch_bakom_notruf_147_mobilnetz } index ch_bakom_notruf_112_satellit : ch_astra_ivs_nat { source = src_ch_bakom_notruf_112_satellit - path = /var/lib/sphinxsearch/data/index/ch_bakom_notruf_112_satellit + path = /var/lib/manticore/data/index/ch_bakom_notruf_112_satellit } index ch_bakom_radio_fernsehsender : ch_astra_ivs_nat { source = src_ch_bakom_radio_fernsehsender - path = /var/lib/sphinxsearch/data/index/ch_bakom_radio_fernsehsender + path = /var/lib/manticore/data/index/ch_bakom_radio_fernsehsender } index ch_bakom_versorgungsgebiet_tv : ch_astra_ivs_nat { source = src_ch_bakom_versorgungsgebiet_tv - path = /var/lib/sphinxsearch/data/index/ch_bakom_versorgungsgebiet_tv + path = /var/lib/manticore/data/index/ch_bakom_versorgungsgebiet_tv } index ch_bakom_versorgungsgebiet_ukw : ch_astra_ivs_nat { source = src_ch_bakom_versorgungsgebiet_ukw - path = /var/lib/sphinxsearch/data/index/ch_bakom_versorgungsgebiet_ukw + path = /var/lib/manticore/data/index/ch_bakom_versorgungsgebiet_ukw } index ch_bav_sachplan_infrastruktur_schiene_ausgangslage : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schiene_ausgangslage - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schiene_ausgangslage + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schiene_ausgangslage } index ch_bav_kataster_belasteter_standorte_oev : ch_astra_ivs_nat { source = src_ch_bav_kataster_belasteter_standorte_oev - path = /var/lib/sphinxsearch/data/index/ch_bav_kataster_belasteter_standorte_oev + path = /var/lib/manticore/data/index/ch_bav_kataster_belasteter_standorte_oev } index ch_bazl_kataster_belasteter_standorte_zivilflugplaetze : ch_astra_ivs_nat { source = src_ch_bazl_kataster_belasteter_standorte_zivilflugplaetze - path = /var/lib/sphinxsearch/data/index/ch_bazl_kataster_belasteter_standorte_zivilflugplaetze + path = /var/lib/manticore/data/index/ch_bazl_kataster_belasteter_standorte_zivilflugplaetze } index ch_bav_sachplan_infrastruktur_schifffahrt_ausgangslage : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schifffahrt_ausgangslage - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_ausgangslage + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_ausgangslage } index ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung_1 : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung_1 - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung_1 + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung_1 } index ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung_2 : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung_2 - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung_2 + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung_2 } index ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung @@ -1975,13 +1975,13 @@ index ch_bav_sachplan_infrastruktur_schifffahrt_anhoerung index ch_bav_sachplan_infrastruktur_schifffahrt_kraft_1 : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schifffahrt_kraft_1 - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_kraft_1 + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_kraft_1 } index ch_bav_sachplan_infrastruktur_schifffahrt_kraft_2 : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schifffahrt_kraft_2 - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_kraft_2 + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schifffahrt_kraft_2 } index ch_bav_sachplan_infrastruktur_schifffahrt_kraft @@ -1994,13 +1994,13 @@ index ch_bav_sachplan_infrastruktur_schifffahrt_kraft index ch_bav_sachplan_infrastruktur_schiene_anhorung_1 : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schiene_anhorung_1 - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schiene_anhorung_1 + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schiene_anhorung_1 } index ch_bav_sachplan_infrastruktur_schiene_anhorung_2 : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schiene_anhorung_2 - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schiene_anhorung_2 + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schiene_anhorung_2 } index ch_bav_sachplan_infrastruktur_schiene_anhorung @@ -2013,13 +2013,13 @@ index ch_bav_sachplan_infrastruktur_schiene_anhorung index ch_bav_sachplan_infrastruktur_schiene_kraft_1 : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schiene_kraft_1 - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schiene_kraft_1 + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schiene_kraft_1 } index ch_bav_sachplan_infrastruktur_schiene_kraft_2 : ch_astra_ivs_nat { source = src_ch_bav_sachplan_infrastruktur_schiene_kraft_2 - path = /var/lib/sphinxsearch/data/index/ch_bav_sachplan_infrastruktur_schiene_kraft_2 + path = /var/lib/manticore/data/index/ch_bav_sachplan_infrastruktur_schiene_kraft_2 } index ch_bav_sachplan_infrastruktur_schiene_kraft @@ -2032,13 +2032,13 @@ index ch_bav_sachplan_infrastruktur_schiene_kraft index ch_bfe_kleinwasserkraftpotentiale : ch_astra_ivs_nat { source = src_ch_bfe_kleinwasserkraftpotentiale - path = /var/lib/sphinxsearch/data/index/ch_bfe_kleinwasserkraftpotentiale + path = /var/lib/manticore/data/index/ch_bfe_kleinwasserkraftpotentiale } index ch_bfe_stauanlagen_bundesaufsicht : ch_astra_ivs_nat { source = src_ch_bfe_stauanlagen_bundesaufsicht - path = /var/lib/sphinxsearch/data/index/ch_bfe_stauanlagen_bundesaufsicht + path = /var/lib/manticore/data/index/ch_bfe_stauanlagen_bundesaufsicht } index ch_bfe_sachplan_geologie_tiefenlager_thematische_darstellung @@ -2052,73 +2052,73 @@ index ch_bfe_sachplan_geologie_tiefenlager_thematische_darstellung index ch_bfe_statistik_wasserkraftanlagen : ch_astra_ivs_nat { source = src_ch_bfe_statistik_wasserkraftanlagen - path = /var/lib/sphinxsearch/data/index/ch_bfe_statistik_wasserkraftanlagen + path = /var/lib/manticore/data/index/ch_bfe_statistik_wasserkraftanlagen } index ch_bfe_abgeltung_wasserkraftnutzung : ch_astra_ivs_nat { source = src_ch_bfe_abgeltung_wasserkraftnutzung - path = /var/lib/sphinxsearch/data/index/ch_bfe_abgeltung_wasserkraftnutzung + path = /var/lib/manticore/data/index/ch_bfe_abgeltung_wasserkraftnutzung } index ch_bfe_kernkraftwerke : ch_astra_ivs_nat { source = src_ch_bfe_kernkraftwerke - path = /var/lib/sphinxsearch/data/index/ch_bfe_kernkraftwerke + path = /var/lib/manticore/data/index/ch_bfe_kernkraftwerke } index ch_bfe_energiestaedte : ch_astra_ivs_nat { source = src_ch_bfe_energiestaedte - path = /var/lib/sphinxsearch/data/index/ch_bfe_energiestaedte + path = /var/lib/manticore/data/index/ch_bfe_energiestaedte } index ch_bfe_energiestaedte_2000watt_areale : ch_astra_ivs_nat { source = src_ch_bfe_energiestaedte_2000watt_areale - path = /var/lib/sphinxsearch/data/index/ch_bfe_energiestaedte_2000watt_areale + path = /var/lib/manticore/data/index/ch_bfe_energiestaedte_2000watt_areale } index ch_bazl_luftfahrthindernis : ch_astra_ivs_nat { source = src_ch_bazl_luftfahrthindernis - path = /var/lib/sphinxsearch/data/index/ch_bazl_luftfahrthindernis + path = /var/lib/manticore/data/index/ch_bazl_luftfahrthindernis } index ch_bazl_luftfahrthindernis_aenderungen : ch_astra_ivs_nat { source = src_ch_bazl_luftfahrthindernis_aenderungen - path = /var/lib/sphinxsearch/data/index/ch_bazl_luftfahrthindernis_aenderungen + path = /var/lib/manticore/data/index/ch_bazl_luftfahrthindernis_aenderungen } index ch_bfe_windenergieanlagen : ch_astra_ivs_nat { source = src_ch_bfe_windenergieanlagen - path = /var/lib/sphinxsearch/data/index/ch_bfe_windenergieanlagen + path = /var/lib/manticore/data/index/ch_bfe_windenergieanlagen } index ch_bfe_sachplan_uebertragungsleitungen_anhorung_1 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_uebertragungsleitungen_anhorung_1 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_uebertragungsleitungen_anhorung_1 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_uebertragungsleitungen_anhorung_1 } index ch_bfe_sachplan_uebertragungsleitungen_anhorung_2 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_uebertragungsleitungen_anhorung_2 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_uebertragungsleitungen_anhorung_2 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_uebertragungsleitungen_anhorung_2 } index ch_bfe_sachplan_uebertragungsleitungen_anhorung_3 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_uebertragungsleitungen_anhorung_3 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_uebertragungsleitungen_anhorung_3 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_uebertragungsleitungen_anhorung_3 } index ch_bfe_sachplan_uebertragungsleitungen_anhorung_4 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_uebertragungsleitungen_anhorung_4 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_uebertragungsleitungen_anhorung_4 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_uebertragungsleitungen_anhorung_4 } index ch_bfe_sachplan_uebertragungsleitungen_anhorung @@ -2133,25 +2133,25 @@ index ch_bfe_sachplan_uebertragungsleitungen_anhorung index ch_bfe_sachplan_uebertragungsleitungen_kraft_1 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_uebertragungsleitungen_kraft_1 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_uebertragungsleitungen_kraft_1 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_uebertragungsleitungen_kraft_1 } index ch_bfe_sachplan_uebertragungsleitungen_kraft_2 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_uebertragungsleitungen_kraft_2 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_uebertragungsleitungen_kraft_2 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_uebertragungsleitungen_kraft_2 } index ch_bfe_sachplan_uebertragungsleitungen_kraft_3 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_uebertragungsleitungen_kraft_3 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_uebertragungsleitungen_kraft_3 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_uebertragungsleitungen_kraft_3 } index ch_bfe_sachplan_uebertragungsleitungen_kraft_4 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_uebertragungsleitungen_kraft_4 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_uebertragungsleitungen_kraft_4 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_uebertragungsleitungen_kraft_4 } index ch_bfe_sachplan_uebertragungsleitungen_kraft @@ -2166,133 +2166,133 @@ index ch_bfe_sachplan_uebertragungsleitungen_kraft index ch_bfe_energieforschung : ch_astra_ivs_nat { source = src_ch_bfe_energieforschung - path = /var/lib/sphinxsearch/data/index/ch_bfe_energieforschung + path = /var/lib/manticore/data/index/ch_bfe_energieforschung } index ch_astra_wanderland : ch_astra_ivs_nat { source = src_ch_astra_wanderland - path = /var/lib/sphinxsearch/data/index/ch_astra_wanderland + path = /var/lib/manticore/data/index/ch_astra_wanderland } index ch_astra_veloland : ch_astra_ivs_nat { source = src_ch_astra_veloland - path = /var/lib/sphinxsearch/data/index/ch_astra_veloland + path = /var/lib/manticore/data/index/ch_astra_veloland } index ch_astra_skatingland : ch_astra_ivs_nat { source = src_ch_astra_skatingland - path = /var/lib/sphinxsearch/data/index/ch_astra_skatingland + path = /var/lib/manticore/data/index/ch_astra_skatingland } index ch_astra_mountainbikeland : ch_astra_ivs_nat { source = src_ch_astra_mountainbikeland - path = /var/lib/sphinxsearch/data/index/ch_astra_mountainbikeland + path = /var/lib/manticore/data/index/ch_astra_mountainbikeland } index ch_astra_wanderland_sperrungen_umleitungen : ch_astra_ivs_nat { source = src_ch_astra_wanderland_sperrungen_umleitungen - path = /var/lib/sphinxsearch/data/index/ch_astra_wanderland_sperrungen_umleitungen + path = /var/lib/manticore/data/index/ch_astra_wanderland_sperrungen_umleitungen } index ch_astra_veloland_sperrungen_umleitungen : ch_astra_ivs_nat { source = src_ch_astra_veloland_sperrungen_umleitungen - path = /var/lib/sphinxsearch/data/index/ch_astra_veloland_sperrungen_umleitungen + path = /var/lib/manticore/data/index/ch_astra_veloland_sperrungen_umleitungen } index ch_astra_skatingland_sperrungen_umleitungen : ch_astra_ivs_nat { source = src_ch_astra_skatingland_sperrungen_umleitungen - path = /var/lib/sphinxsearch/data/index/ch_astra_skatingland_sperrungen_umleitungen + path = /var/lib/manticore/data/index/ch_astra_skatingland_sperrungen_umleitungen } index ch_astra_mountainbikeland_sperrungen_umleitungen : ch_astra_ivs_nat { source = src_ch_astra_mountainbikeland_sperrungen_umleitungen - path = /var/lib/sphinxsearch/data/index/ch_astra_mountainbikeland_sperrungen_umleitungen + path = /var/lib/manticore/data/index/ch_astra_mountainbikeland_sperrungen_umleitungen } index ch_swisstopo_schneeschuhwandern : ch_astra_ivs_nat { source = src_ch_swisstopo_schneeschuhwandern - path = /var/lib/sphinxsearch/data/index/ch_swisstopo_schneeschuhwandern + path = /var/lib/manticore/data/index/ch_swisstopo_schneeschuhwandern } index ch_astra_schwerverunfallte_kanton_alkohol : ch_astra_ivs_nat { source = src_ch_astra_schwerverunfallte_kanton_alkohol - path = /var/lib/sphinxsearch/data/index/ch_astra_schwerverunfallte_kanton_alkohol + path = /var/lib/manticore/data/index/ch_astra_schwerverunfallte_kanton_alkohol } index ch_astra_schwerverunfallte_kanton_geschwindigkeit : ch_astra_ivs_nat { source = src_ch_astra_schwerverunfallte_kanton_geschwindigkeit - path = /var/lib/sphinxsearch/data/index/ch_astra_schwerverunfallte_kanton_geschwindigkeit + path = /var/lib/manticore/data/index/ch_astra_schwerverunfallte_kanton_geschwindigkeit } index ch_astra_schwerverunfallte_kanton_jahresvergleich : ch_astra_ivs_nat { source = src_ch_astra_schwerverunfallte_kanton_jahresvergleich - path = /var/lib/sphinxsearch/data/index/ch_astra_schwerverunfallte_kanton_jahresvergleich + path = /var/lib/manticore/data/index/ch_astra_schwerverunfallte_kanton_jahresvergleich } index ch_astra_schwerverunfallte_kanton_pro_einwohner : ch_astra_ivs_nat { source = src_ch_astra_schwerverunfallte_kanton_pro_einwohner - path = /var/lib/sphinxsearch/data/index/ch_astra_schwerverunfallte_kanton_pro_einwohner + path = /var/lib/manticore/data/index/ch_astra_schwerverunfallte_kanton_pro_einwohner } index ch_astra_nationalstrassenachsen : ch_astra_ivs_nat { source = src_ch_astra_nationalstrassenachsen - path = /var/lib/sphinxsearch/data/index/ch_astra_nationalstrassenachsen + path = /var/lib/manticore/data/index/ch_astra_nationalstrassenachsen } index ch_bfe_fernwaerme_angebot : ch_astra_ivs_nat { source = src_ch_bfe_fernwaerme_angebot - path = /var/lib/sphinxsearch/data/index/ch_bfe_fernwaerme_angebot + path = /var/lib/manticore/data/index/ch_bfe_fernwaerme_angebot } index ch_bfe_biomasse_verholzt : ch_astra_ivs_nat { source = src_ch_bfe_biomasse_verholzt - path = /var/lib/sphinxsearch/data/index/ch_bfe_biomasse_verholzt + path = /var/lib/manticore/data/index/ch_bfe_biomasse_verholzt } index ch_bfe_biomasse_nicht_verholzt : ch_astra_ivs_nat { source = src_ch_bfe_biomasse_nicht_verholzt - path = /var/lib/sphinxsearch/data/index/ch_bfe_biomasse_nicht_verholzt + path = /var/lib/manticore/data/index/ch_bfe_biomasse_nicht_verholzt } index ch_bfe_kehrichtverbrennungsanlagen : ch_astra_ivs_nat { source = src_ch_bfe_kehrichtverbrennungsanlagen - path = /var/lib/sphinxsearch/data/index/ch_bfe_kehrichtverbrennungsanlagen + path = /var/lib/manticore/data/index/ch_bfe_kehrichtverbrennungsanlagen } index ch_bfe_sachplan_geologie_tiefenlager_1 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_geologie_tiefenlager_1 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_geologie_tiefenlager_1 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_geologie_tiefenlager_1 } index ch_bfe_sachplan_geologie_tiefenlager_2 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_geologie_tiefenlager_2 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_geologie_tiefenlager_2 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_geologie_tiefenlager_2 } index ch_bfe_sachplan_geologie_tiefenlager_3 : ch_astra_ivs_nat { source = src_ch_bfe_sachplan_geologie_tiefenlager_3 - path = /var/lib/sphinxsearch/data/index/ch_bfe_sachplan_geologie_tiefenlager_3 + path = /var/lib/manticore/data/index/ch_bfe_sachplan_geologie_tiefenlager_3 } index ch_bfe_sachplan_geologie_tiefenlager @@ -2306,47 +2306,47 @@ index ch_bfe_sachplan_geologie_tiefenlager index ch_bav_anlagen_schienengueterverkehr : ch_astra_ivs_nat { source = src_ch_bav_anlagen_schienengueterverkehr - path = /var/lib/sphinxsearch/data/index/ch_bav_anlagen_schienengueterverkehr + path = /var/lib/manticore/data/index/ch_bav_anlagen_schienengueterverkehr } index ch_bfe_biogasanlagen : ch_astra_ivs_nat { source = src_ch_bfe_biogasanlagen - path = /var/lib/sphinxsearch/data/index/ch_bfe_biogasanlagen + path = /var/lib/manticore/data/index/ch_bfe_biogasanlagen } index ch_bfe_erneuerbarheizen : ch_astra_ivs_nat { source = src_ch_bfe_erneuerbarheizen - path = /var/lib/sphinxsearch/data/index/ch_bfe_erneuerbarheizen + path = /var/lib/manticore/data/index/ch_bfe_erneuerbarheizen } index ch_bfe_erneuerbarheizen_mehrfamilienhaeuser : ch_astra_ivs_nat { source = src_ch_bfe_erneuerbarheizen_mehrfamilienhaeuser - path = /var/lib/sphinxsearch/data/index/ch_bfe_erneuerbarheizen_mehrfamilienhaeuser + path = /var/lib/manticore/data/index/ch_bfe_erneuerbarheizen_mehrfamilienhaeuser } index ch_bfe_komo_projekte : ch_astra_ivs_nat { source = src_ch_bfe_komo_projekte - path = /var/lib/sphinxsearch/data/index/ch_bfe_komo_projekte + path = /var/lib/manticore/data/index/ch_bfe_komo_projekte } index ch_bfe_thermische_netze : ch_astra_ivs_nat { source = src_ch_bfe_thermische_netze - path = /var/lib/sphinxsearch/data/index/ch_bfe_thermische_netze + path = /var/lib/manticore/data/index/ch_bfe_thermische_netze } index ch_bfe_waermepotential_gewaesser : ch_astra_ivs_nat { source = src_ch_bfe_waermepotential_gewaesser - path = /var/lib/sphinxsearch/data/index/ch_bfe_waermepotential_gewaesser + path = /var/lib/manticore/data/index/ch_bfe_waermepotential_gewaesser } index ch_bazl_gebietsbeschraenkungen_drohnen : ch_astra_ivs_nat { source = src_ch_bazl_gebietsbeschraenkungen_drohnen - path = /var/lib/sphinxsearch/data/index/ch_bazl_gebietsbeschraenkungen_drohnen + path = /var/lib/manticore/data/index/ch_bazl_gebietsbeschraenkungen_drohnen } diff --git a/conf/vbs.conf.part b/conf/vbs.conf.part index cadb1fe4..e5ea5e23 100644 --- a/conf/vbs.conf.part +++ b/conf/vbs.conf.part @@ -171,7 +171,7 @@ index ch_babs_kulturgueter type = plain dict=crc source = src_ch_babs_kulturgueter - path = /var/lib/sphinxsearch/data/index/ch_babs_kulturgueter + path = /var/lib/manticore/data/index/ch_babs_kulturgueter min_infix_len = 2 expand_keywords = 1 } @@ -179,47 +179,47 @@ index ch_babs_kulturgueter index ch_vbs_kataster_belasteter_standorte_militaer : ch_babs_kulturgueter { source = src_ch_vbs_kataster_belasteter_standorte_militaer - path = /var/lib/sphinxsearch/data/index/ch_vbs_kataster_belasteter_standorte_militaer + path = /var/lib/manticore/data/index/ch_vbs_kataster_belasteter_standorte_militaer } index ch_vbs_armeelogistikcenter : ch_babs_kulturgueter { source = src_ch_vbs_armeelogistikcenter - path = /var/lib/sphinxsearch/data/index/ch_vbs_armeelogistikcenter + path = /var/lib/manticore/data/index/ch_vbs_armeelogistikcenter } index ch_vbs_waldschadenkarte : ch_babs_kulturgueter { source = src_ch_vbs_waldschadenkarte - path = /var/lib/sphinxsearch/data/index/ch_vbs_waldschadenkarte + path = /var/lib/manticore/data/index/ch_vbs_waldschadenkarte } index ch_vbs_bundestankstellen_bebeco : ch_babs_kulturgueter { source = src_ch_vbs_bundestankstellen_bebeco - path = /var/lib/sphinxsearch/data/index/ch_vbs_bundestankstellen_bebeco + path = /var/lib/manticore/data/index/ch_vbs_bundestankstellen_bebeco } index ch_vbs_logistikraeume_armeelogistikcenter : ch_babs_kulturgueter { source = src_ch_vbs_logistikraeume_armeelogistikcenter - path = /var/lib/sphinxsearch/data/index/ch_vbs_logistikraeume_armeelogistikcenter + path = /var/lib/manticore/data/index/ch_vbs_logistikraeume_armeelogistikcenter } index ch_vbs_retablierungsstellen : ch_babs_kulturgueter { source = src_ch_vbs_retablierungsstellen - path = /var/lib/sphinxsearch/data/index/ch_vbs_retablierungsstellen + path = /var/lib/manticore/data/index/ch_vbs_retablierungsstellen } index ch_vbs_schiessanzeigen : ch_babs_kulturgueter { source = src_ch_vbs_schiessanzeigen - path = /var/lib/sphinxsearch/data/index/ch_vbs_schiessanzeigen + path = /var/lib/manticore/data/index/ch_vbs_schiessanzeigen } index ch_vbs_armee_kriegsdenkmaeler : ch_babs_kulturgueter { source = src_ch_vbs_armee_kriegsdenkmaeler - path = /var/lib/sphinxsearch/data/index/ch_vbs_armee_kriegsdenkmaeler + path = /var/lib/manticore/data/index/ch_vbs_armee_kriegsdenkmaeler } diff --git a/dev_sphinx.env b/dev_sphinx.env new file mode 100644 index 00000000..d2fd4675 --- /dev/null +++ b/dev_sphinx.env @@ -0,0 +1,30 @@ +# service-search-sphinx +# --------------------- +SERVICE_SEARCH_SPHINX_DOCKER_IMAGE_TAG=develop-2022-09-07.latest + +SPHINX_PORT=9312 +SPHINX_EFS=/var/local/geodata/service-sphinxsearch/dev/index/ +PGHOST=pg-geodata-master.bgdi.ch +PGPORT=5432 +DBSTAGING=dev + +# service-search-wsgi +# ------------------- +SERVICE_SEARCH_WSGI_DOCKER_IMAGE_TAG=develop.latest +SEARCH_WORKERS=3 + +BOD_DB_NAME=bod_dev +BOD_DB_HOST=pg-geodata-replica.bgdi.ch +BOD_DB_PORT=5432 + +CACHE_DEFAULT_TIMEOUT=1800 # 30 min + +SEARCH_SPHINX_HOST=search-sphinx +SEARCH_SPHINX_PORT=9312 +SEARCH_SPHINX_TIMEOUT=5 + +GEODATA_STAGING=dev + +LOGGING_CFG=/log-cfg/flask-logging-dev.yaml + +HTTP_PORT=80 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..efb34cbf --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,27 @@ +version: "3.8" +services: + search-manticore: + build: . + volumes: + - ${SPHINX_EFS:?err}:/var/lib/manticore/index_efs/ + - sphinx_index:/var/lib/manticore/index/ + - container_probes:/var/lib/container_probes + env_file: + - dev_sphinx.env + environment: + - PGUSER=${BOD_DB_USER:?err} + - PGPASS=${BOD_DB_PASSWD:?err} + - CPUS=${CPUS:?err} + healthcheck: + test: ./checker.sh + interval: 3s + timeout: 1s + retries: 3 + start_period: 3600s + restart: always + +volumes: + sphinx_index: + external: false + container_probes: + external: false diff --git a/scripts/docker-cmd.sh b/scripts/docker-cmd.sh index d04b5890..b28542e6 100755 --- a/scripts/docker-cmd.sh +++ b/scripts/docker-cmd.sh @@ -12,9 +12,9 @@ green='\e[0;32m' red='\e[0;31m' NC='\e[0m' # No Color -SPHINXINDEX_VOLUME="/var/lib/sphinxsearch/data/index/" -SPHINXINDEX_EFS="/var/lib/sphinxsearch/data/index_efs/" -SPHINXCONFIG="/etc/sphinxsearch/sphinx.conf" +SPHINXINDEX_VOLUME="/var/lib/manticore/data/index/" +SPHINXINDEX_EFS="/var/lib/manticore/data/index_efs/" +SPHINXCONFIG="/etc/manticore/manticore.conf" # index arrays config, filesystem and orphaned mapfile -t array_config < <(grep -E "^[^#]+ path" "${SPHINXCONFIG}" | awk -F"=" '{print $2}' | sed -n -e 's|^.*/||p') diff --git a/scripts/docker-entry.sh b/scripts/docker-entry.sh index fcce0e20..c050c693 100755 --- a/scripts/docker-entry.sh +++ b/scripts/docker-entry.sh @@ -3,18 +3,16 @@ set -euo pipefail source checker.sh -# geodata has to have rw access on probe mountpoint -chown -R geodata:geodata "${MOUNT}" # build sphinx config with current environment -cat conf/*.part > conf/sphinx.conf.in -envsubst < conf/sphinx.conf.in > conf/sphinx.conf +cat conf/*.part > conf/manticore.conf.in +envsubst < conf/manticore.conf.in > conf/manticore.conf # copy sphinx config and wordforms from github / image content into docker volume -cp -f conf/sphinx.conf /etc/sphinxsearch/sphinx.conf -cp -f conf/wordforms_main.txt /etc/sphinxsearch/wordforms_main.txt +cp -f conf/manticore.conf /etc/manticore/manticore.conf +cp -f conf/wordforms_main.txt /etc/manticore/wordforms_main.txt # always remove lock files from mounted shared storage -rm -rf /var/lib/sphinxsearch/data/index/*.spl 2> /dev/null || : +rm -rf /var/lib/manticore/data/index/*.spl 2> /dev/null || : -exec gosu geodata "$@" +exec "$@" \ No newline at end of file diff --git a/scripts/index-sync-rotate.sh b/scripts/index-sync-rotate.sh index bc08c669..80e3ab4c 100755 --- a/scripts/index-sync-rotate.sh +++ b/scripts/index-sync-rotate.sh @@ -2,8 +2,8 @@ # executed as cronjob every 15 minutes # shellcheck disable=SC2068 set -eu -SPHINX_EFS="/var/lib/sphinxsearch/data/index_efs/" -SPHINX_VOLUME="/var/lib/sphinxsearch/data/index/" +SPHINX_EFS="/var/lib/manticore/data/index_efs/" +SPHINX_VOLUME="/var/lib/manticore/data/index/" SPHINXCONFIG="/etc/sphinxsearch/sphinx.conf" RSYNC_INCLUDE="/tmp/include.txt" LOG_PREFIX="[ $$ - $(date +"%F %T")] " From d8e5ed8618ea3a4a299cc0c29b2aafd4541df3fe Mon Sep 17 00:00:00 2001 From: Marcel Clausen Date: Thu, 8 Sep 2022 22:10:54 +0200 Subject: [PATCH 2/9] add missing packages fix paths --- Dockerfile | 28 +++++++++++++++------------- Makefile | 2 +- README.md | 14 +++++++------- conf/00_db.conf.part | 9 +++------ conf/edi.conf.part | 2 +- docker-compose.yml | 4 ++-- scripts/check-config-local.sh | 4 ++-- scripts/docker-cmd.sh | 10 +++++----- scripts/docker-entry.sh | 4 ++-- scripts/index-sync-rotate.sh | 2 +- scripts/pg2sphinx.sh | 4 ++-- scripts/pg2sphinx_trigger.py | 2 +- 12 files changed, 42 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index cdb3a0d1..2078e4c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,19 +3,20 @@ FROM manticoresearch/manticore:5.0.2 as manticore_base RUN apt-get update && \ apt-get install -y \ cron \ - gosu \ - rsync \ + gettext \ + libpq-dev \ + python3-pip \ + rsync && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ - gosu nobody true && \ # set up cron for non root user chmod gu+rw /var/run && \ chmod gu+s /usr/sbin/cron - # set up geodata, file permissions, copy files and run container as geodata -FROM sphinxsearch_base as sphinxsearch_geodata +# set up geodata, file permissions, copy files and run container as geodata +FROM manticore_base as manticore_geodata - # add geodata user, same uid/gid as the EFS owner is needed here +# add geodata user, same uid/gid as the EFS owner is needed here RUN groupadd -r geodata -g 2500 && \ useradd -u 2500 -r -g geodata -s /sbin/nologin --create-home geodata && \ # create mountpoint folders with geodata ownership @@ -23,24 +24,25 @@ RUN groupadd -r geodata -g 2500 && \ install -o geodata -p geodata -d /var/lib/manticore/data/index_efs/ && \ install -o geodata -p geodata -d /var/lib/container_probes/ && \ # TODO: redirect logs to stdout # only working if container is running as root - # ln -sv /dev/stdout /var/log/sphinxsearch/query.log && \ - # ln -sv /dev/stdout /var/log/sphinxsearch/searchd.log && \ + # ln -sv /dev/stdout /var/log/manticore/query.log && \ + # ln -sv /dev/stdout /var/log/manticore/searchd.log && \ # change ownerships to geodata which will run the service or the maintenance scripts # and mount the efs folder - chown -R geodata:geodata /var/run/sphinxsearch/ && \ - chown -R geodata:geodata /var/log/sphinxsearch/ && \ - chown -R geodata:geodata /etc/sphinxsearch && \ + chown -R geodata:geodata /var/run/manticore/ && \ + chown -R geodata:geodata /var/log/manticore/ && \ + chown -R geodata:geodata /etc/manticoresearch && \ + chown -R geodata:geodata /var/run/mysqld && \ # install pip3 psycopg2, python3.9 does not (yet) support python3-psycopg2 package gosu geodata pip3 install psycopg2-binary==2.9.2 -FROM sphinxsearch_geodata +FROM manticore_geodata # copy sphinxsearch config and maintenance code COPY --chown=geodata:geodata scripts/docker-* scripts/index-sync-rotate.sh scripts/pg2sphinx_trigger.py scripts/checker.sh / COPY --chown=geodata:geodata conf /conf/ USER geodata - +WORKDIR / # default CMD ENTRYPOINT [ "/docker-entry.sh" ] # run service with the following script if no CMDs are sent to docker run / default diff --git a/Makefile b/Makefile index 0e63cd9f..53107f33 100644 --- a/Makefile +++ b/Makefile @@ -222,7 +222,7 @@ endif .PHONY: check-config-local check-config-local: dockerbuild config - $(DOCKER_EXEC_LOCAL) indextool --checkconfig -c /etc/sphinxsearch/sphinx.conf | grep "config valid" || $(DOCKER_EXEC_LOCAL) indextool --checkconfig -c /etc/sphinxsearch/sphinx.conf + $(DOCKER_EXEC_LOCAL) indextool --checkconfig -c /etc/manticoresearch/manticore.conf | grep "config valid" || $(DOCKER_EXEC_LOCAL) indextool --checkconfig -c /etc/manticoresearch/manticore.conf DOCKER_EXEC_LOCAL="$(DOCKER_EXEC_LOCAL)" ./scripts/check-config-local.sh diff --git a/README.md b/README.md index 52ef653c..4622d032 100644 --- a/README.md +++ b/README.md @@ -36,11 +36,11 @@ $ sudo -u root systemctl start sphinxsearch Object | Path ------------------|-----------------------------------| -**PID:** | /var/run/sphinxsearch.pid | -**Searchd Log** | /var/log/sphinxsearch/searchd.log | -**Query Log:** | /var/log/sphinxsearch/query.log | +**PID:** | /var/run/manticore.pid | +**Searchd Log** | /var/log/manticore/searchd.log | +**Query Log:** | /var/log/manticore/query.log | **Indexes:** | /var/lib/manticore/data/index/ | -**Configuration:**| /etc/sphinxsearch/sphinx.conf | +**Configuration:**| /etc/manticoresearch/manticore.conf | ### Search Daemon: @@ -59,7 +59,7 @@ $ sudo -u root systemctl start sphinxsearch #### validate config ``` -$ indextool --checkconfig -c /etc/sphinxsearch/sphinx.conf +$ indextool --checkconfig -c /etc/manticoresearch/manticore.conf ``` ### Rebuild / update Indexes: @@ -67,13 +67,13 @@ $ indextool --checkconfig -c /etc/sphinxsearch/sphinx.conf There will be a service restart after every index ```bash -$ sudo -u sphinxsearch indexer --verbose --rotate --sighup-each --config /etc/sphinxsearch/sphinx.conf index1 index2 index3 +$ sudo -u sphinxsearch indexer --verbose --rotate --sighup-each --config /etc/manticoresearch/manticore.conf index1 index2 index3 ``` #### rebuild / build all indexes ```bash -$ sudo -u sphinxsearch indexer --verbose --rotate --sighup-each --config /etc/sphinxsearch/sphinx.conf --all +$ sudo -u sphinxsearch indexer --verbose --rotate --sighup-each --config /etc/manticoresearch/manticore.conf --all ``` multithread indexer is not possible: http://sphinxsearch.com/forum/view.html?id=3936a diff --git a/conf/00_db.conf.part b/conf/00_db.conf.part index 7d447347..496ee243 100644 --- a/conf/00_db.conf.part +++ b/conf/00_db.conf.part @@ -41,12 +41,9 @@ searchd listen = /var/run/mysqld/mysqld.sock:mysql41 listen = 127.0.0.1:9312 listen = 9308:http - # syslog -> logstash -> kibana - #log = /var/log/sphinxsearch/searchd.log - # syslog -> logstash -> kibana - #query_log = /var/log/sphinxsearch/query.log - #pid_file = /var/run/sphinxsearch/searchd.pid - pid_file = manticoresearch.pid + log = /var/log/manticore/searchd.log + query_log = /var/log/manticore/query.log + pid_file = /var/run/manticore/searchd.pid # mysql listener listen = localhost:9306:mysql41 preopen_indexes = 0 diff --git a/conf/edi.conf.part b/conf/edi.conf.part index bd9a4b3d..c3918226 100644 --- a/conf/edi.conf.part +++ b/conf/edi.conf.part @@ -166,7 +166,7 @@ index ch_bfs_gebaeude_wohnungs_register : ch_bfs_generalisierte_grenzen_agglomer min_infix_len = 1 source = src_ch_bfs_gebaeude_wohnungs_register path = /var/lib/manticore/data/index/ch_bfs_gebaeude_wohnungs_register - ondisk_attrs = 0 + access_plain_attrs = mmap = 0 } index ch_bak_bundesinventar_schuetzenswerte_ortsbilder : ch_bfs_generalisierte_grenzen_agglomerationen_g1 diff --git a/docker-compose.yml b/docker-compose.yml index efb34cbf..9feb5f37 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,8 @@ services: search-manticore: build: . volumes: - - ${SPHINX_EFS:?err}:/var/lib/manticore/index_efs/ - - sphinx_index:/var/lib/manticore/index/ + - ${SPHINX_EFS:?err}:/var/lib/manticore/data/index_efs/ + - sphinx_index:/var/lib/manticore/data/index/ - container_probes:/var/lib/container_probes env_file: - dev_sphinx.env diff --git a/scripts/check-config-local.sh b/scripts/check-config-local.sh index 3553bc38..1b1d68c8 100755 --- a/scripts/check-config-local.sh +++ b/scripts/check-config-local.sh @@ -10,9 +10,9 @@ if [ "$BRANCH_NAME" != '(no branch)' ]; then # check queriesi echo "checking queries ..." ERROR=$( - for database in $(${DOCKER_EXEC_LOCAL} python3 pg2sphinx_trigger.py -s /etc/sphinxsearch/sphinx.conf -c list | awk '$2 ~ /->/ {print $3}' | sort | uniq); do + for database in $(${DOCKER_EXEC_LOCAL} python3 pg2sphinx_trigger.py -s /etc/manticoresearch/manticore.conf -c list | awk '$2 ~ /->/ {print $3}' | sort | uniq); do database="${database%%[[:cntrl:]]}" - ${DOCKER_EXEC_LOCAL} python3 pg2sphinx_trigger.py -s /etc/sphinxsearch/sphinx.conf -c list -d "${database}." | grep -i ERROR -a4 || continue + ${DOCKER_EXEC_LOCAL} python3 pg2sphinx_trigger.py -s /etc/manticoresearch/manticore.conf -c list -d "${database}." | grep -i ERROR -a4 || continue done ) [ -z "${ERROR}" ] || { echo -e "$(tput setaf 1)Nothing has been commited because of the following error in the query:\n${ERROR} $(tput sgr0)"; exit 1; } diff --git a/scripts/docker-cmd.sh b/scripts/docker-cmd.sh index b28542e6..969ef598 100755 --- a/scripts/docker-cmd.sh +++ b/scripts/docker-cmd.sh @@ -14,7 +14,7 @@ NC='\e[0m' # No Color SPHINXINDEX_VOLUME="/var/lib/manticore/data/index/" SPHINXINDEX_EFS="/var/lib/manticore/data/index_efs/" -SPHINXCONFIG="/etc/manticore/manticore.conf" +SPHINXCONFIG="/etc/manticoresearch/manticore.conf" # index arrays config, filesystem and orphaned mapfile -t array_config < <(grep -E "^[^#]+ path" "${SPHINXCONFIG}" | awk -F"=" '{print $2}' | sed -n -e 's|^.*/||p') @@ -29,7 +29,7 @@ for index in "${array_orphaned[@]}"; do # skip .new files, we need them to sighup searchd / rotate index updates if [[ ! $index == *.new ]]; then echo -e "\\t${red} deleting orphaned index ${index} from filesystem. ${NC}" - rm -rf "${SPHINXINDEX_EFS}${index}".* + #rm -rf "${SPHINXINDEX_EFS}${index}".* fi done @@ -41,10 +41,10 @@ rsync --update --delete -av --exclude "*.tmp.*" --stats ${SPHINXINDEX_EFS} ${SPH # start cron service as geodata user only if container is started in service mode (no cmd has been passed to docker run) # cron will sync every n minutes EFS to Docker volume and send a SIGHUP to searchd service -service cron start || exit 1 -crontab < docker-crontab +#service cron start || exit 1 +#crontab < docker-crontab # starting the searchd service # will load the sphinx indexes from EFS --sync--> Volume --> into memory echo -e "${green}starting searchd service ...${NC}" -/usr/bin/searchd --nodetach "$@" \ No newline at end of file +/usr/bin/searchd --nodetach --logdebug "$@" \ No newline at end of file diff --git a/scripts/docker-entry.sh b/scripts/docker-entry.sh index c050c693..e3ee0628 100755 --- a/scripts/docker-entry.sh +++ b/scripts/docker-entry.sh @@ -9,8 +9,8 @@ cat conf/*.part > conf/manticore.conf.in envsubst < conf/manticore.conf.in > conf/manticore.conf # copy sphinx config and wordforms from github / image content into docker volume -cp -f conf/manticore.conf /etc/manticore/manticore.conf -cp -f conf/wordforms_main.txt /etc/manticore/wordforms_main.txt +cp -f conf/manticore.conf /etc/manticoresearch/manticore.conf +cp -f conf/wordforms_main.txt /etc/manticoresearch/wordforms_main.txt # always remove lock files from mounted shared storage rm -rf /var/lib/manticore/data/index/*.spl 2> /dev/null || : diff --git a/scripts/index-sync-rotate.sh b/scripts/index-sync-rotate.sh index 80e3ab4c..a080238c 100755 --- a/scripts/index-sync-rotate.sh +++ b/scripts/index-sync-rotate.sh @@ -4,7 +4,7 @@ set -eu SPHINX_EFS="/var/lib/manticore/data/index_efs/" SPHINX_VOLUME="/var/lib/manticore/data/index/" -SPHINXCONFIG="/etc/sphinxsearch/sphinx.conf" +SPHINXCONFIG="/etc/manticoresearch/manticore.conf" RSYNC_INCLUDE="/tmp/include.txt" LOG_PREFIX="[ $$ - $(date +"%F %T")] " diff --git a/scripts/pg2sphinx.sh b/scripts/pg2sphinx.sh index 04722fed..be274223 100755 --- a/scripts/pg2sphinx.sh +++ b/scripts/pg2sphinx.sh @@ -15,12 +15,12 @@ fi if [ -n "${DB:-}" ]; then # call pg2sphinx trigger with DATABASE pattern - ${DOCKER_EXEC} python3 pg2sphinx_trigger.py -s /etc/sphinxsearch/sphinx.conf -c update -d "${DB}" + ${DOCKER_EXEC} python3 pg2sphinx_trigger.py -s /etc/manticoresearch/manticore.conf -c update -d "${DB}" fi if [ -n "${INDEX:-}" ]; then # call pg2sphinx trigger with INDEX pattern - ${DOCKER_EXEC} python3 pg2sphinx_trigger.py -s /etc/sphinxsearch/sphinx.conf -c update -i "${INDEX}" + ${DOCKER_EXEC} python3 pg2sphinx_trigger.py -s /etc/manticoresearch/manticore.conf -c update -i "${INDEX}" fi echo "finished" diff --git a/scripts/pg2sphinx_trigger.py b/scripts/pg2sphinx_trigger.py index c18f6394..07d6bf2f 100755 --- a/scripts/pg2sphinx_trigger.py +++ b/scripts/pg2sphinx_trigger.py @@ -46,7 +46,7 @@ def pg_get_tables(sql_query, sql_db): if __name__ == '__main__': - SPHINXCONFIG = "/etc/sphinxsearch/sphinx.conf" + SPHINXCONFIG = "/etc/manticoresearch/manticore.conf" myenv = dict(os.environ) ################################ From ababeb6c28f58a922f649e3d6bf9da7e931eab72 Mon Sep 17 00:00:00 2001 From: Marcel Clausen Date: Thu, 8 Sep 2022 22:10:54 +0200 Subject: [PATCH 3/9] add missing packages fix paths --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2078e4c1..47e38eb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,10 @@ RUN apt-get update && \ cron \ gettext \ libpq-dev \ + manticore-converter \ python3-pip \ - rsync && \ + rsync \ + vim && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ # set up cron for non root user From 8a9a23d55a0282e6b05fa53e6184363126201c62 Mon Sep 17 00:00:00 2001 From: Marcel Clausen Date: Fri, 9 Sep 2022 07:49:12 +0200 Subject: [PATCH 4/9] first running version of manticore had to rebuild swisssearch indices --- Dockerfile | 2 +- conf/edi.conf.part | 2 +- scripts/docker-cmd.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47e38eb3..80bf829c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,4 +48,4 @@ WORKDIR / # default CMD ENTRYPOINT [ "/docker-entry.sh" ] # run service with the following script if no CMDs are sent to docker run / default -CMD ["/docker-cmd.sh"] +CMD ["/docker-cmd.sh"] \ No newline at end of file diff --git a/conf/edi.conf.part b/conf/edi.conf.part index c3918226..66b51cbf 100644 --- a/conf/edi.conf.part +++ b/conf/edi.conf.part @@ -166,7 +166,7 @@ index ch_bfs_gebaeude_wohnungs_register : ch_bfs_generalisierte_grenzen_agglomer min_infix_len = 1 source = src_ch_bfs_gebaeude_wohnungs_register path = /var/lib/manticore/data/index/ch_bfs_gebaeude_wohnungs_register - access_plain_attrs = mmap = 0 + access_plain_attrs = mmap } index ch_bak_bundesinventar_schuetzenswerte_ortsbilder : ch_bfs_generalisierte_grenzen_agglomerationen_g1 diff --git a/scripts/docker-cmd.sh b/scripts/docker-cmd.sh index 969ef598..fc7591e0 100755 --- a/scripts/docker-cmd.sh +++ b/scripts/docker-cmd.sh @@ -37,7 +37,7 @@ done rm ${SPHINXINDEX_VOLUME}*.spl 2> /dev/null || : # sync new and updated indexes from efs to volume, ignore ongoing index creation (*.tmp.* files) -rsync --update --delete -av --exclude "*.tmp.*" --stats ${SPHINXINDEX_EFS} ${SPHINXINDEX_VOLUME} || : +#rsync --update --delete -av --exclude "*.tmp.*" --stats ${SPHINXINDEX_EFS} ${SPHINXINDEX_VOLUME} || : # start cron service as geodata user only if container is started in service mode (no cmd has been passed to docker run) # cron will sync every n minutes EFS to Docker volume and send a SIGHUP to searchd service From 9dc117a0d3726b6a4b7a853512f60277eb5bbd47 Mon Sep 17 00:00:00 2001 From: Marcel Clausen Date: Fri, 9 Sep 2022 09:32:08 +0200 Subject: [PATCH 5/9] use dedicated manticore indexes activate sync from efs --- dev_sphinx.env | 3 ++- scripts/docker-cmd.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev_sphinx.env b/dev_sphinx.env index d2fd4675..5859a480 100644 --- a/dev_sphinx.env +++ b/dev_sphinx.env @@ -3,7 +3,8 @@ SERVICE_SEARCH_SPHINX_DOCKER_IMAGE_TAG=develop-2022-09-07.latest SPHINX_PORT=9312 -SPHINX_EFS=/var/local/geodata/service-sphinxsearch/dev/index/ +# use a bunch of indices that have been converted / re-indexed in manticore format +SPHINX_EFS=/var/local/efs-dev/geodata/service-sphinxsearch/dev/index_manticore_ltclm/ PGHOST=pg-geodata-master.bgdi.ch PGPORT=5432 DBSTAGING=dev diff --git a/scripts/docker-cmd.sh b/scripts/docker-cmd.sh index fc7591e0..52c3dbac 100755 --- a/scripts/docker-cmd.sh +++ b/scripts/docker-cmd.sh @@ -37,10 +37,11 @@ done rm ${SPHINXINDEX_VOLUME}*.spl 2> /dev/null || : # sync new and updated indexes from efs to volume, ignore ongoing index creation (*.tmp.* files) -#rsync --update --delete -av --exclude "*.tmp.*" --stats ${SPHINXINDEX_EFS} ${SPHINXINDEX_VOLUME} || : +rsync --update --delete -av --exclude "*.tmp.*" --stats ${SPHINXINDEX_EFS} ${SPHINXINDEX_VOLUME} || : # start cron service as geodata user only if container is started in service mode (no cmd has been passed to docker run) # cron will sync every n minutes EFS to Docker volume and send a SIGHUP to searchd service +# TODO: index-sync-rotate.sh has to be adapted first before activating the cronjob #service cron start || exit 1 #crontab < docker-crontab From 335c2b519c2b2c5a8fcfd5c135c69249a2c8b488 Mon Sep 17 00:00:00 2001 From: Marcel Clausen Date: Fri, 9 Sep 2022 09:46:12 +0200 Subject: [PATCH 6/9] add ulimits as proposed in manticore documentation add autoheal --- docker-compose.yml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9feb5f37..118f3c15 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,16 +2,24 @@ version: "3.8" services: search-manticore: build: . + env_file: + - dev_sphinx.env volumes: - ${SPHINX_EFS:?err}:/var/lib/manticore/data/index_efs/ - sphinx_index:/var/lib/manticore/data/index/ - container_probes:/var/lib/container_probes - env_file: - - dev_sphinx.env environment: - PGUSER=${BOD_DB_USER:?err} - PGPASS=${BOD_DB_PASSWD:?err} - CPUS=${CPUS:?err} + ulimits: + nproc: 65535 + nofile: + soft: 65535 + hard: 65535 + memlock: + soft: -1 + hard: -1 healthcheck: test: ./checker.sh interval: 3s @@ -19,7 +27,15 @@ services: retries: 3 start_period: 3600s restart: always - + auto-heal: + image: willfarrell/autoheal + environment: + AUTOHEAL_CONTAINER_LABEL: all + AUTOHEAL_INTERVAL: 10 + AUTOHEAL_START_PERIOD: 3600 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + restart: always volumes: sphinx_index: external: false From 76560336264f1807b0b97da8be6cc9ac2e731d50 Mon Sep 17 00:00:00 2001 From: Marcel Clausen Date: Mon, 12 Sep 2022 08:07:30 +0200 Subject: [PATCH 7/9] restore file deleted by mistake --- conf/search.conf.part | 479 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 479 insertions(+) create mode 100644 conf/search.conf.part diff --git a/conf/search.conf.part b/conf/search.conf.part new file mode 100644 index 00000000..795cd3ba --- /dev/null +++ b/conf/search.conf.part @@ -0,0 +1,479 @@ +## SOURCES + +source src_swisssearch : def_pqsql +{ + sql_attr_uint = num + sql_attr_uint = rank + sql_attr_uint = zoomlevel + sql_attr_string = label + sql_attr_string = objectclass + sql_attr_string = feature_id + sql_attr_string = origin + sql_attr_string = geom_st_box2d + sql_attr_string = geom_st_box2d_lv95 + sql_attr_float = x + sql_attr_float = y + sql_attr_float = x_lv95 + sql_attr_float = y_lv95 + sql_attr_float = lat + sql_attr_float = lon + sql_field_string = detail + sql_field_string = geom_quadindex +} + +source src_address : src_swisssearch +{ + sql_db=edi_${DBSTAGING} + sql_query = \ + SELECT bgdi_id AS id \ + , egid_edid::character varying(15) AS feature_id \ + , remove_accents(concat_ws(' ', replace(concat(array_to_string(strname, ' '), ' ', deinr),'',deinr), dplz4, dplzname, ggdenr, ggdename, 'ch', gdekt)) as detail \ + , concat(replace(concat(array_to_string(strname, ' | '), ' ', deinr),'',deinr), ' ', dplz4, ' ', dplzname,'') as label \ + , NULL as objectclass \ + , 'address'::text AS origin \ + , geom_quadindex \ + , box2d(st_transform(the_geom, 21781)) AS geom_st_box2d \ + , box2d(st_transform(the_geom, 2056)) AS geom_st_box2d_lv95 \ + , 7::integer as rank \ + , st_y(st_transform(the_geom, 21781)) AS x \ + , st_x(st_transform(the_geom, 21781)) AS y \ + , st_x(st_transform(the_geom, 2056)) AS y_lv95 \ + , st_y(st_transform(the_geom, 2056)) AS x_lv95 \ + , st_y(st_transform(the_geom,4326)) as lat \ + , st_x(st_transform(the_geom,4326)) as lon \ + , NULLIF(regexp_replace(deinr::text, '[^0-9]'::text, ''::text, 'g'::text), ''::text)::integer AS num \ + , 10 as zoomlevel \ + FROM bfs.gwr_chsdi +} + +source src_parcel : src_swisssearch +{ + sql_db=stopo_${DBSTAGING} + sql_query = \ + SELECT id \ + , NULL::text as feature_id \ + , detail \ + , NULL as objectclass \ + , label \ + , origin \ + , bgdi_quadindex as geom_quadindex \ + , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ + , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ + , 10::integer as rank \ + , x \ + , y \ + , st_x(st_transform(the_geom_point,2056)) as y_lv95 \ + , st_y(st_transform(the_geom_point,2056)) as x_lv95 \ + , st_y(st_transform(the_geom_point,4326)) as lat \ + , st_x(st_transform(the_geom_point,4326)) as lon \ + , num \ + , 10 as zoomlevel \ + from vd.parzellen_sphinx +} + +source src_swissnames3d : src_swisssearch +{ + sql_db=stopo_${DBSTAGING} + sql_query = \ + WITH swissnames_search as \ + ( \ + select * FROM \ + ( \ + SELECT \ + uuid::text as feature_id \ + , 6::integer as rank \ + , remove_accents(concat_ws(' ', name, (regexp_matches(bgdi_label_sphinx, E' - (.*)$'))[1])) as name \ + , objektklasse as objectclass \ + , bgdi_label_sphinx \ + , bgdi_quadindex \ + , the_geom \ + , st_y(st_transform(st_geometryn(the_geom,1), 21781)) as x \ + , st_x(st_transform(st_geometryn(the_geom,1), 21781)) as y \ + , st_y(st_transform(st_geometryn(the_geom,1), 2056)) as x_lv95 \ + , st_x(st_transform(st_geometryn(the_geom,1), 2056)) as y_lv95 \ + , st_y(st_transform(st_geometryn(the_geom,1),4326)) as lat \ + , st_x(st_transform(st_geometryn(the_geom,1),4326)) as lon \ + , 1 as num \ + , 9 as zoomlevel \ + , objektart \ + FROM tlm.swissnames3d_point \ + UNION ALL \ + SELECT \ + uuid::text as feature_id \ + , 6::integer as rank \ + , remove_accents(concat_ws(' ', name, (regexp_matches(bgdi_label_sphinx, E' - (.*)$'))[1])) as name \ + , objektklasse as objectclass \ + , bgdi_label_sphinx \ + , bgdi_quadindex \ + , the_geom \ + , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as x \ + , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as y \ + , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as x_lv95 \ + , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as y_lv95 \ + , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \ + , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lon \ + , 1 as num \ + , 9 as zoomlevel \ + , objektart \ + FROM tlm.swissnames3d_line \ + UNION ALL \ + SELECT \ + uuid::text as feature_id \ + , 6::integer as rank \ + , remove_accents(concat_ws(' ', name, (regexp_matches(bgdi_label_sphinx, E' - (.*)$'))[1])) as name \ + , objektklasse as objectclass \ + , bgdi_label_sphinx \ + , bgdi_quadindex \ + , the_geom \ + , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as x \ + , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as y \ + , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as x_lv95 \ + , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as y_lv95 \ + , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \ + , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lon \ + , 1 as num \ + , 9 as zoomlevel \ + , objektart \ + FROM tlm.swissnames3d_poly \ + WHERE objektart != 'Ort' \ + UNION ALL \ + SELECT \ + uuid::text as feature_id \ + , 5::integer as rank \ + , remove_accents(concat_ws(' ', name, (regexp_matches(bgdi_label_sphinx, E' - (.*)$'))[1])) as name \ + , objektklasse as objectclass \ + , bgdi_label_sphinx \ + , bgdi_quadindex \ + , the_geom \ + , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as x \ + , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 21781)) as y \ + , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as x_lv95 \ + , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)), 2056)) as y_lv95 \ + , st_y(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lat \ + , st_x(st_transform(st_ClosestPoint(the_geom,st_centroid(the_geom)),4326)) as lon \ + , 1 as num \ + , 9 as zoomlevel \ + , objektart \ + FROM tlm.swissnames3d_poly \ + WHERE objektart = 'Ort' \ + ) sub \ + WHERE objektart not like 'Haltestelle%' \ + ) \ + select distinct on (feature_id, detail) row_number() OVER(ORDER BY 1 asc) as id , * FROM \ + ( \ + SELECT \ + coalesce(b.feature_id,s.feature_id) as feature_id, \ + remove_accents(coalesce(b.name,s.name)) as detail, \ + coalesce(b.objektklasse ,s.objectclass) as objectclass, \ + coalesce(b.bgdi_label_sphinx,s.bgdi_label_sphinx) as label, \ + 'gazetteer' as origin, \ + coalesce(b.bgdi_quadindex,s.bgdi_quadindex) as geom_quadindex, \ + box2d(st_transform(coalesce(b.the_geom,s.the_geom), 21781)) as geom_st_box2d, \ + box2d(st_transform(coalesce(b.the_geom,s.the_geom), 2056)) as geom_st_box2d_lv95, \ + coalesce(b.rank,s.rank) as rank, \ + coalesce(b.x,s.x) as x, \ + coalesce(b.y,s.y) as y, \ + coalesce(b.x_lv95,s.x_lv95) as x_lv95, \ + coalesce(b.y_lv95,s.y_lv95) as y_lv95, \ + coalesce(b.lat,s.lat) as lat, \ + coalesce(b.lon,s.lon) as lon, \ + 1 as num, \ + coalesce(b.zoomlevel,s.zoomlevel) as zoomlevel \ + FROM swissnames_search s \ + left outer join tlm.dkm_search b ON s.feature_id = b.feature_id \ + UNION ALL \ + SELECT \ + b.feature_id as feature_id, \ + remove_accents(b.name) as detail, \ + remove_accents(b.objektklasse) as objectclass, \ + b.bgdi_label_sphinx as label, \ + 'gazetteer' as origin, \ + b.bgdi_quadindex as geom_quadindex, \ + box2d(st_transform(b.the_geom, 21781)) as geom_st_box2d, \ + box2d(st_transform(b.the_geom, 2056)) as geom_st_box2d_lv95, \ + b.rank as rank, \ + b.x as x, \ + b.y as y, \ + b.x_lv95 as x_lv95, \ + b.y_lv95 as y_lv95, \ + b.lat as lat, \ + b.lon as lon, \ + 1 as num, \ + b.zoomlevel as zoomlevel \ + FROM swissnames_search s \ + inner join tlm.dkm_search b on s.name = b.name and s.objectclass = 'TLM_GEBAEUDE' and s.feature_id <> b.feature_id \ + ) s +} + +source src_gg25 : src_swisssearch +{ + sql_db=stopo_${DBSTAGING} + sql_query = \ + SELECT \ + row_number() OVER(ORDER BY id asc) as id \ + , id::text as feature_id \ + , remove_accents(concat_ws(' ', trim(gemname), trim(k.ak))) as detail \ + , NULL as objectclass \ + , concat('', trim(gemname), ' (', k.ak, ')') as label \ + , 'gg25'::text as origin \ + , quadindex(g.the_geom) as geom_quadindex \ + , box2d(st_transform(g.the_geom, 21781)) as geom_st_box2d \ + , box2d(st_transform(g.the_geom, 2056)) as geom_st_box2d_lv95 \ + , 2::integer as rank \ + , st_y(st_transform(ST_PointOnSurface(g.the_geom), 21781)) AS x \ + , st_x(st_transform(ST_PointOnSurface(g.the_geom), 21781)) AS y \ + , st_y(st_transform(ST_PointOnSurface(g.the_geom), 2056)) AS x_lv95 \ + , st_x(st_transform(ST_PointOnSurface(g.the_geom), 2056)) AS y_lv95 \ + , st_y(st_transform(ST_PointOnSurface(g.the_geom),4326)) as lat \ + , st_x(st_transform(ST_PointOnSurface(g.the_geom),4326)) as lon \ + , -1 as zoomlevel \ + , 1 as num \ + FROM tlm.swissboundaries_gemeinden_uebersetzt g left join tlm.swissboundaries_kantone k on k.kantonsnr = g.kantonsnr +} + +source src_kantone : src_swisssearch +{ + sql_db=stopo_${DBSTAGING} + sql_query = \ + SELECT \ + kantonsnr::integer as id \ + , kantonsnr::text as feature_id \ + , remove_accents(concat_ws(' ', name, ak)) as detail \ + , NULL as objectclass \ + , concat('', trim(name), '') as label \ + , 'kantone'::text as origin \ + , quadindex(the_geom) as geom_quadindex \ + , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ + , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ + , 4::integer as rank \ + , st_y(st_transform(ST_PointOnSurface(the_geom), 21781)) AS x \ + , st_x(st_transform(ST_PointOnSurface(the_geom), 21781)) AS y \ + , st_y(st_transform(ST_PointOnSurface(the_geom), 2056)) AS x_lv95 \ + , st_x(st_transform(ST_PointOnSurface(the_geom), 2056)) AS y_lv95 \ + , st_y(st_transform(ST_PointOnSurface(the_geom),4326)) as lat \ + , st_x(st_transform(ST_PointOnSurface(the_geom),4326)) as lon \ + , -1 as zoomlevel \ + , 1 as num \ + FROM tlm.swissboundaries_kantone +} + +source src_district : src_swisssearch +{ + sql_db=stopo_${DBSTAGING} + sql_query = \ + SELECT \ + id::integer as id \ + , id::text as feature_id \ + , name::text as detail \ + , NULL as objectclass \ + , concat('', trim(name), '') as label \ + , 'district'::text as origin \ + , quadindex(the_geom) as geom_quadindex \ + , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ + , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ + , 3::integer as rank \ + , st_y(st_transform(ST_PointOnSurface(the_geom), 21781)) AS x \ + , st_x(st_transform(ST_PointOnSurface(the_geom), 21781)) AS y \ + , st_y(st_transform(ST_PointOnSurface(the_geom), 2056)) AS x_lv95 \ + , st_x(st_transform(ST_PointOnSurface(the_geom), 2056)) AS y_lv95 \ + , st_y(st_transform(ST_PointOnSurface(the_geom),4326)) as lat \ + , st_x(st_transform(ST_PointOnSurface(the_geom),4326)) as lon \ + , -1 as zoomlevel \ + , 1 as num \ + FROM tlm.swissboundaries_bezirke +} + +source src_zipcode : src_swisssearch +{ + sql_db=stopo_${DBSTAGING} + sql_query = \ + SELECT \ + gid as id \ + , os_uuid::text as feature_id \ + , plz::text as detail \ + , concat('', plz, ' - ', trim(langtext), ' (', trim(canton), ')') as label \ + , NULL as objectclass \ + , 'zipcode' as origin \ + , quadindex(the_geom) as geom_quadindex \ + , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ + , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ + , 1::integer as rank \ + , st_y(st_transform(st_setsrid(st_point(label_x,label_y),2056),21781)) as x \ + , st_x(st_transform(st_setsrid(st_point(label_x,label_y),2056),21781)) as y \ + , st_y(st_transform(st_setsrid(st_point(label_x,label_y),2056),2056)) as x_lv95 \ + , st_x(st_transform(st_setsrid(st_point(label_x,label_y),2056),2056)) as y_lv95 \ + , st_y(st_transform(st_setsrid(st_point(label_x,label_y),2056),4326)) as lat \ + , st_x(st_transform(st_setsrid(st_point(label_x,label_y),2056),4326)) as lon \ + , -1 as zoomlevel \ + , 1 as num \ + FROM vd.gabmo_plz p +} + +source src_haltestellen : src_swisssearch +{ + sql_db=uvek_${DBSTAGING} + sql_query = \ + SELECT \ + bgdi_id as id \ + , xtf_id::text as feature_id \ + , remove_accents(concat_ws(' ', name, nummer, betriebspunkttyp_bezeichnung_de, verkehrsmittel_bezeichnung_de))::text as detail \ + , NULL as objectclass \ + , concat_ws('','', lower(concat_ws('_','Haltestellen', trim(verkehrsmittel_bezeichnung_de))) , ' ','',trim(name),'') as label \ + , 'gazetteer'::text as origin \ + , quadindex(the_geom) as geom_quadindex \ + , box2d(st_transform(the_geom, 21781)) as geom_st_box2d \ + , box2d(st_transform(the_geom, 2056)) as geom_st_box2d_lv95 \ + , 8::integer as rank \ + , st_y(st_transform(st_geometryn(the_geom,1), 21781)) as x \ + , st_x(st_transform(st_geometryn(the_geom,1), 21781)) as y \ + , st_y(st_transform(st_geometryn(the_geom,1), 2056)) as x_lv95 \ + , st_x(st_transform(st_geometryn(the_geom,1), 2056)) as y_lv95 \ + , st_y(st_transform(st_geometryn(the_geom,1),4326)) as lat \ + , st_x(st_transform(st_geometryn(the_geom,1),4326)) as lon \ + , -1 as zoomlevel \ + , 1 as num \ + FROM bav.oev_haltestellen +} + +## INDICES + +index zipcode +{ + source = src_zipcode + wordforms = /var/lib/manticore/data/index/wordforms_main.txt + path = /var/lib/manticore/data/index/zipcode + type = plain + min_infix_len = 1 + preopen = 1 + dict=crc + infix_fields = detail,geom_quadindex +} + +index district : zipcode +{ + source = src_district + path = /var/lib/manticore/data/index/district + access_plain_attrs = mmap_preread +} + +index kantone : zipcode +{ + source = src_kantone + path = /var/lib/manticore/data/index/kantone + access_plain_attrs = mmap_preread +} + +index gg25 : zipcode +{ + source = src_gg25 + path = /var/lib/manticore/data/index/gg25 + access_plain_attrs = mmap_preread +} + +index swissnames3d : zipcode +{ + source = src_swissnames3d + path = /var/lib/manticore/data/index/swissnames3d + access_plain_attrs = mmap_preread +} + +index haltestellen : zipcode +{ + source = src_haltestellen + path = /var/lib/manticore/data/index/haltestellen + access_plain_attrs = mmap_preread +} + +index parcel : zipcode +{ + source = src_parcel + path = /var/lib/manticore/data/index/parcel + access_plain_attrs = mmap_preread +} + +index address : zipcode +{ + source = src_address + path = /var/lib/manticore/data/index/address + access_plain_attrs = mmap_preread +} + +# swisssearch fuzzy metaphone +index district_metaphone : zipcode +{ + morphology = metaphone + source = src_district + path = /var/lib/manticore/data/index/district_metaphone + access_plain_attrs = mmap_preread +} + +index kantone_metaphone : zipcode +{ + morphology = metaphone + source = src_kantone + path = /var/lib/manticore/data/index/kantone_metaphone + access_plain_attrs = mmap_preread +} + +index gg25_metaphone : zipcode +{ + morphology = metaphone + source = src_gg25 + path = /var/lib/manticore/data/index/gg25_metaphone + access_plain_attrs = mmap_preread +} + +index swissnames3d_metaphone : zipcode +{ + morphology = metaphone + source = src_swissnames3d + path = /var/lib/manticore/data/index/swissnames3d_metaphone + access_plain_attrs = mmap_preread +} + +index haltestellen_metaphone : zipcode +{ + morphology = metaphone + source = src_haltestellen + path = /var/lib/manticore/data/index/haltestellen_metaphone + access_plain_attrs = mmap_preread +} + +index address_metaphone: zipcode +{ + morphology = metaphone + source = src_address + path = /var/lib/manticore/data/index/address_metaphone + access_plain_attrs = mmap_preread +} + +# only create on demand +#index address_geocoding : zipcode +#{ +# source = src_address_geocoding +# path = /var/lib/manticore/data/index/address_geocoding +#} + +index swisssearch +{ + type = distributed + local = zipcode + local = district + local = kantone + local = gg25 + local = swissnames3d + local = haltestellen + local = parcel + local = address +} + +index swisssearch_fuzzy +{ + type = distributed + local = district_metaphone + local = kantone_metaphone + local = gg25_metaphone + local = swissnames3d_metaphone + local = haltestellen_metaphone + local = address_metaphone +} From 096f8dc5ff39531b16029b7cc0ceb9d418ed7d47 Mon Sep 17 00:00:00 2001 From: Marcel Clausen Date: Mon, 12 Sep 2022 08:08:41 +0200 Subject: [PATCH 8/9] expose port --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 118f3c15..2f36f5a7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ services: build: . env_file: - dev_sphinx.env + ports: + - 9308:9308 volumes: - ${SPHINX_EFS:?err}:/var/lib/manticore/data/index_efs/ - sphinx_index:/var/lib/manticore/data/index/ From 7fbdf3b8e3ac1f2838d124e29bcd65a08df1041e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Cl=C3=A4usen?= <5286659+ltclm@users.noreply.github.com> Date: Mon, 24 Oct 2022 21:42:39 +0200 Subject: [PATCH 9/9] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cd82af3d..b81687ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get update && \ vim && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ + gosu nobody true && \ # set up cron for non root user chmod gu+rw /var/run && \ chmod gu+s /usr/sbin/cron &&\ @@ -51,4 +52,4 @@ WORKDIR / # default CMD ENTRYPOINT [ "/docker-entry.sh" ] # run service with the following script if no CMDs are sent to docker run / default -CMD ["/docker-cmd.sh"] \ No newline at end of file +CMD ["/docker-cmd.sh"]