inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-17 14:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-1650 Support master-master and master-slave.

Browse Source
This commit is contained in:
Tom Page
2019-11-19 09:18:09 +00:00
parent 36013f31a2
commit 0ae6c97d29
5 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e2e-test/generator-alfresco-docker-compose/generators/app/index.js
View File

@@ -60,10 +60,14 @@ module.exports = class extends Generator {
}, },
{ {
whenFunction: response => response.httpMode == 'http', whenFunction: response => response.httpMode == 'http',
type: 'confirm', type: 'list',
name: 'replication', name: 'replication',
message: 'Would you like to use SOLR Replication (2 nodes in master-slave)?', message: 'Would you like to use SOLR Replication?',
default: false choices: [
{ name: "No", value: "" },
{ name: "Yes - two nodes in a master-slave configuration", value: "master-slave" },
{ name: "Yes - two nodes in a master-master configuration", value: "master-master" }
]
}, },
// Enterprise only options // Enterprise only options
{ {
@@ -199,7 +203,7 @@ module.exports = class extends Generator {
port: (this.props.httpWebMode == 'http' ? '8080' : '443'), port: (this.props.httpWebMode == 'http' ? '8080' : '443'),
secureComms: (this.props.httpMode == 'http' ? 'none' : 'https'), secureComms: (this.props.httpMode == 'http' ? 'none' : 'https'),
alfrescoPort: (this.props.httpMode == 'http' ? '8080' : '8443'), alfrescoPort: (this.props.httpMode == 'http' ? '8080' : '8443'),
replication: (this.props.replication ? "true" : "false"), replication: this.props.replication,
searchSolrHost: (this.props.replication ? "solr6secondary" : "solr6"), searchSolrHost: (this.props.replication ? "solr6secondary" : "solr6"),
searchPath: searchBasePath, searchPath: searchBasePath,
zeppelin: (this.props.zeppelin ? "true" : "false"), zeppelin: (this.props.zeppelin ? "true" : "false"),

10
e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
View File

@@ -47,7 +47,7 @@ services:
ALFRESCO_HOSTNAME: alfresco ALFRESCO_HOSTNAME: alfresco
ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %>
TRUSTSTORE_TYPE: JCEKS TRUSTSTORE_TYPE: JCEKS
KEYSTORE_TYPE: JCEKS <% } %> <% if (replication == 'true') { %> KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %>
ENABLE_MASTER: "true" ENABLE_MASTER: "true"
ENABLE_SLAVE: "false" <% } %> ENABLE_SLAVE: "false" <% } %>
mem_limit: 1200m mem_limit: 1200m
@@ -78,7 +78,7 @@ services:
volumes: volumes:
- ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %> - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
<% if (replication == 'true') { %> <% if (replication) { %>
solr6secondary: solr6secondary:
build: build:
context: ./search context: ./search
@@ -88,9 +88,9 @@ services:
ALFRESCO_HOSTNAME: alfresco ALFRESCO_HOSTNAME: alfresco
ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %>
TRUSTSTORE_TYPE: JCEKS TRUSTSTORE_TYPE: JCEKS
KEYSTORE_TYPE: JCEKS <% } %> <% if (replication == 'true') { %> KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %>
ENABLE_MASTER: "false" ENABLE_MASTER: <% if (replication == 'master-master') { %>"true"<% } else { %>"false"<% } %>
ENABLE_SLAVE: "true" ENABLE_SLAVE: <% if (replication == 'master-master') { %>"false"<% } else { %>"true"<% } %>
MASTER_HOST: solr6 <% } %> MASTER_HOST: solr6 <% } %>
mem_limit: 1200m mem_limit: 1200m
environment: environment:

10
e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml
View File

@@ -57,7 +57,7 @@ services:
ALFRESCO_HOSTNAME: alfresco ALFRESCO_HOSTNAME: alfresco
ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %>
TRUSTSTORE_TYPE: JCEKS TRUSTSTORE_TYPE: JCEKS
KEYSTORE_TYPE: JCEKS <% } %> <% if (replication == 'true') { %> KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %>
ENABLE_MASTER: "true" ENABLE_MASTER: "true"
ENABLE_SLAVE: "false" <% } %> <% if (sharding == 'true') { %> ENABLE_SLAVE: "false" <% } %> <% if (sharding == 'true') { %>
ENABLE_SHARDING: "true" ENABLE_SHARDING: "true"
@@ -103,7 +103,7 @@ services:
volumes: volumes:
- ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %> - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
<% if (sharding == 'true' || replication == 'true') { %> <% if (sharding == 'true' || replication) { %>
solr6secondary: solr6secondary:
build: build:
context: ./search context: ./search
@@ -113,9 +113,9 @@ services:
ALFRESCO_HOSTNAME: alfresco ALFRESCO_HOSTNAME: alfresco
ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %>
TRUSTSTORE_TYPE: JCEKS TRUSTSTORE_TYPE: JCEKS
KEYSTORE_TYPE: JCEKS <% } %> <% if (replication == 'true') { %> KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %>
ENABLE_MASTER: "false" ENABLE_MASTER: <% if (replication == 'master-master') { %>"true"<% } else { %>"false"<% } %>
ENABLE_SLAVE: "true" ENABLE_SLAVE: <% if (replication == 'master-master') { %>"false"<% } else { %>"true"<% } %>
MASTER_HOST: solr6 <% } %> <% if (sharding == 'true') { %> MASTER_HOST: solr6 <% } %> <% if (sharding == 'true') { %>
ENABLE_SHARDING: "true" ENABLE_SHARDING: "true"
NUM_SHARDS: "2" NUM_SHARDS: "2"

10
e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ce.yml
View File

@@ -63,7 +63,7 @@ services:
ALFRESCO_HOSTNAME: alfresco ALFRESCO_HOSTNAME: alfresco
ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %>
TRUSTSTORE_TYPE: JCEKS TRUSTSTORE_TYPE: JCEKS
KEYSTORE_TYPE: JCEKS <% } %> <% if (replication == 'true') { %> KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %>
ENABLE_MASTER: "true" ENABLE_MASTER: "true"
ENABLE_SLAVE: "false" <% } %> ENABLE_SLAVE: "false" <% } %>
mem_limit: 1200m mem_limit: 1200m
@@ -94,7 +94,7 @@ services:
volumes: volumes:
- ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %> - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
<% if (replication == 'true') { %> <% if (replication) { %>
solr6secondary: solr6secondary:
build: build:
context: ./search context: ./search
@@ -104,9 +104,9 @@ services:
ALFRESCO_HOSTNAME: alfresco ALFRESCO_HOSTNAME: alfresco
ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %>
TRUSTSTORE_TYPE: JCEKS TRUSTSTORE_TYPE: JCEKS
KEYSTORE_TYPE: JCEKS <% } %> <% if (replication == 'true') { %> KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %>
ENABLE_MASTER: "false" ENABLE_MASTER: <% if (replication == 'master-master') { %>"true"<% } else { %>"false"<% } %>
ENABLE_SLAVE: "true" ENABLE_SLAVE: <% if (replication == 'master-master') { %>"false"<% } else { %>"true"<% } %>
MASTER_HOST: solr6 <% } %> MASTER_HOST: solr6 <% } %>
mem_limit: 1200m mem_limit: 1200m
environment: environment:

10
e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.2/docker-compose-ee.yml
View File

@@ -66,7 +66,7 @@ services:
ALFRESCO_HOSTNAME: alfresco ALFRESCO_HOSTNAME: alfresco
ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %>
TRUSTSTORE_TYPE: JCEKS TRUSTSTORE_TYPE: JCEKS
KEYSTORE_TYPE: JCEKS <% } %> <% if (replication == 'true') { %> KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %>
ENABLE_MASTER: "true" ENABLE_MASTER: "true"
ENABLE_SLAVE: "false" <% } %> <% if (sharding == 'true') { %> ENABLE_SLAVE: "false" <% } %> <% if (sharding == 'true') { %>
ENABLE_SHARDING: "true" ENABLE_SHARDING: "true"
@@ -112,7 +112,7 @@ services:
volumes: volumes:
- ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %> - ./keystores/solr:/opt/<%=searchPath%>/keystore <% } %>
<% if (sharding == 'true' || replication == 'true') { %> <% if (sharding == 'true' || replication) { %>
solr6secondary: solr6secondary:
build: build:
context: ./search context: ./search
@@ -122,9 +122,9 @@ services:
ALFRESCO_HOSTNAME: alfresco ALFRESCO_HOSTNAME: alfresco
ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %> ALFRESCO_COMMS: <%=secureComms%> <% if (httpMode == 'https') { %>
TRUSTSTORE_TYPE: JCEKS TRUSTSTORE_TYPE: JCEKS
KEYSTORE_TYPE: JCEKS <% } %> <% if (replication == 'true') { %> KEYSTORE_TYPE: JCEKS <% } %> <% if (replication) { %>
ENABLE_MASTER: "false" ENABLE_MASTER: <% if (replication == 'master-master') { %>"true"<% } else { %>"false"<% } %>
ENABLE_SLAVE: "true" ENABLE_SLAVE: <% if (replication == 'master-master') { %>"false"<% } else { %>"true"<% } %>
MASTER_HOST: solr6 <% } %> <% if (sharding == 'true') { %> MASTER_HOST: solr6 <% } %> <% if (sharding == 'true') { %>
ENABLE_SHARDING: "true" ENABLE_SHARDING: "true"
NUM_SHARDS: "2" NUM_SHARDS: "2"