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
5eeabdfa
Commit
5eeabdfa
authored
Dec 19, 2019
by
Thomas Löffler
Browse files
Merge branch 'develop' into bugfix/issues-after-upgrade
parents
ed37966c
f1c61e87
Changes
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci/deployer/deploy.php
View file @
5eeabdfa
...
...
@@ -56,6 +56,10 @@ inventory('./.gitlab-ci/deployer/servers.yml');
set
(
'php'
,
'/opt/php/php72/bin/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:generatepackagestates'
);
run
(
'cd {{release_path}} && {{php}} {{bin_folder}}typo3cms install:extensionsetupifpossible'
);
...
...
@@ -74,6 +78,7 @@ task('deploy', [
'deploy:writable'
,
'typo3'
,
'deploy:symlink'
,
'solr_host'
,
'cache'
,
'cleanup'
]);
config/sites/t3org/config.yaml
View file @
5eeabdfa
...
...
@@ -110,7 +110,9 @@ routeEnhancers:
plugin
:
Pievent
routes
:
-
{
routePath
:
'
/'
,
_controller
:
'
Event::list'
}
-
{
routePath
:
'
/{page}'
,
_controller
:
'
Event::list'
,
_arguments
:
{
'
page'
:
'
@widget_0/currentPage'
}
}
-
{
routePath
:
'
/{event_category}/all'
,
_controller
:
'
Event::list'
,
_arguments
:
{
'
event_category'
:
'
overwriteDemand/category'
}
}
-
{
routePath
:
'
/{event_category}/all/{page}'
,
_controller
:
'
Event::list'
,
_arguments
:
{
'
event_category'
:
'
overwriteDemand/category'
,
'
page'
:
'
@widget_0/currentPage'
}
}
-
{
routePath
:
'
/{event_title}'
,
_controller
:
'
Event::detail'
,
_arguments
:
{
'
event_title'
:
'
event'
}
}
-
{
routePath
:
'
/{event_title}/ical'
,
_controller
:
'
Event::icalDownload'
,
_arguments
:
{
'
event_title'
:
'
event'
}
}
defaultController
:
'
Event::list'
...
...
@@ -123,6 +125,10 @@ routeEnhancers:
type
:
PersistedAliasMapper
tableName
:
'
sys_category'
routeFieldName
:
'
slug'
page
:
type
:
StaticRangeMapper
start
:
'
1'
end
:
'
100'
routes
:
-
route
:
robots.txt
...
...
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