Skip to content

Commit 75f9ddf

Browse files
committed
Fix Warning/Note boxes
1 parent 05bb603 commit 75f9ddf

File tree

7 files changed

+31
-32
lines changed

7 files changed

+31
-32
lines changed

configuration/dns-resolver.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ sudo service network-manager restart
5858
```
5959

6060
:::{note}
61-
In the above examples you can replace ``1.1.1.1`` and ``1.0.0.1`` (CloudFlare) with the IP of your own preferred DNS resolution service such as ``8.8.8.8`` and ``8.8.4.4`` (Google) or ``9.9.9.9`` and ``149.112.112.112`` (Quad9)
61+
In the above examples you can replace ``1.1.1.1`` and ``1.0.0.1`` (CloudFlare) with the IP of your own preferred DNS resolution service such as ``8.8.8.8`` and ``8.8.4.4`` (Google) or ``9.9.9.9`` and ``149.112.112.112`` (Quad9)
6262
:::
6363

6464
### Windows

configuration/livereload.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ Magento 2 bundles an example grunt based server-side compilation workflow which
3030
```
3131

3232
:::{note}
33-
This can be accomplished via alternative means, the important part is the browser requesting ``/livereload.js?port=443`` when running the site on your local development environment.
33+
This can be accomplished via alternative means, the important part is the browser requesting ``/livereload.js?port=443`` when running the site on your local development environment.
3434
:::
3535

36-
5. Run `bin/magento app:config:import` to load merged configuration into the application.
36+
6. Run `bin/magento app:config:import` to load merged configuration into the application.
3737

3838
**With the above configuration in place**, you'll first enter the FPM container via `warden shell` and then setup as follows:
3939

configuration/multipledomains.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ Multiple top-level domains may also be setup by following the instructions below
3939
4. Run `warden env up` to update the containers, after which each of the URLs should work as expected.
4040

4141
:::{note}
42-
If these alternate domains must be resolvable from within the FPM containers, you must also leverage ``extra_hosts`` to add each specific sub-domain to the ``/etc/hosts`` file of the container as dnsmasq is used only on the host machine, not inside the containers. This should look something like the following excerpt.
43-
42+
If these alternate domains must be resolvable from within the FPM containers, you must also leverage ``extra_hosts`` to add each specific sub-domain to the ``/etc/hosts`` file of the container as dnsmasq is used only on the host machine, not inside the containers. This should look something like the following excerpt.
4443
:::
4544

4645
```yaml
@@ -101,7 +100,7 @@ When multiple domains are being used to load different stores or websites on Mag
101100
```
102101

103102
:::{note}
104-
The above example will not alter production site behavior given the default is to return should the ``HTTP_HOST`` value not match one of the defined ``case`` statements. This is desired as some hosting environments define run codes and types in an Nginx mapping. One may add production host names to the switch block should it be desired to use the same site switching mechanism across all environments.
103+
The above example will not alter production site behavior given the default is to return should the ``HTTP_HOST`` value not match one of the defined ``case`` statements. This is desired as some hosting environments define run codes and types in an Nginx mapping. One may add production host names to the switch block should it be desired to use the same site switching mechanism across all environments.
105104
:::
106105

107106
2. Then in `composer.json` add the file created in the previous step to the list of files which are automatically loaded by composer on each web request:
@@ -117,7 +116,7 @@ When multiple domains are being used to load different stores or websites on Mag
117116
```
118117

119118
:::{note}
120-
This is similar to using `magento-vars.php` on Magento Commerce Cloud, but using composer to load the file rather than relying on Commerce Cloud magic: https://devdocs.magento.com/guides/v2.3/cloud/project/project-multi-sites.html
119+
This is similar to using `magento-vars.php` on Magento Commerce Cloud, but using composer to load the file rather than relying on Commerce Cloud magic: https://devdocs.magento.com/guides/v2.3/cloud/project/project-multi-sites.html
121120
:::
122121

123122
3. After editing the `composer.json` regenerate the auto load configuration:

environments/magento2.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The below example demonstrates the from-scratch setup of the Magento 2 application for local development. A similar process can easily be used to configure an environment of any other type. This assumes that Warden has been previously started via `warden svc up` as part of the installation procedure.
44

55
:::{note}
6-
In addition to the below manual process, there is a `Github Template available for Magento 2 <https://github.com/wardenenv/warden-env-magento2>`_ allowing for quick setup of new Magento projects. To use this, click the green "Use this template" button to create your own repository based on the template repository, run the init script and update the README with any project specific information.
6+
In addition to the below manual process, there is a `Github Template available for Magento 2 <https://github.com/wardenenv/warden-env-magento2>`_ allowing for quick setup of new Magento projects. To use this, click the green "Use this template" button to create your own repository based on the template repository, run the init script and update the README with any project specific information.
77
:::
88

99
1. Create a new directory on your host machine at the location of your choice and then jump into the new directory to get started:
@@ -65,7 +65,7 @@ The below example demonstrates the from-scratch setup of the Magento 2 applicati
6565
warden env up
6666

6767
:::{warning}
68-
If you encounter an error about ``Mounts denied``, follow the instructions in the error message and run ``warden env up`` again.
68+
If you encounter an error about ``Mounts denied``, follow the instructions in the error message and run ``warden env up`` again.
6969
:::
7070

7171
5. Drop into a shell within the project environment. Commands following this step in the setup procedure will be run from within the `php-fpm` docker container this launches you into:
@@ -77,11 +77,11 @@ The below example demonstrates the from-scratch setup of the Magento 2 applicati
7777
composer global config http-basic.repo.magento.com <username> <password>
7878

7979
:::{note}
80-
To locate your authentication keys for Magento 2 repository, `reference DevDocs <https://devdocs.magento.com/guides/v2.3/install-gde/prereq/connect-auth.html>`_.
80+
To locate your authentication keys for Magento 2 repository, `reference DevDocs <https://devdocs.magento.com/guides/v2.3/install-gde/prereq/connect-auth.html>`_.
8181

82-
If you have previously configured global credentials, you may skip this step, as ``~/.composer/`` is mounted into the container from the host machine in order to share composer cache between projects, and also shares the global ``auth.json`` from the host machine.
82+
If you have previously configured global credentials, you may skip this step, as ``~/.composer/`` is mounted into the container from the host machine in order to share composer cache between projects, and also shares the global ``auth.json`` from the host machine.
8383

84-
Use the **Public key** as your username and the **Private key** as your password.
84+
Use the **Public key** as your username and the **Private key** as your password.
8585
:::
8686

8787
7. Initialize project source files using composer create-project and then move them into place:
@@ -155,16 +155,16 @@ The below example demonstrates the from-scratch setup of the Magento 2 applicati
155155
bin/magento cache:flush
156156

157157
:::{note}
158-
Prior to Magento ``2.4.x`` it was not required to enter search-engine and elasticsearch configuration during installation and these params to ``setup:install`` are not supported by Magento ``2.3.x``. These should be omitted on older versions where not supported and Elasticsearch configured via ``config:set`` instead:
159-
160-
```bash
161-
bin/magento config:set --lock-env catalog/search/engine elasticsearch7
162-
bin/magento config:set --lock-env catalog/search/elasticsearch7_server_hostname elasticsearch
163-
bin/magento config:set --lock-env catalog/search/elasticsearch7_server_port 9200
164-
bin/magento config:set --lock-env catalog/search/elasticsearch7_index_prefix magento2
165-
bin/magento config:set --lock-env catalog/search/elasticsearch7_enable_auth 0
166-
bin/magento config:set --lock-env catalog/search/elasticsearch7_server_timeout 15
167-
```
158+
Prior to Magento ``2.4.x`` it was not required to enter search-engine and elasticsearch configuration during installation and these params to ``setup:install`` are not supported by Magento ``2.3.x``. These should be omitted on older versions where not supported and Elasticsearch configured via ``config:set`` instead:
159+
160+
```bash
161+
bin/magento config:set --lock-env catalog/search/engine elasticsearch7
162+
bin/magento config:set --lock-env catalog/search/elasticsearch7_server_hostname elasticsearch
163+
bin/magento config:set --lock-env catalog/search/elasticsearch7_server_port 9200
164+
bin/magento config:set --lock-env catalog/search/elasticsearch7_index_prefix magento2
165+
bin/magento config:set --lock-env catalog/search/elasticsearch7_enable_auth 0
166+
bin/magento config:set --lock-env catalog/search/elasticsearch7_server_timeout 15
167+
```
168168
:::
169169

170170
10. Generate an admin user and configure 2FA for OTP
@@ -198,7 +198,7 @@ The below example demonstrates the from-scratch setup of the Magento 2 applicati
198198
printf "%s\n\n" "https://${TRAEFIK_SUBDOMAIN}.${TRAEFIK_DOMAIN}/media/${ADMIN_USER}-totp-qr.png?t=$(date +%s)"
199199

200200
:::{note}
201-
Use of 2FA is mandatory on Magento ``2.4.x`` and setup of 2FA should be skipped when installing ``2.3.x`` or earlier. Where 2FA is setup manually via UI upon login rather than using the CLI commands above, the 2FA configuration email may be retrieved from `the Mailhog service <https://mailhog.warden.test/>`_.
201+
Use of 2FA is mandatory on Magento ``2.4.x`` and setup of 2FA should be skipped when installing ``2.3.x`` or earlier. Where 2FA is setup manually via UI upon login rather than using the CLI commands above, the 2FA configuration email may be retrieved from `the Mailhog service <https://mailhog.warden.test/>`_.
202202
:::
203203

204204
11. Launch the application in your browser:
@@ -209,5 +209,5 @@ The below example demonstrates the from-scratch setup of the Magento 2 applicati
209209
- [https://elasticsearch.exampleproject.test/](https://elasticsearch.exampleproject.test/)
210210

211211
:::{note}
212-
To completely destroy the ``exampleproject`` environment we just created, run ``warden env down -v`` to tear down the project's Docker containers, volumes, etc.
212+
To completely destroy the ``exampleproject`` environment we just created, run ``warden env down -v`` to tear down the project's Docker containers, volumes, etc.
213213
:::

environments/shopware.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The below example demonstrates the from-scratch setup of the Shopware 6 applicat
5252
warden env up
5353

5454
:::{warning}
55-
If you encounter an error about ``Mounts denied``, follow the instructions in the error message and run ``warden env up`` again.
55+
If you encounter an error about ``Mounts denied``, follow the instructions in the error message and run ``warden env up`` again.
5656
:::
5757

5858
7. Drop into a shell within the project environment. Commands following this step in the setup procedure will be run from within the `php-fpm` docker container this launches you into:
@@ -73,9 +73,9 @@ The below example demonstrates the from-scratch setup of the Shopware 6 applicat
7373
- [https://app.exampleproject.test/admin/](https://app.exampleproject.test/admin/)
7474

7575
:::{note}
76-
The default username for Shopware 6 is ``admin`` with password ``shopware``.
76+
The default username for Shopware 6 is ``admin`` with password ``shopware``.
7777
:::
7878

7979
:::{note}
80-
To completely destroy the ``exampleproject`` environment we just created, run ``warden env down -v`` to tear down the project's Docker containers, volumes, etc.
80+
To completely destroy the ``exampleproject`` environment we just created, run ``warden env down -v`` to tear down the project's Docker containers, volumes, etc.
8181
:::

installing.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Installing Warden
88
* [Mutagen](https://mutagen.io/) 0.11.4 or later is required for environments leveraging sync sessions on Mac OS. Warden will attempt to install this via `brew` if not present.
99

1010
:::{warning}
11-
**By default Docker Desktop allocates 2GB memory.** This leads to extensive swapping, killed processed and extremely high CPU usage during some Magento actions, like for example running sampledata:deploy and/or installing the application. It is recommended to assign at least 6GB RAM to Docker Desktop prior to deploying any Magento environments on Docker Desktop. This can be corrected via Preferences -> Resources -> Advanced -> Memory. While you are there, it wouldn't hurt to let Docker have the use of a few more vCPUs (keep it at least 4 less than the maximum CPU allocation however to avoid having macOS contend with Docker for use of cores)
11+
**By default Docker Desktop allocates 2GB memory.** This leads to extensive swapping, killed processed and extremely high CPU usage during some Magento actions, like for example running sampledata:deploy and/or installing the application. It is recommended to assign at least 6GB RAM to Docker Desktop prior to deploying any Magento environments on Docker Desktop. This can be corrected via Preferences -> Resources -> Advanced -> Memory. While you are there, it wouldn't hurt to let Docker have the use of a few more vCPUs (keep it at least 4 less than the maximum CPU allocation however to avoid having macOS contend with Docker for use of cores)
1212
:::
1313

1414
## Installing via Homebrew
@@ -44,7 +44,7 @@ Launch wsl from your terminal of choice.
4444
In order for DNS entries to be resolved either add them to your Windows hosts file or add 127.0.0.1 as the first DNS server in your current network adapter in Windows.
4545

4646
:::{warning}
47-
**For performance reasons code should be located in the WSL Linux home path or other WSL local path ~/code/projectname NOT the default /mnt/c path mapping.**
47+
**For performance reasons code should be located in the WSL Linux home path or other WSL local path ~/code/projectname NOT the default /mnt/c path mapping.**
4848
:::
4949

5050
GUI tools for Windows should use the network paths provided by WSL2: `\\wsl$\Ubuntu-20.04\home\<USER>\<PROJECTPATH>`.
@@ -67,7 +67,7 @@ On MacOS this root CA certificate is automatically added to a users trust settin
6767
On Ubuntu/Debian this CA root is copied into `/usr/local/share/ca-certificates` and on Fedora/CentOS (Enterprise Linux) it is copied into `/etc/pki/ca-trust/source/anchors` and then the trust bundle is updated appropriately. For new systems, this typically is all that is needed for the CA root to be trusted on the default Firefox browser, but it may not be trusted by Chrome or Firefox automatically should the browsers have already been launched prior to the installation of Warden (browsers on Linux may and do cache CA bundles)
6868

6969
:::{note}
70-
If you are using **Firefox** and it warns you the SSL certificate is invalid/untrusted, go to Preferences -> Privacy & Security -> View Certificates (bottom of page) -> Authorities -> Import and select ``~/.warden/ssl/rootca/certs/ca.cert.pem`` for import, then reload the page.
70+
If you are using **Firefox** and it warns you the SSL certificate is invalid/untrusted, go to Preferences -> Privacy & Security -> View Certificates (bottom of page) -> Authorities -> Import and select ``~/.warden/ssl/rootca/certs/ca.cert.pem`` for import, then reload the page.
7171

72-
If you are using **Chrome** on **Linux** and it warns you the SSL certificate is invalid/untrusted, go to Chrome Settings -> Privacy And Security -> Manage Certificates (see more) -> Authorities -> Import and select ``~/.warden/ssl/rootca/certs/ca.cert.pem`` for import, then reload the page.
72+
If you are using **Chrome** on **Linux** and it warns you the SSL certificate is invalid/untrusted, go to Chrome Settings -> Privacy And Security -> Manage Certificates (see more) -> Authorities -> Import and select ``~/.warden/ssl/rootca/certs/ca.cert.pem`` for import, then reload the page.
7373
:::

services.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The following options are available (with default values indicated):
1818
* `WARDEN_SERVICE_DOMAIN=warden.test` may be set to a domain of your choosing if so desired. Please note that this will not currently change network settings or alter `dnsmasq` configuration. Any TLD other than `test` will require DNS resolution be manually configured.
1919

2020
:::{warning}
21-
Setting ``TRAEFIK_LISTEN=0.0.0.0`` can be quite useful in some cases, but be aware that causing Traefik to listen for requests publicly poses a security risk when on public WiFi or networks otherwise outside of your control.
21+
Setting ``TRAEFIK_LISTEN=0.0.0.0`` can be quite useful in some cases, but be aware that causing Traefik to listen for requests publicly poses a security risk when on public WiFi or networks otherwise outside of your control.
2222
:::
2323

2424
After changing settings in `~/.warden/.env`, please run `warden svc up` to apply.

0 commit comments

Comments
 (0)