diff --git a/CHANGELOG.md b/CHANGELOG.md index 47a0f5e..2b072cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # nystudio107/craft Change Log +## 2.2.6 - 2020.03.27 +### Changed +* Remove Craft & Plugin Licenses from .env — not necessary except for public repos + ## 2.2.5 - 2020.03.27 ### Changed * Synced up the `project.yaml` with the `seed_db.sql` so it can properly propagate diff --git a/cms/config/project.yaml b/cms/config/project.yaml index 0abf730..842a849 100644 --- a/cms/config/project.yaml +++ b/cms/config/project.yaml @@ -83,7 +83,7 @@ plugins: image-optimize: edition: standard enabled: true - licenseKey: $PLUGIN_IMAGEOPTIMIZE_LICENSE + licenseKey: null schemaVersion: 1.0.0 settings: allowUpScaledImageVariants: false @@ -131,12 +131,12 @@ plugins: retour: edition: standard enabled: true - licenseKey: $PLUGIN_RETOUR_LICENSE + licenseKey: null schemaVersion: 3.0.9 seomatic: edition: standard enabled: true - licenseKey: $PLUGIN_SEOMATIC_LICENSE + licenseKey: null schemaVersion: 3.0.8 twigpack: edition: standard @@ -149,7 +149,7 @@ plugins: webperf: edition: standard enabled: true - licenseKey: $PLUGIN_WEBPERF_LICENSE + licenseKey: null schemaVersion: 1.0.1 sections: 54e60257-f31a-44aa-960e-bbd364197e28: diff --git a/cms/example.env b/cms/example.env index fe38226..07de413 100644 --- a/cms/example.env +++ b/cms/example.env @@ -25,13 +25,6 @@ ASSETS_URL=http://localhost:8000 SITE_URL=http://localhost:8000 WEB_ROOT_PATH=/var/www/project/cms/web -# Craft & Plugin Licenses -LICENSE_KEY= -PLUGIN_RETOUR_LICENSE= -PLUGIN_SEOMATIC_LICENSE= -PLUGIN_TRANSCODER_LICENSE= -PLUGIN_WEBPERF_LICENSE= - # S3 settings S3_KEY_ID= S3_SECRET= diff --git a/cms/web/index.php b/cms/web/index.php index 3d5f51a..b310965 100644 --- a/cms/web/index.php +++ b/cms/web/index.php @@ -15,9 +15,6 @@ Dotenv\Dotenv::create(CRAFT_BASE_PATH)->load(); } -// Set license key via .env -define('CRAFT_LICENSE_KEY', getenv('LICENSE_KEY')); - // Load and run Craft define('CRAFT_ENVIRONMENT', getenv('ENVIRONMENT') ?: 'production'); $app = require CRAFT_VENDOR_PATH.'/craftcms/cms/bootstrap/web.php'; diff --git a/composer.json b/composer.json index 528ef28..46931e3 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "craftcms/craft", "description": "nystudio107 Craft 3.4 CMS scaffolding project", - "version": "2.2.5", + "version": "2.2.6", "keywords": [ "craft", "cms",