mirror of
https://github.com/Alfresco/SearchServices.git
synced 2026-09-16 18:12:56 +00:00
Merge branch 'develop' of https://git.alfresco.com/search_discovery/searchservices into develop
This commit is contained in:
Michael Suzuki
@@ -44,6 +44,7 @@ public class CoreDescriptorDecorator
|
||||
"alfresco.port",
|
||||
"alfresco.baseUrl",
|
||||
"alfresco.port.ssl",
|
||||
"alfresco.secureComms",
|
||||
"alfresco.encryption.ssl.keystore.passwordFileLocation",
|
||||
"alfresco.encryption.ssl.truststore.passwordFileLocation",
|
||||
"alfresco.encryption.ssl.keystore.location",
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
version: '2'
|
||||
services:
|
||||
repo:
|
||||
image: docker-internal.alfresco.com/platform:latest
|
||||
environment:
|
||||
JAVA_OPTS : "-Dsolr.secureComms=https -Dsolr.useDynamicShardRegistration=true"
|
||||
ports:
|
||||
- "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
|
||||
- "5005:5005" #Java debugging
|
||||
- "8082:8080" #Browser port
|
||||
share:
|
||||
image: docker-internal.alfresco.com/share:5.2.1-demo
|
||||
ports:
|
||||
- "8081:8080"
|
||||
environment:
|
||||
- "REPO_HOST=repo:8080"
|
||||
solr6:
|
||||
image: docker-internal.alfresco.com/search-services:develop-latest
|
||||
command: [ "/opt/alfresco-solr/solr/bin/solr", "start", "-f", "-p","8084", "-a",
|
||||
"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"]
|
||||
expose:
|
||||
- "8084"
|
||||
environment:
|
||||
#Solr needs to know how to register itself with Alfresco
|
||||
SOLR_ALFRESCO_HOST: repo
|
||||
SOLR_ALFRESCO_PORT: 8080
|
||||
#Alfresco needs to know how to call solr
|
||||
SOLR_SOLR_HOST: solr6
|
||||
SOLR_SOLR_PORT: 8084
|
||||
|
||||
#SSL setup
|
||||
#SOLR_SSL_KEY_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.keystore
|
||||
#SOLR_SSL_KEY_STORE_PASSWORD: kT9X6oe68t
|
||||
#SOLR_SSL_TRUST_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.truststore
|
||||
#SOLR_SSL_TRUST_STORE_PASSWORD: kT9X6oe68t
|
||||
|
||||
ports:
|
||||
- "8084:8084" #Browser port
|
||||
- "1044:1044" #Java debugging
|
||||
volumes_from:
|
||||
- repo:ro
|
||||
|
||||
#docker-compose -f compose-ssl-dynamic.yml up
|
||||
#Bash to Alfresco instance: docker exec -it [containerid] bash
|
||||
# cd /opt/alfresco/alf_data/keystore
|
||||
# chmod +x generate_keystores.sh
|
||||
# ./generate_keystores.sh
|
||||
# cp ~/ssl.repo.client.keystore /opt/alfresco/alf_data/keystore/
|
||||
# cp ~/ssl.repo.client.truststore /opt/alfresco/alf_data/keystore/
|
||||
#Bash to Solr instance: docker exec -it [containerid] bash
|
||||
# cd /opt/alfresco-solr/solrhome/templates/rerank/conf
|
||||
# rm ssl.repo.client.truststore
|
||||
# rm ssl.repo.client.keystore
|
||||
# cp /opt/alfresco/alf_data/keystore/ssl.repo.client.keystore .
|
||||
# cp /opt/alfresco/alf_data/keystore/ssl.repo.client.truststore .
|
||||
# edit solrhome/templates/rerank/conf/solrcore.properties and set alfresco.secureComms=https
|
||||
# Uncomment the SSL setup config (above)
|
||||
# Stop and restart
|
||||
# Go to Index Server Sharding admin page
|
||||
# The index server is: https://solr6:8084/solr
|
||||
# Create the alfresco and archive cores using the buttons
|
||||
@@ -1,63 +0,0 @@
|
||||
version: '2'
|
||||
services:
|
||||
repo:
|
||||
image: docker-internal.alfresco.com/platform:latest
|
||||
environment:
|
||||
JAVA_OPTS : "-Dsolr.useDynamicShardRegistration=false
|
||||
-Dsolr.host=solr6 -Dsolr.port.ssl=8084 -Dsolr.secureComms=https
|
||||
-Dsolr.base.url=/solr -Dindex.subsystem.name=solr6"
|
||||
ports:
|
||||
- "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
|
||||
- "5005:5005" #Java debugging
|
||||
- "8082:8080" #Browser port
|
||||
share:
|
||||
image: docker-internal.alfresco.com/share:5.2.1-demo
|
||||
ports:
|
||||
- "8081:8080"
|
||||
environment:
|
||||
- "REPO_HOST=repo:8080"
|
||||
solr6:
|
||||
image: docker-internal.alfresco.com/search-services:develop-latest
|
||||
command: [ "/opt/alfresco-solr/solr/bin/solr", "start", "-f", "-p","8084", "-a",
|
||||
"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"]
|
||||
expose:
|
||||
- "8084"
|
||||
environment:
|
||||
#Solr needs to know how to register itself with Alfresco
|
||||
SOLR_ALFRESCO_HOST: repo
|
||||
SOLR_ALFRESCO_PORT: 8080
|
||||
#Alfresco needs to know how to call solr
|
||||
SOLR_SOLR_HOST: solr6
|
||||
SOLR_SOLR_PORT: 8084
|
||||
|
||||
#Create the default alfresco and archive cores
|
||||
#SOLR_CREATE_ALFRESCO_DEFAULTS : alfresco,archive
|
||||
|
||||
#SOLR_OPTS: "$SOLR_OPTS -Djavax.net.debug=SSL,keymanager,trustmanager"
|
||||
#SOLR_SSL_KEY_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.keystore
|
||||
#SOLR_SSL_KEY_STORE_PASSWORD: kT9X6oe68t
|
||||
#SOLR_SSL_TRUST_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.truststore
|
||||
#SOLR_SSL_TRUST_STORE_PASSWORD: kT9X6oe68t
|
||||
|
||||
ports:
|
||||
- "8084:8084" #Browser port
|
||||
- "1044:1044" #Java debugging
|
||||
volumes_from:
|
||||
- repo:ro
|
||||
|
||||
#docker-compose -f compose-ssl.yml up
|
||||
#Bash to Alfresco instance: docker exec -it [containerid] bash
|
||||
# cd /opt/alfresco/alf_data/keystore
|
||||
# chmod +x generate_keystores.sh
|
||||
# ./generate_keystores.sh
|
||||
# cp ~/ssl.repo.client.keystore /opt/alfresco/alf_data/keystore/
|
||||
# cp ~/ssl.repo.client.truststore /opt/alfresco/alf_data/keystore/
|
||||
#Bash to Solr instance: docker exec -it [containerid] bash
|
||||
# cd /opt/alfresco-solr/solrhome/templates/rerank/conf
|
||||
# rm ssl.repo.client.truststore
|
||||
# rm ssl.repo.client.keystore
|
||||
# cp /opt/alfresco/alf_data/keystore/ssl.repo.client.keystore .
|
||||
# cp /opt/alfresco/alf_data/keystore/ssl.repo.client.truststore .
|
||||
# edit solrhome/templates/rerank/conf/solrcore.properties and set alfresco.secureComms=https
|
||||
# Uncomment the SSL setup config (above) and uncomment the SOLR_CREATE_ALFRESCO_DEFAULTS
|
||||
# Stop and restart
|
||||
@@ -0,0 +1,15 @@
|
||||
# Alfresco Solr Docker image SSL
|
||||
FROM docker-internal.alfresco.com/platform:latest
|
||||
MAINTAINER Gethin James, gethin.james@alfresco.com
|
||||
|
||||
RUN cd /opt/alfresco/alf_data/keystore && chmod +x generate_keystores.sh \
|
||||
&& ./generate_keystores.sh
|
||||
RUN mkdir -p /opt/alfresco/sharedkeystore \
|
||||
&& cp /opt/alfresco/alf_data/keystore/* /opt/alfresco/sharedkeystore/ \
|
||||
&& cp /root/ssl.repo.client.keystore /opt/alfresco/sharedkeystore/ \
|
||||
&& cp /root/ssl.repo.client.truststore /opt/alfresco/sharedkeystore/ \
|
||||
&& cp /root/ssl.keystore /opt/alfresco/sharedkeystore/ \
|
||||
&& cp /root/ssl.truststore /opt/alfresco/sharedkeystore/ \
|
||||
&& chown -R alfresco:alfresco /opt/alfresco/sharedkeystore
|
||||
|
||||
VOLUME /opt/alfresco/sharedkeystore
|
||||
@@ -0,0 +1,69 @@
|
||||
version: '2'
|
||||
services:
|
||||
repo:
|
||||
image: docker-internal.alfresco.com/platform:latest
|
||||
environment:
|
||||
JAVA_OPTS : "-Dsolr.useDynamicShardRegistration=false
|
||||
-Dsolr.host=solr6 -Dsolr.port.ssl=8084 -Dsolr.secureComms=https
|
||||
-Dsolr.base.url=/solr -Dindex.subsystem.name=solr6"
|
||||
ports:
|
||||
- "7203:7203" #JMX connect via service:jmx:rmi:///jndi/rmi://localhost:7203/jmxrmi
|
||||
- "5005:5005" #Java debugging
|
||||
- "8082:8080" #Browser port
|
||||
share:
|
||||
image: docker-internal.alfresco.com/share:5.2.1-demo
|
||||
ports:
|
||||
- "8081:8080"
|
||||
environment:
|
||||
- "REPO_HOST=repo:8080"
|
||||
solr6:
|
||||
image: docker-internal.alfresco.com/search-services:1.0.2-SNAPSHOT
|
||||
command: [ "/opt/alfresco-search-services/solr/bin/solr", "start", "-f", "-p","8084", "-a",
|
||||
"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"]
|
||||
expose:
|
||||
- "8084"
|
||||
environment:
|
||||
#Solr needs to know how to register itself with Alfresco
|
||||
SOLR_ALFRESCO_HOST: repo
|
||||
SOLR_ALFRESCO_PORT: 8080
|
||||
#Alfresco needs to know how to call solr
|
||||
SOLR_SOLR_HOST: solr6
|
||||
SOLR_SOLR_PORT: 8084
|
||||
|
||||
#Create the default alfresco and archive cores
|
||||
SOLR_CREATE_ALFRESCO_DEFAULTS : alfresco,archive
|
||||
|
||||
#Alfresco <-> Jetty
|
||||
SOLR_OPTS: '$SOLR_OPTS -Djavax.net.ssl.keyStoreType=JCEKS -Djavax.net.ssl.trustStoreType=JCEKS -Dsolr.allow.unsafe.resourceloading=true -Dsolr.ssl.checkPeerName=false'
|
||||
SOLR_SSL_KEY_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.keystore
|
||||
SOLR_SSL_KEY_STORE_PASSWORD: kT9X6oe68t
|
||||
SOLR_SSL_TRUST_STORE: /opt/alfresco/alf_data/keystore/ssl.repo.client.truststore
|
||||
SOLR_SSL_TRUST_STORE_PASSWORD: kT9X6oe68t
|
||||
SOLR_SSL_NEED_CLIENT_AUTH : "true"
|
||||
SOLR_SSL_WANT_CLIENT_AUTH : "false"
|
||||
|
||||
#Alfresco <-> trackers
|
||||
SOLR_ALFRESCO_SECURECOMMS : https
|
||||
SOLR_ALFRESCO_ENCRYPTION_SSL_KEYSTORE_PASSWORDFILELOCATION: /opt/alfresco/alf_data/keystore/ssl-keystore-passwords.properties
|
||||
SOLR_ALFRESCO_ENCRYPTION_SSL_KEYSTORE_LOCATION: /opt/alfresco/alf_data/keystore/ssl.repo.client.keystore
|
||||
SOLR_ALFRESCO_ENCRYPTION_SSL_KEYSTORE_TYPE : JCEKS
|
||||
#SOLR_ALFRESCO_ENCRYPTION_SSL_KEYSTORE_PROVIDER
|
||||
SOLR_ALFRESCO_ENCRYPTION_SSL_TRUSTSTORE_PASSWORDFILELOCATION: /opt/alfresco/alf_data/keystore/ssl-truststore-passwords.properties
|
||||
SOLR_ALFRESCO_ENCRYPTION_SSL_TRUSTSTORE_LOCATION: /opt/alfresco/alf_data/keystore/ssl.repo.client.truststore
|
||||
SOLR_ALFRESCO_ENCRYPTION_SSL_TRUSTSTORE_TYPE : JCEKS
|
||||
#SOLR_ALFRESCO_ENCRYPTION_SSL_TRUSTSTORE_PROVIDER
|
||||
ports:
|
||||
- "8084:8084" #Browser port
|
||||
- "1044:1044" #Java debugging
|
||||
volumes_from:
|
||||
- repo:ro
|
||||
|
||||
#docker-compose up
|
||||
#Solr fails to start.
|
||||
#Bash to Alfresco instance: docker exec -it [containerid] bash
|
||||
# cd /opt/alfresco/alf_data/keystore
|
||||
# chmod +x generate_keystores.sh
|
||||
# ./generate_keystores.sh
|
||||
# cp /root/ssl.repo.client.keystore /opt/alfresco/alf_data/keystore/
|
||||
# cp /root/ssl.repo.client.truststore /opt/alfresco/alf_data/keystore/
|
||||
#restart docker-compose
|
||||
@@ -1,7 +1,21 @@
|
||||
## Alfresco Search Services
|
||||
Alfresco Search Services ${project.version} using Alfresco ${alfresco-solr.version} and Apache Solr ${solr.version}
|
||||
|
||||
## Solr 6
|
||||
Solr 6 is now available as a drop in replacement for Solr 4 with Alfresco 5.2.
|
||||
|
||||
Solr 6 brings with it a number of new features:
|
||||
|
||||
- SHARDING by DATE, PROPERTY & DBID
|
||||
- FINGERPRINTS to find similar documents
|
||||
- Indexing Multiple Document Versions
|
||||
- Full SSL support with sharding
|
||||
|
||||
Find out more about Solr 6 and how it differs here: http://docs.alfresco.com/5.2/concepts/solr6-home.html
|
||||
|
||||
### Install & Run
|
||||
**Please read the [Installation Documentation](http://docs.alfresco.com/5.2/concepts/solr6-install-config.html).**
|
||||
|
||||
To run, unzip then
|
||||
```
|
||||
solr/bin/solr start
|
||||
|
||||
Reference in New Issue
Block a user