From 2d54a52e8aa4715f337ccfbf80a4c38191a1b3b6 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 23 Mar 2018 16:51:09 +0100 Subject: [PATCH 1/2] Add recipe for MediaMonks Sonata Media Bundle 2.0 --- .../config/packages/mediamonks_sonata_media.yaml | 5 +++++ .../2.0/config/routes/mediamonks_sonata_media.yaml | 5 +++++ mediamonks/sonata-media-bundle/2.0/manifest.json | 12 ++++++++++++ .../sonata-media-bundle/2.0/post-install.txt | 7 +++++++ .../sonata-media-bundle/2.0/src/Entity/Media.php | 14 ++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 mediamonks/sonata-media-bundle/2.0/config/packages/mediamonks_sonata_media.yaml create mode 100644 mediamonks/sonata-media-bundle/2.0/config/routes/mediamonks_sonata_media.yaml create mode 100644 mediamonks/sonata-media-bundle/2.0/manifest.json create mode 100644 mediamonks/sonata-media-bundle/2.0/post-install.txt create mode 100644 mediamonks/sonata-media-bundle/2.0/src/Entity/Media.php diff --git a/mediamonks/sonata-media-bundle/2.0/config/packages/mediamonks_sonata_media.yaml b/mediamonks/sonata-media-bundle/2.0/config/packages/mediamonks_sonata_media.yaml new file mode 100644 index 00000000..3b5c91c8 --- /dev/null +++ b/mediamonks/sonata-media-bundle/2.0/config/packages/mediamonks_sonata_media.yaml @@ -0,0 +1,5 @@ +mediamonks_sonata_media: + filesystem_private: 'oneup_flysystem.default_filesystem_filesystem' + filesystem_public: 'oneup_flysystem.default_filesystem_filesystem' + redirect_url: '%env(APP_MEDIA_REDIRECT_URL)%' + model_class: App\Entity\Media diff --git a/mediamonks/sonata-media-bundle/2.0/config/routes/mediamonks_sonata_media.yaml b/mediamonks/sonata-media-bundle/2.0/config/routes/mediamonks_sonata_media.yaml new file mode 100644 index 00000000..2b7e5786 --- /dev/null +++ b/mediamonks/sonata-media-bundle/2.0/config/routes/mediamonks_sonata_media.yaml @@ -0,0 +1,5 @@ +mediamonks_sonata_media_admin: + resource: "@MediaMonksSonataMediaBundle/Resources/config/routing_admin.yml" + +mediamonks_sonata_media: + resource: "@MediaMonksSonataMediaBundle/Resources/config/routing.yml" diff --git a/mediamonks/sonata-media-bundle/2.0/manifest.json b/mediamonks/sonata-media-bundle/2.0/manifest.json new file mode 100644 index 00000000..faf9f181 --- /dev/null +++ b/mediamonks/sonata-media-bundle/2.0/manifest.json @@ -0,0 +1,12 @@ +{ + "bundles": { + "MediaMonks\\SonataMediaBundle\\MediaMonksSonataMediaBundle": ["all"] + }, + "env": { + "APP_MEDIA_REDIRECT_URL": "https://media-redirect-url/" + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/", + "src/": "%SRC_DIR%/" + } +} diff --git a/mediamonks/sonata-media-bundle/2.0/post-install.txt b/mediamonks/sonata-media-bundle/2.0/post-install.txt new file mode 100644 index 00000000..053393a3 --- /dev/null +++ b/mediamonks/sonata-media-bundle/2.0/post-install.txt @@ -0,0 +1,7 @@ + + Media Configuration + + + * Finish the media configuration: + 1. Configure the flysystem filesystems for private and public file storage + 2. Change the redirect url to your media, a reverse proxy or CDN is highly recommended diff --git a/mediamonks/sonata-media-bundle/2.0/src/Entity/Media.php b/mediamonks/sonata-media-bundle/2.0/src/Entity/Media.php new file mode 100644 index 00000000..6c416e36 --- /dev/null +++ b/mediamonks/sonata-media-bundle/2.0/src/Entity/Media.php @@ -0,0 +1,14 @@ + Date: Fri, 23 Mar 2018 16:59:49 +0100 Subject: [PATCH 2/2] Update environment variable, update post install --- .../2.0/config/packages/mediamonks_sonata_media.yaml | 2 +- mediamonks/sonata-media-bundle/2.0/manifest.json | 2 +- mediamonks/sonata-media-bundle/2.0/post-install.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mediamonks/sonata-media-bundle/2.0/config/packages/mediamonks_sonata_media.yaml b/mediamonks/sonata-media-bundle/2.0/config/packages/mediamonks_sonata_media.yaml index 3b5c91c8..42d9d62a 100644 --- a/mediamonks/sonata-media-bundle/2.0/config/packages/mediamonks_sonata_media.yaml +++ b/mediamonks/sonata-media-bundle/2.0/config/packages/mediamonks_sonata_media.yaml @@ -1,5 +1,5 @@ mediamonks_sonata_media: filesystem_private: 'oneup_flysystem.default_filesystem_filesystem' filesystem_public: 'oneup_flysystem.default_filesystem_filesystem' - redirect_url: '%env(APP_MEDIA_REDIRECT_URL)%' + redirect_url: '%env(MEDIA_REDIRECT_URL)%' model_class: App\Entity\Media diff --git a/mediamonks/sonata-media-bundle/2.0/manifest.json b/mediamonks/sonata-media-bundle/2.0/manifest.json index faf9f181..8d772bcd 100644 --- a/mediamonks/sonata-media-bundle/2.0/manifest.json +++ b/mediamonks/sonata-media-bundle/2.0/manifest.json @@ -3,7 +3,7 @@ "MediaMonks\\SonataMediaBundle\\MediaMonksSonataMediaBundle": ["all"] }, "env": { - "APP_MEDIA_REDIRECT_URL": "https://media-redirect-url/" + "MEDIA_REDIRECT_URL": "https://media-redirect-url/" }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/", diff --git a/mediamonks/sonata-media-bundle/2.0/post-install.txt b/mediamonks/sonata-media-bundle/2.0/post-install.txt index 053393a3..41e99f1e 100644 --- a/mediamonks/sonata-media-bundle/2.0/post-install.txt +++ b/mediamonks/sonata-media-bundle/2.0/post-install.txt @@ -4,4 +4,4 @@ * Finish the media configuration: 1. Configure the flysystem filesystems for private and public file storage - 2. Change the redirect url to your media, a reverse proxy or CDN is highly recommended + 2. Modify your MEDIA_REDIRECT_URL config in .env, a reverse proxy or CDN is highly recommended