Merge branch 'release/1.0.16'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # nystudio107/plugindev Change Log
 
+## 1.0.16 - 2021.04.17
+### Changed
+* Use separate `phpSessionName`s for MySQL and Postgres, to keep us logged in when switching between them
+
 ## 1.0.15 - 2021.04.10
 ### Added
 * Added `make craft` to the Makefile commands

Makefile

@@ -13,9 +13,11 @@ craft: up
 	docker exec -it ${CONTAINER} php craft \
 		$(filter-out $@,$(MAKECMDGOALS))
 mysql: up
-	cp cms/config/_dbconfigs/mysql.php cms/config/db.php
+	cp cms/config/_configs/mysql/db.php cms/config/db.php
+	cp cms/config/_configs/mysql/general.php cms/config/general.php
 postgres: up
-	cp cms/config/_dbconfigs/postgres.php cms/config/db.php
+	cp cms/config/_configs/postgres/db.php cms/config/db.php
+	cp cms/config/_configs/postgres/general.php cms/config/general.php
 update:
 	docker-compose down
 	rm -f cms/composer.lock

cms/config/_configs/mysql/general.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * General Configuration
+ *
+ * All of your system's general configuration settings go in here. You can see a
+ * list of the available settings in vendor/craftcms/cms/src/config/GeneralConfig.php.
+ *
+ * @see \craft\config\GeneralConfig
+ */
+
+use craft\helpers\App;
+
+return [
+    'phpSessionName' => 'CraftSessionIdMySQL',
+    // Craft config settings from .env variables
+    'aliases' => [
+        '@assetsUrl' => App::env('ASSETS_URL'),
+        '@cloudfrontUrl' => App::env('CLOUDFRONT_URL'),
+        '@web' => App::env('SITE_URL'),
+        '@webroot' => App::env('WEB_ROOT_PATH'),
+    ],
+    'allowUpdates' => (bool)App::env('ALLOW_UPDATES'),
+    'allowAdminChanges' => (bool)App::env('ALLOW_ADMIN_CHANGES'),
+    'backupOnUpdate' => (bool)App::env('BACKUP_ON_UPDATE'),
+    'devMode' => (bool)App::env('DEV_MODE'),
+    'enableTemplateCaching' => (bool)App::env('ENABLE_TEMPLATE_CACHING'),
+    'resourceBasePath' => App::env('WEB_ROOT_PATH').'/cpresources',
+    'runQueueAutomatically' => (bool)App::env('RUN_QUEUE_AUTOMATICALLY'),
+    'securityKey' => App::env('SECURITY_KEY'),
+    // Craft config settings from constants
+    'cacheDuration' => false,
+    'defaultSearchTermOptions' => [
+        'subLeft' => true,
+        'subRight' => true,
+    ],
+    'defaultTokenDuration' => 'P2W',
+    'enableCsrfProtection' => true,
+    'generateTransformsBeforePageLoad' => true,
+    'maxCachedCloudImageSize' => 3000,
+    'maxUploadFileSize' => '100M',
+    'omitScriptNameInUrls' => true,
+    'useEmailAsUsername' => false,
+    'usePathInfo' => true,
+    'useProjectConfigFile' => true,
+];

cms/config/_configs/postgres/general.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * General Configuration
+ *
+ * All of your system's general configuration settings go in here. You can see a
+ * list of the available settings in vendor/craftcms/cms/src/config/GeneralConfig.php.
+ *
+ * @see \craft\config\GeneralConfig
+ */
+
+use craft\helpers\App;
+
+return [
+    'phpSessionName' => 'CraftSessionIdPostgres',
+    // Craft config settings from .env variables
+    'aliases' => [
+        '@assetsUrl' => App::env('ASSETS_URL'),
+        '@cloudfrontUrl' => App::env('CLOUDFRONT_URL'),
+        '@web' => App::env('SITE_URL'),
+        '@webroot' => App::env('WEB_ROOT_PATH'),
+    ],
+    'allowUpdates' => (bool)App::env('ALLOW_UPDATES'),
+    'allowAdminChanges' => (bool)App::env('ALLOW_ADMIN_CHANGES'),
+    'backupOnUpdate' => (bool)App::env('BACKUP_ON_UPDATE'),
+    'devMode' => (bool)App::env('DEV_MODE'),
+    'enableTemplateCaching' => (bool)App::env('ENABLE_TEMPLATE_CACHING'),
+    'resourceBasePath' => App::env('WEB_ROOT_PATH').'/cpresources',
+    'runQueueAutomatically' => (bool)App::env('RUN_QUEUE_AUTOMATICALLY'),
+    'securityKey' => App::env('SECURITY_KEY'),
+    // Craft config settings from constants
+    'cacheDuration' => false,
+    'defaultSearchTermOptions' => [
+        'subLeft' => true,
+        'subRight' => true,
+    ],
+    'defaultTokenDuration' => 'P2W',
+    'enableCsrfProtection' => true,
+    'generateTransformsBeforePageLoad' => true,
+    'maxCachedCloudImageSize' => 3000,
+    'maxUploadFileSize' => '100M',
+    'omitScriptNameInUrls' => true,
+    'useEmailAsUsername' => false,
+    'usePathInfo' => true,
+    'useProjectConfigFile' => true,
+];

cms/config/general.php

@@ -11,6 +11,7 @@
 use craft\helpers\App;
 
 return [
+    'phpSessionName' => 'CraftSessionIdMySQL',
     // Craft config settings from .env variables
     'aliases' => [
         '@assetsUrl' => App::env('ASSETS_URL'),