-
Notifications
You must be signed in to change notification settings - Fork 9.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Environment based local.xml merging #41
Conversation
Support merging an additional local.xml file based on the value of the MAGE_APPLICATION_ENV environment variable. The name of the file will be built as follows: 'app/etc/local.' . $_SERVER['MAGE_APPLICATION_ENV'] . '.xml' The value of the variable is checked to contain only letters, characters, underscores and dashes. The file will be merged after the regular local.xml file. The background idea is described by Matthias Zeis at #7
Thanks Vinai for the implementation. I tested these scenarios successfully:
If somebody wants to try this, follow these steps:
|
Instead of applying the proposed patch, we have implemented it in different way. Most of modifications will be concentrated in
This change will be rolled out in one of next updates. |
Thank you for the detailed answer! |
* Refactored ACL for the backend * ACL resources * Strict configuration format, validated by XSD schema * ACL configuration relocation from `app/code/<pool>/<namespace>/<module>/etc/adminhtml.xml` to `app/code/<pool>/<namespace>/<module>/etc/adminhtml/acl.xml` * Renamed ACL resource identifiers according to the format `<namespace>_<module>::<resource>` throughout the system * Backend menu configuration requires to specify ACL resource identifier in the new format * Explicit declaration of ACL resources in `app/code/<pool>/<namespace>/<module>/etc/system.xml` instead of implicit relation by XPath * Migration tool `dev/tools/migration/acl.php` to convert ACL configuration from 1.x to 2.x * Declaration of ACL resource/role/rule loaders through the area configuration * Module `Mage_Backend` declares loader for ACL resources in backend area * Module `Mage_User` declares loaders for ACL roles and rules (relations between roles and resources) in backend area * Implemented integrity and legacy tests for ACL * Fixed issues: * Losing qty and visibility information when importing products * Impossibility to reload captcha on backend * Temporary excluded from execution integration test `Mage_Review_Model_Resource_Review_Product_CollectionTest::testGetResultingIds()` and corresponding fixture script, which cause occasional `segmentation fault` (exit code 139) * Refactored methods with high cyclomatic complexity: * `Mage_Adminhtml_Block_System_Store_Edit_Form::_prepareForm()` * `Mage_Adminhtml_Block_System_Config_Form::initForm()` * `Mage_Adminhtml_Block_System_Config_Form::initFields()` * GitHub requests: * [#32](#32) -- fixed declaration of localization CSV files * [#35](#35) -- removed non-used `Mage_Core_Block_Flush` block * [#41](#41) -- implemented ability to extends `app/etc/local.xml` by specifying additional config file via `MAGE_LOCAL_CONFIG` environment variable
* Refactored ACL for the backend * ACL resources * Strict configuration format, validated by XSD schema * ACL configuration relocation from `app/code/<pool>/<namespace>/<module>/etc/adminhtml.xml` to `app/code/<pool>/<namespace>/<module>/etc/adminhtml/acl.xml` * Renamed ACL resource identifiers according to the format `<namespace>_<module>::<resource>` throughout the system * Backend menu configuration requires to specify ACL resource identifier in the new format * Explicit declaration of ACL resources in `app/code/<pool>/<namespace>/<module>/etc/system.xml` instead of implicit relation by XPath * Migration tool `dev/tools/migration/acl.php` to convert ACL configuration from 1.x to 2.x * Declaration of ACL resource/role/rule loaders through the area configuration * Module `Mage_Backend` declares loader for ACL resources in backend area * Module `Mage_User` declares loaders for ACL roles and rules (relations between roles and resources) in backend area * Implemented integrity and legacy tests for ACL * Fixed issues: * Losing qty and visibility information when importing products * Impossibility to reload captcha on backend * Temporary excluded from execution integration test `Mage_Review_Model_Resource_Review_Product_CollectionTest::testGetResultingIds()` and corresponding fixture script, which cause occasional `segmentation fault` (exit code 139) * Refactored methods with high cyclomatic complexity: * `Mage_Adminhtml_Block_System_Store_Edit_Form::_prepareForm()` * `Mage_Adminhtml_Block_System_Config_Form::initForm()` * `Mage_Adminhtml_Block_System_Config_Form::initFields()` * GitHub requests: * [#32](#32) -- fixed declaration of localization CSV files * [#35](#35) -- removed non-used `Mage_Core_Block_Flush` block * [#41](#41) -- implemented ability to extends `app/etc/local.xml` by specifying additional config file via `MAGE_LOCAL_CONFIG` environment variable
MAGETWO-31053: M2 GitHub Update (version 0.42.0-beta4)
MC-42049: Fix keydown and keyup
Support merging an additional local.xml file based on the value of
the MAGE_APPLICATION_ENV environment variable.
The name of the file will be built as follows:
'app/etc/local.' . $_SERVER['MAGE_APPLICATION_ENV'] . '.xml'
The value of the variable is checked to contain only letters,
characters, underscores and dashes.
The file will be merged after the regular local.xml file.
The background idea is described by Matthias Zeis at
#7