From 592f8110e650618c0924bd6bd5d1992f8f6f5904 Mon Sep 17 00:00:00 2001 From: Adrien DUPUIS Date: Tue, 14 Apr 2020 17:38:22 +0200 Subject: [PATCH 1/5] Enable ez_platform_site_factory --- config/packages/ezplatform.yaml | 12 ++++++++++++ config/packages/ezplatform_site_factory.yaml | 16 ++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/config/packages/ezplatform.yaml b/config/packages/ezplatform.yaml index 6fd7685b..46fa0f7c 100644 --- a/config/packages/ezplatform.yaml +++ b/config/packages/ezplatform.yaml @@ -56,6 +56,8 @@ ezplatform: list: [site] groups: site_group: [site] + site_factory_1st_purpose_group: [] + site_factory_2nd_purpose_group: [] default_siteaccess: site match: URIElement: 1 @@ -85,6 +87,11 @@ ezplatform: site: languages: [eng-GB] + site_factory_1st_purpose_group: + design: site_factory_1st_purpose_design + site_factory_2nd_purpose_group: + design: site_factory_2nd_purpose_design + admin_group: # System languages. Note that by default, content, content types, and other data are in eng-GB locale, # so removing eng-GB from this list may lead to errors or content not being shown, unless you change @@ -104,6 +111,11 @@ ezplatform: slug_converter: transformation: 'urlalias_lowercase' +ezdesign: + design_list: + site_factory_1st_purpose_design: [first_purpose_design] + site_factory_2nd_purpose_design: [second_purpose_design] + framework: translator: { fallback: '%locale_fallback%' } validation: { enable_annotations: true } diff --git a/config/packages/ezplatform_site_factory.yaml b/config/packages/ezplatform_site_factory.yaml index 6f5d11ca..02ca0001 100644 --- a/config/packages/ezplatform_site_factory.yaml +++ b/config/packages/ezplatform_site_factory.yaml @@ -1,7 +1,11 @@ ez_platform_site_factory: - enabled: false -# templates: -# site_template: -# siteaccess_group: site_factory_group -# name: Example Site -# thumbnail: https://placekitten.com/500/500 + enabled: true + templates: + 1st_purpose_group: + siteaccess_group: site_factory_1st_purpose_group + name: First Purpose + thumbnail: /bundles/ezplatformadminui/img/default-profile-picture.png + 2nd_purpose_group: + siteaccess_group: site_factory_2nd_purpose_group + name: Second Purpose + thumbnail: /bundles/ezplatformadminui/img/default-profile-picture.png From 65650e01c6bf63a0491c4550f43954fe7546da1a Mon Sep 17 00:00:00 2001 From: Adrien DUPUIS Date: Wed, 15 Apr 2020 12:15:47 +0200 Subject: [PATCH 2/5] Enable EzPlatformSiteFactory\SiteAccessMatcher; Design changes --- config/packages/ezplatform.yaml | 7 ++++--- config/packages/ezplatform_site_factory.yaml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/packages/ezplatform.yaml b/config/packages/ezplatform.yaml index 46fa0f7c..5636c0cd 100644 --- a/config/packages/ezplatform.yaml +++ b/config/packages/ezplatform.yaml @@ -61,8 +61,9 @@ ezplatform: default_siteaccess: site match: URIElement: 1 + HostElement: 1 # Uncomment if you've enabled SiteFactory - # '@EzSystems\EzPlatformSiteFactory\SiteAccessMatcher': ~ + '@EzSystems\EzPlatformSiteFactory\SiteAccessMatcher': ~ # System settings, read in following order: `default`, , , and `global` # TIP: For multisite installations organize shared config into SiteAccess groups, @@ -113,8 +114,8 @@ ezplatform: ezdesign: design_list: - site_factory_1st_purpose_design: [first_purpose_design] - site_factory_2nd_purpose_design: [second_purpose_design] + site_factory_1st_purpose_design: [1st_purpose_design] + site_factory_2nd_purpose_design: [2nd_purpose_design] framework: translator: { fallback: '%locale_fallback%' } diff --git a/config/packages/ezplatform_site_factory.yaml b/config/packages/ezplatform_site_factory.yaml index 02ca0001..1e42982a 100644 --- a/config/packages/ezplatform_site_factory.yaml +++ b/config/packages/ezplatform_site_factory.yaml @@ -8,4 +8,4 @@ ez_platform_site_factory: 2nd_purpose_group: siteaccess_group: site_factory_2nd_purpose_group name: Second Purpose - thumbnail: /bundles/ezplatformadminui/img/default-profile-picture.png + thumbnail: /bundles/ezplatformadminuiassets/vendors/leaflet/dist/images/layers-2x.png From e2bc0d89c4c5daed9a89452893d7c6f0bfc91284 Mon Sep 17 00:00:00 2001 From: Adrien DUPUIS Date: Thu, 16 Apr 2020 14:37:56 +0200 Subject: [PATCH 3/5] docker/Readme.md: Site Factory public accesses query Might be useless when something like https://github.com/ezsystems/ezplatform-site-factory/commit/aff86f065ec706e20bf0311633de4aa596555151 will be in a release. --- docker/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/README.md b/docker/README.md index 507a2f3e..8a5f54c6 100644 --- a/docker/README.md +++ b/docker/README.md @@ -125,6 +125,9 @@ URLs and Command Lines - Get extended status: `docker-compose exec mariadb mysqladmin -proot extended-status;` - Show process list: `docker-compose exec mariadb mysqladmin --password=root processlist --verbose;` - Get last content modification date: `docker-compose exec mariadb mysql -proot ezplatform -e "SELECT FROM_UNIXTIME(modified) AS modified FROM ezcontentobject ORDER BY modified DESC LIMIT 1;";` +* eZ Platform DB + - Get last content modification date: `docker-compose exec mariadb mysql -proot ezplatform -e "SELECT FROM_UNIXTIME(modified) AS modified FROM ezcontentobject ORDER BY modified DESC LIMIT 1;";` + - Get Site Factory public access list: `docker-compose exec mariadb mysql -proot ezplatform -e "SELECT spa.site_id, spa.public_access_identifier, spa.site_matcher_host, s.name FROM ezsite_public_access AS spa JOIN ezsite AS s ON spa.site_id = s.id;";` * Solr - Get OS release: `docker-compose exec solr cat /etc/os-release;` - Get Solr version: `docker-compose exec solr bin/solr version;` From a080d4e4d7627c0f602a42bc97a210f979147dd7 Mon Sep 17 00:00:00 2001 From: Adrien DUPUIS Date: Fri, 24 Apr 2020 11:49:15 +0200 Subject: [PATCH 4/5] ezplatform_site_factory.yaml: Rename templates for clarity --- config/packages/ezplatform_site_factory.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/packages/ezplatform_site_factory.yaml b/config/packages/ezplatform_site_factory.yaml index 1e42982a..c72fdb13 100644 --- a/config/packages/ezplatform_site_factory.yaml +++ b/config/packages/ezplatform_site_factory.yaml @@ -1,11 +1,11 @@ ez_platform_site_factory: enabled: true templates: - 1st_purpose_group: + 1st_purpose_site_template: siteaccess_group: site_factory_1st_purpose_group name: First Purpose thumbnail: /bundles/ezplatformadminui/img/default-profile-picture.png - 2nd_purpose_group: + 2nd_purpose_site_template: siteaccess_group: site_factory_2nd_purpose_group name: Second Purpose thumbnail: /bundles/ezplatformadminuiassets/vendors/leaflet/dist/images/layers-2x.png From 13e11c028ae3bb147a9f20663cea2f6f50e34cf4 Mon Sep 17 00:00:00 2001 From: Adrien DUPUIS Date: Fri, 24 Apr 2020 14:52:06 +0200 Subject: [PATCH 5/5] ezplatform_site_factory.yaml: Shows that default site_group can be used --- config/packages/ezplatform_site_factory.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/packages/ezplatform_site_factory.yaml b/config/packages/ezplatform_site_factory.yaml index c72fdb13..b2693441 100644 --- a/config/packages/ezplatform_site_factory.yaml +++ b/config/packages/ezplatform_site_factory.yaml @@ -1,6 +1,10 @@ ez_platform_site_factory: enabled: true templates: + site_template: + siteaccess_group: site_group + name: Example Site + thumbnail: https://placekitten.com/160/95 1st_purpose_site_template: siteaccess_group: site_factory_1st_purpose_group name: First Purpose