Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
services
t3o sites
typo3.org
typo3.org
Commits
3355428d
Commit
3355428d
authored
Mar 09, 2021
by
Thomas Löffler
Browse files
Use env vars for SOLR configuration
parent
ebb49fe7
Pipeline
#10483
passed with stages
in 6 minutes and 45 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.ddev/docker-compose.typo3.yaml
View file @
3355428d
...
...
@@ -8,3 +8,6 @@ services:
-
DB_HOST=db
-
DB_USERNAME=db
-
DB_PASSWORD=db
-
SOLR_HOST=solr
-
SOLR_PORT=8983
-
SOLR_SCHEME=http
.gitlab-ci/deployer/deploy.php
View file @
3355428d
...
...
@@ -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'
,
...
...
config/sites/t3org/config.yaml
View file @
3355428d
...
...
@@ -140,8 +140,8 @@ routes:
type
:
staticText
content
:
"
User-agent:
*
\r\n
Allow:
/
\r\n\r\n
#
folders
\r\n
Disallow:
/typo3/
\r\n
Disallow:
/typo3conf/
\r\n
Allow:
/typo3conf/ext/
\r\n
Allow:
/typo3temp/
\r\n\r\n
#
parameters
\r\n
Disallow:
/*?id=*
#
non
speaking
URLs
\r\n
Disallow:
/*cHash
#
no
cHash
\r\n
Disallow:
/*tx_powermail_pi1
#
no
powermail
thanks
pages
\r\n
Disallow:
/*tx_form_formframework
#
no
forms
\r\n\r\n
#
sitemap
\r\n
Sitemap:
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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment