Skip to content

GitLab

Commit 3c1f521d authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Prepare for Solr integration based on documentation 

* Add AdditionalConfiguration.ddev.php
* Remove Solr configsets
parent e89635f9
Pipeline #4489 passed with stages
in 7 minutes and 31 seconds
Hide whitespace changes
Inline Side-by-side
.ddev/.gitignore 0 → 100644
View file @ 3c1f521d
solr/mycores/*
.ddev/config.yaml
View file @ 3c1f521d
......@@ -2,18 +2,15 @@ APIVersion: v0.18.0
name: ter
type: typo3
docroot: html
php_version: "7.1"
webimage: drud/nginx-php-fpm-local:20180416_add_node
dbimage: drud/mariadb-local:v0.9.0
dbaimage: drud/phpmyadmin:v0.2.0
php_version: "7.0"
router_http_port: "80"
router_https_port: "443"
provider: default
hooks:
post-start:
- exec: "composer install -d /var/www/html"
- exec: "rm -rf typo3conf/ext/t3olayout/Build/node_modules"
- exec: "npm --prefix typo3conf/ext/t3olayout/Build install"
- exec: "npm --prefix typo3conf/ext/t3olayout/Build run-script build"
- exec: "../bin/typo3cms install:generatepackagestates"
- exec: "../bin/typo3cms install:extensionsetupifpossible"
- exec: "cp typo3conf/AdditionalConfiguration.ddev.php typo3conf/AdditionalConfiguration.php"
.ddev/docker-compose.solr.yaml
View file @ 3c1f521d
......@@ -26,10 +26,11 @@ services:
volumes:
- "./solr:/solr-conf" # This exposes a mount to the host system `.ddev/solr-conf` directory.
- "./solr/configsets:/opt/solr/server/solr/configsets" # ext:solr configsets linking
- "./solr/mycores:/opt/solr/server/solr/mycores"
entrypoint:
- docker-entrypoint.sh
- solr-precreate
- dev
- t3o
- /solr-conf
# This links the solr service to the web service defined in the main docker-compose.yml, allowing applications running in the web service to access the solr service at sitename.ddev.local:8983
web:
......
.ddev/docker-compose.yaml
View file @ 3c1f521d
version: '3'
#ddev-generated
services:
db:
container_name: ddev-${DDEV_SITENAME}-db
image: $DDEV_DBIMAGE
stop_grace_period: 60s
volumes:
- "${DDEV_IMPORTDIR}:/db"
- "${DDEV_DATADIR}:/var/lib/mysql"
restart: always
- ".:/mnt/ddev_config"
restart: "no"
user: "$DDEV_UID:$DDEV_GID"
ports:
- "3306"
labels:
......@@ -17,14 +20,17 @@ services:
com.ddev.approot: $DDEV_APPROOT
com.ddev.app-url: $DDEV_URL
environment:
- DDEV_UID=$DDEV_UID
- DDEV_GID=$DDEV_GID
- COLUMNS=$COLUMNS
- LINES=$LINES
web:
container_name: ddev-${DDEV_SITENAME}-web
image: $DDEV_WEBIMAGE
volumes:
- "../:/var/www/html:cached"
restart: always
- ".:/mnt/ddev_config"
restart: "no"
user: "$DDEV_UID:$DDEV_GID"
depends_on:
- db
links:
......@@ -35,16 +41,17 @@ services:
- "8025"
working_dir: /var/www/html/${DDEV_DOCROOT}
environment:
- DDEV_UID=$DDEV_UID
- DDEV_GID=$DDEV_GID
- DDEV_URL=$DDEV_URL
- DOCROOT=$DDEV_DOCROOT
- DDEV_PHP_VERSION=$DDEV_PHP_VERSION
- DDEV_PROJECT_TYPE=$DDEV_PROJECT_TYPE
- DDEV_ROUTER_HTTP_PORT=$DDEV_ROUTER_HTTP_PORT
- DDEV_ROUTER_HTTPS_PORT=$DDEV_ROUTER_HTTPS_PORT
- DDEV_XDEBUG_ENABLED=$DDEV_XDEBUG_ENABLED
- DEPLOY_NAME=local
- VIRTUAL_HOST=$DDEV_HOSTNAME
- COLUMNS=$COLUMNS
- LINES=$LINES
# HTTP_EXPOSE allows for ports accepting HTTP traffic to be accessible from <site>.ddev.local:<port>
# To expose a container port to a different host port, define the port as hostPort:containerPort
- HTTP_EXPOSE=${DDEV_ROUTER_HTTP_PORT}:80,8025
......@@ -60,7 +67,7 @@ services:
dba:
container_name: ddev-${DDEV_SITENAME}-dba
image: $DDEV_DBAIMAGE
restart: always
restart: "no"
labels:
com.ddev.site-name: ${DDEV_SITENAME}
com.ddev.platform: ddev
......
.ddev/solr/configsets/ext_solr_7_5_0/conf/_schema_analysis_stopwords_arabic.json deleted 100644 → 0
View file @ e89635f9
{
"initArgs": {
"ignoreCase": true
},
"initializedOn": "2014-04-29T23:08:57.000Z",
"managedList": [
"من",
"ومن",
"منها",
"منه",
"في",
"وفي",
"فيها",
"فيه",
"و",
"ف",
"ثم",
"او",
"أو",
"ب",
"بها",
"به",
"ا",
"أ",
"اى",
"اي",
"أي",
"أى",
"لا",
"ولا",
"الا",
"ألا",
"إلا",
"لكن",
"ما",
"وما",
"كما",
"فما",
"عن",
"مع",
"اذا",
"إذا",
"ان",
"أن",
"إن",
"انها",
"أنها",
"إنها",
"انه",
"أنه",
"إنه",
"بان",
"بأن",
"فان",
"فأن",
"وان",
"وأن",
"وإن",
"التى",
"التي",
"الذى",
"الذي",
"الذين",
"الى",
"الي",
"إلى",
"إلي",
"على",
"عليها",
"عليه",
"اما",
"أما",
"إما",
"ايضا",
"أيضا",
"كل",
"وكل",
"لم",
"ولم",
"لن",
"ولن",
"هى",
"هي",
"هو",
"وهى",
"وهي",
"وهو",
"فهى",
"فهي",
"فهو",
"انت",
"أنت",
"لك",
"لها",
"له",
"هذه",
"هذا",
"تلك",
"ذلك",
"هناك",
"كانت",
"كان",
"يكون",
"تكون",
"وكانت",
"وكان",
"غير",
"بعض",
"قد",
"نحو",
"بين",
"بينما",
"منذ",
"ضمن",
"حيث",
"الان",
"الآن",
"خلال",
"بعد",
"قبل",
"حتى",
"عند",
"عندما",
"لدى",
"جميع"
]
}
\ No newline at end of file
.ddev/solr/configsets/ext_solr_7_5_0/conf/_schema_analysis_stopwords_armenian.json deleted 100644 → 0
View file @ e89635f9
{
"initArgs": {
"ignoreCase": true
},
"initializedOn": "2014-04-29T23:08:58.000Z",
"managedList": [
"այդ",
"այլ",
"այն",
"այս",
"դու",
"դուք",
"եմ",
"են",
"ենք",
"ես",
"եք",
"է",
"էի",
"էին",
"էինք",
"էիր",
"էիք",
"էր",
"ըստ",
"թ",
"ի",
"ին",
"իսկ",
"իր",
"կամ",
"համար",
"հետ",
"հետո",
"մենք",
"մեջ",
"մի",
"ն",
"նա",
"նաև",
"նրա",
"նրանք",
"որ",
"որը",
"որոնք",
"որպես",
"ու",
"ում",
"պիտի",
"վրա",
"և"
]
}
\ No newline at end of file
.ddev/solr/configsets/ext_solr_7_5_0/conf/_schema_analysis_stopwords_basque.json deleted 100644 → 0
View file @ e89635f9
{
"initArgs": {
"ignoreCase": true
},
"initializedOn": "2014-04-29T23:08:58.000Z",
"managedList": [
"al",
"anitz",
"arabera",
"asko",
"baina",
"bat",
"batean",
"batek",
"bati",
"batzuei",
"batzuek",
"batzuetan",
"batzuk",
"bera",
"beraiek",
"berau",
"berauek",
"bere",
"berori",
"beroriek",
"beste",
"bezala",
"da",
"dago",
"dira",
"ditu",
"du",
"dute",
"edo",
"egin",
"ere",
"eta",
"eurak",
"ez",
"gainera",
"gu",
"gutxi",
"guzti",
"haiei",
"haiek",
"haietan",
"hainbeste",
"hala",
"han",
"handik",
"hango",
"hara",
"hari",
"hark",
"hartan",
"hau",
"hauei",
"hauek",
"hauetan",
"hemen",
"hemendik",
"hemengo",
"hi",
"hona",
"honek",
"honela",
"honetan",
"honi",
"hor",
"hori",
"horiei",
"horiek",
"horietan",
"horko",
"horra",
"horrek",
"horrela",
"horretan",
"horri",
"hortik",
"hura",
"izan",
"ni",
"noiz",
"nola",
"non",
"nondik",
"nongo",
"nor",
"nora",
"ze",
"zein",
"zen",
"zenbait",
"zenbat",
"zer",
"zergatik",
"ziren",
"zituen",
"zu",
"zuek",
"zuen",
"zuten"
]
}
\ No newline at end of file
.ddev/solr/configsets/ext_solr_7_5_0/conf/_schema_analysis_stopwords_brazilian_portuguese.json deleted 100644 → 0
View file @ e89635f9
{
"initArgs": {
"ignoreCase": true
},
"initializedOn": "2014-04-29T23:08:58.000Z",
"managedList": [
"a",
"ainda",
"alem",
"ambas",
"ambos",
"antes",
"ao",
"aonde",
"aos",
"apos",
"aquele",
"aqueles",
"as",
"assim",
"com",
"como",
"contra",
"contudo",
"cuja",
"cujas",
"cujo",
"cujos",
"da",
"das",
"de",
"dela",
"dele",
"deles",
"demais",
"depois",
"desde",
"desta",
"deste",
"dispoe",
"dispoem",
"diversa",
"diversas",
"diversos",
"do",
"dos",
"durante",
"e",
"ela",
"elas",
"ele",
"eles",
"em",
"entao",
"entre",
"essa",
"essas",
"esse",
"esses",
"esta",
"estas",
"este",
"estes",
"ha",
"isso",
"isto",
"logo",
"mais",
"mas",
"mediante",
"menos",
"mesma",
"mesmas",
"mesmo",
"mesmos",
"na",
"nas",
"nao",
"nas",
"nem",
"nesse",
"neste",
"nos",
"o",
"os",
"ou",
"outra",
"outras",
"outro",
"outros",
"pelas",
"pelas",
"pelo",
"pelos",
"perante",
"pois",
"por",
"porque",
"portanto",
"proprio",
"propios",
"quais",
"qual",
"qualquer",
"quando",
"quanto",
"que",
"quem",
"quer",
"se",
"seja",
"sem",
"sendo",
"seu",
"seus",
"sob",
"sobre",
"sua",
"suas",
"tal",
"tambem",
"teu",
"teus",
"toda",
"todas",
"todo",
"todos",
"tua",
"tuas",
"tudo",
"um",
"uma",
"umas",
"uns"
]
}
\ No newline at end of file
.ddev/solr/configsets/ext_solr_7_5_0/conf/_schema_analysis_stopwords_bulgarian.json deleted 100644 → 0
View file @ e89635f9
{
"initArgs": {
"ignoreCase": true
},
"initializedOn": "2014-04-29T23:08:58.000Z",
"managedList": [
"а",
"аз",
"ако",
"ала",
"бе",
"без",
"беше",
"би",
"бил",
"била",
"били",
"било",
"близо",
"бъдат",
"бъде",
"бяха",
"в",
"вас",
"ваш",
"ваша",
"вероятно",
"вече",
"взема",
"ви",
"вие",
"винаги",
"все",
"всеки",
"всички",
"всичко",
"всяка",
"във",
"въпреки",
"върху",
"г",
"ги",
"главно",
"го",
"д",
"да",
"дали",
"до",
"докато",
"докога",
"дори",
"досега",
"доста",
"е",