Commit 5eeabdfa authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into bugfix/issues-after-upgrade

parents ed37966c f1c61e87
...@@ -56,6 +56,10 @@ inventory('./.gitlab-ci/deployer/servers.yml'); ...@@ -56,6 +56,10 @@ inventory('./.gitlab-ci/deployer/servers.yml');
set('php', '/opt/php/php72/bin/php'); set('php', '/opt/php/php72/bin/php');
set('bin_folder', 'vendor/bin/'); set('bin_folder', 'vendor/bin/');
task('solr_host', function () {
run('cd {{deploy_path}} && ./solr_change_host.sh');
});
task('typo3', function () { task('typo3', function () {
run('cd {{release_path}} && {{php}} {{bin_folder}}typo3cms install:generatepackagestates'); run('cd {{release_path}} && {{php}} {{bin_folder}}typo3cms install:generatepackagestates');
run('cd {{release_path}} && {{php}} {{bin_folder}}typo3cms install:extensionsetupifpossible'); run('cd {{release_path}} && {{php}} {{bin_folder}}typo3cms install:extensionsetupifpossible');
...@@ -74,6 +78,7 @@ task('deploy', [ ...@@ -74,6 +78,7 @@ task('deploy', [
'deploy:writable', 'deploy:writable',
'typo3', 'typo3',
'deploy:symlink', 'deploy:symlink',
'solr_host',
'cache', 'cache',
'cleanup' 'cleanup'
]); ]);
...@@ -110,7 +110,9 @@ routeEnhancers: ...@@ -110,7 +110,9 @@ routeEnhancers:
plugin: Pievent plugin: Pievent
routes: routes:
- { routePath: '/', _controller: 'Event::list' } - { 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', _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}', _controller: 'Event::detail', _arguments: {'event_title': 'event'} }
- { routePath: '/{event_title}/ical', _controller: 'Event::icalDownload', _arguments: {'event_title': 'event'} } - { routePath: '/{event_title}/ical', _controller: 'Event::icalDownload', _arguments: {'event_title': 'event'} }
defaultController: 'Event::list' defaultController: 'Event::list'
...@@ -123,6 +125,10 @@ routeEnhancers: ...@@ -123,6 +125,10 @@ routeEnhancers:
type: PersistedAliasMapper type: PersistedAliasMapper
tableName: 'sys_category' tableName: 'sys_category'
routeFieldName: 'slug' routeFieldName: 'slug'
page:
type: StaticRangeMapper
start: '1'
end: '100'
routes: routes:
- -
route: robots.txt route: robots.txt
......
Supports Markdown
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