From 9ce7a55027ed77a223131b6dd03c8b8f8a0e9dc7 Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Thu, 30 Aug 2018 10:10:05 +0200 Subject: [PATCH 1/4] Add a recipe for contao/core-bundle and contao/installation-bundle --- contao/core-bundle/4.6/manifest.json | 18 ++++++++++++++++++ contao/core-bundle/4.6/post-install.txt | 16 ++++++++++++++++ .../4.6/config/routes/contao_installation.yaml | 2 ++ contao/installation-bundle/4.6/manifest.json | 5 +++++ 4 files changed, 41 insertions(+) create mode 100644 contao/core-bundle/4.6/manifest.json create mode 100644 contao/core-bundle/4.6/post-install.txt create mode 100644 contao/installation-bundle/4.6/config/routes/contao_installation.yaml create mode 100644 contao/installation-bundle/4.6/manifest.json diff --git a/contao/core-bundle/4.6/manifest.json b/contao/core-bundle/4.6/manifest.json new file mode 100644 index 00000000..f4013526 --- /dev/null +++ b/contao/core-bundle/4.6/manifest.json @@ -0,0 +1,18 @@ +{ + "bundles": { + "Contao\\CoreBundle\\ContaoCoreBundle": ["all"] + }, + "composer-scripts": { + "contao:install %PUBLIC_DIR%": "symfony-cmd", + "contao:symlinks %PUBLIC_DIR%": "symfony-cmd" + }, + "gitignore": [ + "/assets/", + "/files/", + "/system/*", + "!/system/config/", + "/system/config/localconfig.php", + "/system/config/tcpdf.php", + "/system/modules/*/.skip" + ] +} diff --git a/contao/core-bundle/4.6/post-install.txt b/contao/core-bundle/4.6/post-install.txt new file mode 100644 index 00000000..a2f27911 --- /dev/null +++ b/contao/core-bundle/4.6/post-install.txt @@ -0,0 +1,16 @@ + + Next: Contao configuration + + + * Enable ESI in the config/packages/framework.yaml file. + + * Add the Contao routes to your config/routing.yaml file and + make sure that they will be loaded at the very end. + + * Edit your config/security.yaml file and include all the + necessary providers, firewalls and access control sections. + + * Complete the installation by opening the /contao/install route + in your browser. + +Documentation: https://github.com/contao/core-bundle diff --git a/contao/installation-bundle/4.6/config/routes/contao_installation.yaml b/contao/installation-bundle/4.6/config/routes/contao_installation.yaml new file mode 100644 index 00000000..9d2ec7e2 --- /dev/null +++ b/contao/installation-bundle/4.6/config/routes/contao_installation.yaml @@ -0,0 +1,2 @@ +contao_installation: + resource: "@ContaoInstallationBundle/Resources/config/routing.yml" diff --git a/contao/installation-bundle/4.6/manifest.json b/contao/installation-bundle/4.6/manifest.json new file mode 100644 index 00000000..e164c6e6 --- /dev/null +++ b/contao/installation-bundle/4.6/manifest.json @@ -0,0 +1,5 @@ +{ + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + } +} From eb14c4803fc04b896f22b195ff5007072368378a Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Thu, 30 Aug 2018 11:20:42 +0200 Subject: [PATCH 2/4] Configure the contao.web_dir --- contao/core-bundle/4.6/config/packages/contao_core.yaml | 2 ++ contao/core-bundle/4.6/manifest.json | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 contao/core-bundle/4.6/config/packages/contao_core.yaml diff --git a/contao/core-bundle/4.6/config/packages/contao_core.yaml b/contao/core-bundle/4.6/config/packages/contao_core.yaml new file mode 100644 index 00000000..202e4ced --- /dev/null +++ b/contao/core-bundle/4.6/config/packages/contao_core.yaml @@ -0,0 +1,2 @@ +contao: + web_dir: "%kernel.project_dir%/public" diff --git a/contao/core-bundle/4.6/manifest.json b/contao/core-bundle/4.6/manifest.json index f4013526..0c538cd8 100644 --- a/contao/core-bundle/4.6/manifest.json +++ b/contao/core-bundle/4.6/manifest.json @@ -2,6 +2,9 @@ "bundles": { "Contao\\CoreBundle\\ContaoCoreBundle": ["all"] }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + }, "composer-scripts": { "contao:install %PUBLIC_DIR%": "symfony-cmd", "contao:symlinks %PUBLIC_DIR%": "symfony-cmd" From 939d9a09056262d3a246f66339afde51f4e77298 Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Thu, 30 Aug 2018 11:26:35 +0200 Subject: [PATCH 3/4] Also activate the installation bundle --- contao/installation-bundle/4.6/manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contao/installation-bundle/4.6/manifest.json b/contao/installation-bundle/4.6/manifest.json index e164c6e6..f14e39e9 100644 --- a/contao/installation-bundle/4.6/manifest.json +++ b/contao/installation-bundle/4.6/manifest.json @@ -1,4 +1,7 @@ { + "bundles": { + "Contao\\InstallationBundle\\ContaoInstallationBundle": ["all"] + }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" } From b91c7d527a4c617ab27373f6edb7f00aac0ef2af Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Thu, 30 Aug 2018 11:35:42 +0200 Subject: [PATCH 4/4] Add a link to the documentation --- contao/core-bundle/4.6/config/packages/contao_core.yaml | 1 + contao/core-bundle/4.6/post-install.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contao/core-bundle/4.6/config/packages/contao_core.yaml b/contao/core-bundle/4.6/config/packages/contao_core.yaml index 202e4ced..8e665be6 100644 --- a/contao/core-bundle/4.6/config/packages/contao_core.yaml +++ b/contao/core-bundle/4.6/config/packages/contao_core.yaml @@ -1,2 +1,3 @@ +# See https://github.com/contao/core-bundle contao: web_dir: "%kernel.project_dir%/public" diff --git a/contao/core-bundle/4.6/post-install.txt b/contao/core-bundle/4.6/post-install.txt index a2f27911..627ec044 100644 --- a/contao/core-bundle/4.6/post-install.txt +++ b/contao/core-bundle/4.6/post-install.txt @@ -5,7 +5,7 @@ * Enable ESI in the config/packages/framework.yaml file. * Add the Contao routes to your config/routing.yaml file and - make sure that they will be loaded at the very end. + make sure they are loaded at the very end. * Edit your config/security.yaml file and include all the necessary providers, firewalls and access control sections.