diff --git a/.ddev/.gitignore b/.ddev/.gitignore new file mode 100644 index 00000000..e47970d8 --- /dev/null +++ b/.ddev/.gitignore @@ -0,0 +1,24 @@ +#ddev-generated: Automatically generated ddev .gitignore. +# You can remove the above line if you want to edit and maintain this file yourself. + +/commands/*/*.example +/commands/*/README.txt +/commands/host/launch +/commands/db/mysql +/homeadditions/*.example +/homeadditions/README.txt +/.gitignore +/import.yaml +/docker-compose.yaml +/db_snapshots +/sequelpro.spf +/import-db +/.bgsync* +/config.*.y*ml +/.webimageBuild +/.dbimageBuild +/.bgsyncimageBuild +/.sshimageBuild +/.webimageExtra +/.dbimageExtra +/*-build/Dockerfile.example diff --git a/.ddev/config.yaml b/.ddev/config.yaml new file mode 100644 index 00000000..4830946c --- /dev/null +++ b/.ddev/config.yaml @@ -0,0 +1,21 @@ +APIVersion: v1.12.2 +name: ep-reisen +type: typo3 +docroot: public +php_version: "7.3" +webserver_type: apache-cgi +router_http_port: "80" +router_https_port: "443" +xdebug_enabled: false +additional_hostnames: +- ep-events +- ski-boarderweek +- snowzone +- unichamp +- ski-wochenenden +- schnee-event +additional_fqdns: [] +nfs_mount_enabled: true +provider: default +use_dns_when_possible: true +timezone: Europe/Berlin diff --git a/.ddev/docker-compose.env.yaml b/.ddev/docker-compose.env.yaml new file mode 100644 index 00000000..06dca63f --- /dev/null +++ b/.ddev/docker-compose.env.yaml @@ -0,0 +1,6 @@ +version: '3.6' + +services: + web: + environment: + - TYPO3_CONTEXT=Development/Ddev \ No newline at end of file diff --git a/composer.lock b/composer.lock index d8d11eca..5d54c951 100644 --- a/composer.lock +++ b/composer.lock @@ -842,16 +842,16 @@ }, { "name": "gridelementsteam/gridelements", - "version": "9.3.0", + "version": "9.4.1", "source": { "type": "git", "url": "https://gitlab.com/coderscare/gridelements.git", - "reference": "06a7f541a30d985f7466d2b976eb0336848cff6e" + "reference": "18bc9653bfe4a59dd848fe4e45d7a68c6fd5409f" }, "dist": { "type": "zip", - "url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=06a7f541a30d985f7466d2b976eb0336848cff6e", - "reference": "06a7f541a30d985f7466d2b976eb0336848cff6e", + "url": "https://gitlab.com/api/v4/projects/coderscare%2Fgridelements/repository/archive.zip?sha=18bc9653bfe4a59dd848fe4e45d7a68c6fd5409f", + "reference": "18bc9653bfe4a59dd848fe4e45d7a68c6fd5409f", "shasum": "" }, "require": { @@ -860,12 +860,8 @@ "typo3/cms-frontend": "^9.5.7", "typo3/cms-recordlist": "^9.5.7" }, - "conflict": { - "jfmulticontent": "*", - "templavoila": "*" - }, "replace": { - "gridelements": "self.version", + "gridelementsteam/gridelements": "self.version", "typo3-ter/gridelements": "self.version" }, "type": "typo3-cms-extension", @@ -885,7 +881,7 @@ "TYPO3 CMS", "grids" ], - "time": "2019-08-15T16:41:24+00:00" + "time": "2020-01-17T16:30:24+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1267,16 +1263,16 @@ }, { "name": "kigkonsult/icalcreator", - "version": "v2.29.14", + "version": "v2.29.15", "source": { "type": "git", "url": "https://github.com/iCalcreator/iCalcreator.git", - "reference": "af69b2c08a871d65d64c486b4b3c1a4ca8ebfa35" + "reference": "f66748df0858f5a9fecbecee41b81a3a63f12f4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/af69b2c08a871d65d64c486b4b3c1a4ca8ebfa35", - "reference": "af69b2c08a871d65d64c486b4b3c1a4ca8ebfa35", + "url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/f66748df0858f5a9fecbecee41b81a3a63f12f4e", + "reference": "f66748df0858f5a9fecbecee41b81a3a63f12f4e", "shasum": "" }, "require": { @@ -2052,16 +2048,16 @@ }, { "name": "symfony/cache", - "version": "v5.0.2", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "6e8d978878ae5de705ec9fabbb6011cc18776bc9" + "reference": "b503e72c8e2fa55eed9e2d3dd6a166f3eaaabb9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/6e8d978878ae5de705ec9fabbb6011cc18776bc9", - "reference": "6e8d978878ae5de705ec9fabbb6011cc18776bc9", + "url": "https://api.github.com/repos/symfony/cache/zipball/b503e72c8e2fa55eed9e2d3dd6a166f3eaaabb9a", + "reference": "b503e72c8e2fa55eed9e2d3dd6a166f3eaaabb9a", "shasum": "" }, "require": { @@ -2127,7 +2123,7 @@ "caching", "psr6" ], - "time": "2019-12-12T13:03:32+00:00" + "time": "2020-01-10T21:57:37+00:00" }, { "name": "symfony/cache-contracts", @@ -2189,16 +2185,16 @@ }, { "name": "symfony/console", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "82437719dab1e6bdd28726af14cb345c2ec816d0" + "reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/82437719dab1e6bdd28726af14cb345c2ec816d0", - "reference": "82437719dab1e6bdd28726af14cb345c2ec816d0", + "url": "https://api.github.com/repos/symfony/console/zipball/e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f", + "reference": "e9ee09d087e2c88eaf6e5fc0f5c574f64d100e4f", "shasum": "" }, "require": { @@ -2261,20 +2257,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-12-17T10:32:23+00:00" + "time": "2020-01-10T21:54:01+00:00" }, { "name": "symfony/expression-language", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "539e7ff0b635c8b90d8127bc929da781a96eab2d" + "reference": "8b145496d7e2e7103b1a1b8f1fce81c6e084b380" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/539e7ff0b635c8b90d8127bc929da781a96eab2d", - "reference": "539e7ff0b635c8b90d8127bc929da781a96eab2d", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/8b145496d7e2e7103b1a1b8f1fce81c6e084b380", + "reference": "8b145496d7e2e7103b1a1b8f1fce81c6e084b380", "shasum": "" }, "require": { @@ -2312,20 +2308,20 @@ ], "description": "Symfony ExpressionLanguage Component", "homepage": "https://symfony.com", - "time": "2019-12-10T10:33:21+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/finder", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e" + "reference": "3a50be43515590faf812fbd7708200aabc327ec3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e", + "url": "https://api.github.com/repos/symfony/finder/zipball/3a50be43515590faf812fbd7708200aabc327ec3", + "reference": "3a50be43515590faf812fbd7708200aabc327ec3", "shasum": "" }, "require": { @@ -2361,20 +2357,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-11-17T21:56:56+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/http-client", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "9ebfc77b5018a05226b38642def82746f3e2ce0f" + "reference": "a7f82a1590e2f146b9bb44c6323b21f091fb9e00" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/9ebfc77b5018a05226b38642def82746f3e2ce0f", - "reference": "9ebfc77b5018a05226b38642def82746f3e2ce0f", + "url": "https://api.github.com/repos/symfony/http-client/zipball/a7f82a1590e2f146b9bb44c6323b21f091fb9e00", + "reference": "a7f82a1590e2f146b9bb44c6323b21f091fb9e00", "shasum": "" }, "require": { @@ -2429,7 +2425,7 @@ ], "description": "Symfony HttpClient component", "homepage": "https://symfony.com", - "time": "2019-12-19T15:57:49+00:00" + "time": "2020-01-21T07:39:36+00:00" }, { "name": "symfony/http-client-contracts", @@ -2490,16 +2486,16 @@ }, { "name": "symfony/inflector", - "version": "v5.0.2", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", - "reference": "aaeb5e293294070d1b061fa3d7889bac69909320" + "reference": "e375603b6bd12e8e3aec3fc1b640ac18a4ef4cb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/inflector/zipball/aaeb5e293294070d1b061fa3d7889bac69909320", - "reference": "aaeb5e293294070d1b061fa3d7889bac69909320", + "url": "https://api.github.com/repos/symfony/inflector/zipball/e375603b6bd12e8e3aec3fc1b640ac18a4ef4cb2", + "reference": "e375603b6bd12e8e3aec3fc1b640ac18a4ef4cb2", "shasum": "" }, "require": { @@ -2544,20 +2540,20 @@ "symfony", "words" ], - "time": "2019-11-18T17:27:11+00:00" + "time": "2020-01-04T14:08:26+00:00" }, { "name": "symfony/intl", - "version": "v5.0.2", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "41f910d47883c6ab37087ca4a3332e21e1d682f4" + "reference": "2b3694976f02ed6a7894d8a772c9d55cee5d9677" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/41f910d47883c6ab37087ca4a3332e21e1d682f4", - "reference": "41f910d47883c6ab37087ca4a3332e21e1d682f4", + "url": "https://api.github.com/repos/symfony/intl/zipball/2b3694976f02ed6a7894d8a772c9d55cee5d9677", + "reference": "2b3694976f02ed6a7894d8a772c9d55cee5d9677", "shasum": "" }, "require": { @@ -2619,20 +2615,20 @@ "l10n", "localization" ], - "time": "2019-11-26T23:25:11+00:00" + "time": "2020-01-04T14:08:26+00:00" }, { "name": "symfony/options-resolver", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "2be23e63f33de16b49294ea6581f462932a77e2f" + "reference": "9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2be23e63f33de16b49294ea6581f462932a77e2f", - "reference": "2be23e63f33de16b49294ea6581f462932a77e2f", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0", + "reference": "9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0", "shasum": "" }, "require": { @@ -2673,7 +2669,7 @@ "configuration", "options" ], - "time": "2019-10-28T21:57:16+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3027,16 +3023,16 @@ }, { "name": "symfony/process", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "b84501ad50adb72a94fb460a5b5c91f693e99c9b" + "reference": "f5697ab4cb14a5deed7473819e63141bf5352c36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/b84501ad50adb72a94fb460a5b5c91f693e99c9b", - "reference": "b84501ad50adb72a94fb460a5b5c91f693e99c9b", + "url": "https://api.github.com/repos/symfony/process/zipball/f5697ab4cb14a5deed7473819e63141bf5352c36", + "reference": "f5697ab4cb14a5deed7473819e63141bf5352c36", "shasum": "" }, "require": { @@ -3072,20 +3068,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-12-06T10:06:46+00:00" + "time": "2020-01-09T09:50:08+00:00" }, { "name": "symfony/property-access", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "055fe3134f8f301ff44af314d83463b858ea6413" + "reference": "090b4bc92ded1ec512f7e2ed1691210769dffdb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/055fe3134f8f301ff44af314d83463b858ea6413", - "reference": "055fe3134f8f301ff44af314d83463b858ea6413", + "url": "https://api.github.com/repos/symfony/property-access/zipball/090b4bc92ded1ec512f7e2ed1691210769dffdb3", + "reference": "090b4bc92ded1ec512f7e2ed1691210769dffdb3", "shasum": "" }, "require": { @@ -3139,20 +3135,20 @@ "property path", "reflection" ], - "time": "2019-12-10T10:33:21+00:00" + "time": "2020-01-04T13:00:46+00:00" }, { "name": "symfony/routing", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "628bcafae1b2043969378dcfbf9c196539a38722" + "reference": "7bf4e38573728e317b926ca4482ad30470d0e86a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/628bcafae1b2043969378dcfbf9c196539a38722", - "reference": "628bcafae1b2043969378dcfbf9c196539a38722", + "url": "https://api.github.com/repos/symfony/routing/zipball/7bf4e38573728e317b926ca4482ad30470d0e86a", + "reference": "7bf4e38573728e317b926ca4482ad30470d0e86a", "shasum": "" }, "require": { @@ -3215,20 +3211,20 @@ "uri", "url" ], - "time": "2019-12-12T12:53:52+00:00" + "time": "2020-01-08T17:29:02+00:00" }, { "name": "symfony/serializer", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "e5bc3f6dee44dc06e7e640cce4baa741b73ecb6e" + "reference": "76ecc214a93b763c29b924277e85f64326f9fbb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/e5bc3f6dee44dc06e7e640cce4baa741b73ecb6e", - "reference": "e5bc3f6dee44dc06e7e640cce4baa741b73ecb6e", + "url": "https://api.github.com/repos/symfony/serializer/zipball/76ecc214a93b763c29b924277e85f64326f9fbb2", + "reference": "76ecc214a93b763c29b924277e85f64326f9fbb2", "shasum": "" }, "require": { @@ -3296,7 +3292,7 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2019-12-16T11:07:37+00:00" + "time": "2020-01-07T22:30:39+00:00" }, { "name": "symfony/service-contracts", @@ -3358,16 +3354,16 @@ }, { "name": "symfony/var-exporter", - "version": "v5.0.2", + "version": "v5.0.3", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "1b9653e68d5b701bf6d9c91bdd3660078c9f4f28" + "reference": "960f9ac0fdbd642461ed29d7717aeb2a94d428b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1b9653e68d5b701bf6d9c91bdd3660078c9f4f28", - "reference": "1b9653e68d5b701bf6d9c91bdd3660078c9f4f28", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/960f9ac0fdbd642461ed29d7717aeb2a94d428b9", + "reference": "960f9ac0fdbd642461ed29d7717aeb2a94d428b9", "shasum": "" }, "require": { @@ -3414,20 +3410,20 @@ "instantiate", "serialize" ], - "time": "2019-12-01T08:48:26+00:00" + "time": "2020-01-04T14:08:26+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "a08832b974dd5fafe3085a66d41fe4c84bb2628c" + "reference": "cd014e425b3668220adb865f53bff64b3ad21767" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/a08832b974dd5fafe3085a66d41fe4c84bb2628c", - "reference": "a08832b974dd5fafe3085a66d41fe4c84bb2628c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/cd014e425b3668220adb865f53bff64b3ad21767", + "reference": "cd014e425b3668220adb865f53bff64b3ad21767", "shasum": "" }, "require": { @@ -3473,7 +3469,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-12-10T10:33:21+00:00" + "time": "2020-01-21T11:12:16+00:00" }, { "name": "typo3/class-alias-loader", diff --git a/config/sites/ep-events/config.yaml b/config/sites/ep-events/config.yaml index a9802b33..0a9d4b6e 100644 --- a/config/sites/ep-events/config.yaml +++ b/config/sites/ep-events/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 884 base: 'https://www.ep-events.de' baseVariants: - base: 'https://ep-events.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://ep-events.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -31,16 +39,7 @@ languages: fallbackType: strict fallbacks: '' flag: gb -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 884 routeEnhancers: NewsPlugin: type: Extbase @@ -117,10 +116,15 @@ routeEnhancers: routeFieldName: uid PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1703 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1703 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/config/sites/ep-reisen/config.yaml b/config/sites/ep-reisen/config.yaml index 1c876d72..8fbc375c 100644 --- a/config/sites/ep-reisen/config.yaml +++ b/config/sites/ep-reisen/config.yaml @@ -6,6 +6,9 @@ baseVariants: - base: 'https://schnee-event.burn.dpn' condition: 'applicationContext == "Development/Skimax"' + - + base: 'https://ep-reisen.ddev.site' + condition: 'applicationContext == "Development/Ddev"' disableStaticFileCache: true errorHandling: - diff --git a/config/sites/ski-boarderweek/config.yaml b/config/sites/ski-boarderweek/config.yaml index fdb9adb7..6404fef8 100644 --- a/config/sites/ski-boarderweek/config.yaml +++ b/config/sites/ski-boarderweek/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 24 base: 'https://www.ski-boarderweek.de' baseVariants: - base: 'https://ski-boarderweek.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://ski-boarderweek.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -17,16 +25,7 @@ languages: hreflang: de-DE direction: '' flag: de -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 24 routeEnhancers: TeamPlugin: type: Extbase @@ -48,11 +47,16 @@ routeEnhancers: routeFieldName: path_segment PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1701 - '/html': 1702 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1701 + /html: 1702 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/config/sites/ski-wochenenden/config.yaml b/config/sites/ski-wochenenden/config.yaml index f0ad45d4..d880dfab 100644 --- a/config/sites/ski-wochenenden/config.yaml +++ b/config/sites/ski-wochenenden/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 14 base: 'https://www.ski-wochenenden.de' baseVariants: - base: 'https://ski-wochenenden.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://ski-wochenenden.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -17,16 +25,7 @@ languages: hreflang: de-DE direction: '' flag: de -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 14 routeEnhancers: StaticResultsPlugin: type: Extbase @@ -45,11 +44,16 @@ routeEnhancers: filter_settings: '[A-Z\d%\-]+' PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1701 - '/html': 1702 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1701 + /html: 1702 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/config/sites/snowzone/config.yaml b/config/sites/snowzone/config.yaml index 5ec3d0dd..49ff557c 100644 --- a/config/sites/snowzone/config.yaml +++ b/config/sites/snowzone/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 25 base: 'https://www.snowzone.net' baseVariants: - base: 'https://snowzone.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://snowzone.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -17,16 +25,7 @@ languages: hreflang: de-DE direction: '' flag: de -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 25 routeEnhancers: TeamPlugin: type: Extbase @@ -48,11 +47,16 @@ routeEnhancers: routeFieldName: path_segment PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1701 - '/html': 1702 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1701 + /html: 1702 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/config/sites/unichamp/config.yaml b/config/sites/unichamp/config.yaml index cad09326..8f5e4ff1 100644 --- a/config/sites/unichamp/config.yaml +++ b/config/sites/unichamp/config.yaml @@ -1,9 +1,17 @@ -rootPageId: 26 base: 'https://www.unichamp.de' baseVariants: - base: 'https://unichamp.burn.dpn' condition: 'applicationContext == "Development"' + - + base: 'https://unichamp.ddev.site' + condition: 'applicationContext == "Development/Ddev"' +disableStaticFileCache: false +errorHandling: + - + errorCode: '404' + errorHandler: Page + errorContentSource: 't3://page?uid=608' languages: - title: Deutsch @@ -17,16 +25,7 @@ languages: hreflang: de-DE direction: '' flag: de -errorHandling: - - - errorCode: '404' - errorHandler: Page - errorContentSource: 't3://page?uid=608' -routes: - - - route: robots.txt - type: staticText - content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" +rootPageId: 26 routeEnhancers: TeamPlugin: type: Extbase @@ -48,11 +47,16 @@ routeEnhancers: routeFieldName: path_segment PageTypeSuffix: type: PageType - default: '/' + default: / index: '' map: - '/': 0 - '/json': 1701 - '/html': 1702 - 'sitemap.xml': 1533906435 - 'yoast-snippetpreview.json': 1480321830 + /: 0 + /json: 1701 + /html: 1702 + sitemap.xml: 1533906435 + yoast-snippetpreview.json: 1480321830 +routes: + - + route: robots.txt + type: staticText + content: "User-agent: *\r\nDisallow: /typo3/\r\nDisallow: /typo3_src/\r\nAllow: /typo3/sysext/frontend/Resources/Public/*\r\n" diff --git a/public/.htaccess b/public/.htaccess index c78f5b06..e4c320b9 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,5 +1,3 @@ -#SetEnv TYPO3_CONTEXT "Development" - ### Begin: Compression ### # Compressing resource files will save bandwidth and so improve loading speed especially for users @@ -238,8 +236,9 @@ AddDefaultCharset utf-8 # Enable URL rewriting RewriteEngine On - # Force SSL for all domains + # Force SSL RewriteCond %{HTTPS} off + RewriteCond %{HTTP:X-Forwarded-Proto} =http RewriteRule (.*) https://%{HTTP_HOST}/$1 [R=301,L] # Store the current location in an environment variable CWD to use @@ -252,20 +251,6 @@ AddDefaultCharset utf-8 #RewriteRule .? - [E=TYPO3_CONTEXT:Development] #RewriteCond %{HTTP_HOST} ^staging\.example\.com$ #RewriteRule .? - [E=TYPO3_CONTEXT:Production/Staging] - RewriteCond %{HTTP_HOST} ^eptypo3\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^ep\-events\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^ski\-wochenenden\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^ski\-boarderweek\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^snowzone\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^unichamp\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development] - RewriteCond %{HTTP_HOST} ^schnee\-event\.burn\.dpn$ - RewriteRule .? - [E=TYPO3_CONTEXT:Development/Skimax] # Rule for versioned static files, configured through: # - $GLOBALS['TYPO3_CONF_VARS']['BE']['versionNumberInFilename'] diff --git a/public/typo3conf/.gitignore b/public/typo3conf/.gitignore new file mode 100644 index 00000000..2f83a7c7 --- /dev/null +++ b/public/typo3conf/.gitignore @@ -0,0 +1,5 @@ +#ddev-generated: Automatically generated ddev .gitignore. +# You can remove the above line if you want to edit and maintain this file yourself. + +/AdditionalConfiguration.php +/drushrc.php