Commit 3355428d authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Use env vars for SOLR configuration

parent ebb49fe7
Pipeline #10483 passed with stages
in 6 minutes and 45 seconds
......@@ -8,3 +8,6 @@ services:
- DB_HOST=db
- DB_USERNAME=db
- DB_PASSWORD=db
- SOLR_HOST=solr
- SOLR_PORT=8983
- SOLR_SCHEME=http
......@@ -61,10 +61,6 @@ inventory('./.gitlab-ci/deployer/servers.yml');
set('php', 'php');
set('bin_folder', 'vendor/bin/');
task('solr_host', function () {
run('cd {{deploy_path}} && ./solr_change_host.sh');
});
task('typo3', function () {
run('cd {{release_path}} && {{php}} {{bin_folder}}typo3cms install:extensionsetupifpossible');
});
......@@ -99,7 +95,6 @@ task('deploy', [
'maintenance:activate',
'typo3',
'deploy:symlink',
'solr_host',
'typo3_cache',
'cache',
'maintenance:deactivate',
......
......@@ -140,8 +140,8 @@ routes:
type: staticText
content: "User-agent: *\r\nAllow: /\r\n\r\n# folders\r\nDisallow: /typo3/\r\nDisallow: /typo3conf/\r\nAllow: /typo3conf/ext/\r\nAllow: /typo3temp/\r\n\r\n# parameters\r\nDisallow: /*?id=* # non speaking URLs\r\nDisallow: /*cHash # no cHash\r\nDisallow: /*tx_powermail_pi1 # no powermail thanks pages\r\nDisallow: /*tx_form_formframework # no forms\r\n\r\n# sitemap\r\nSitemap: https://typo3.org/?type=1533906435\r\n"
solr_enabled_read: true
solr_host_read: solr
solr_scheme_read: '%env(SOLR_SCHEME)%'
solr_host_read: '%env(SOLR_HOST)%'
solr_port_read: '%env(SOLR_PORT)%'
solr_path_read: /solr/
solr_port_read: 8983
solr_scheme_read: http
solr_use_write_connection: false
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment