Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 41618d2

Browse files
keharperkeharper
authored
Merge branch 'master' into kh_simplify-inv-rest
2 parents da44acf + 3f7ef2c commit 41618d2

36 files changed

+465
-121
lines changed

‎.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
# OS generated files #
2-
######################
1+
# OS and IDE generated files #
2+
##############################
33
/*.db
44
.DS_Store
55
.vscode
6+
.history
67

78
# Config and output files #
89
###########################

‎src/_data/mde.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@ extensions:
1010
-
1111
name: Amazon Sales Channel
1212
versions:
13+
-
14+
name: 4.2.0
15+
support:
16+
2.3.0: compatible
17+
2.3.1: compatible
18+
2.3.2: compatible
19+
2.3.3: compatible
20+
2.3.4: compatible
21+
2.3.5-p1: compatible
22+
2.4.0: supported
23+
1324
-
1425
name: 4.1.0
1526
support:

‎src/_data/toc/cloud-guide.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ pages:
9090
url: /cloud/project/user-admin.html
9191
versionless: true
9292

93-
- label: Enable MFA enforcement for SSH
93+
- label: Enable MFA for SSH
9494
url: /cloud/project/project-enable-mfa-enforcement.html
9595
versionless: true
9696

‎src/_data/toc/configuration-guide.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ pages:
2121
- label: Two-Factor Authentication
2222
url: /security/two-factor-authentication.html
2323

24+
- label: Security.txt
25+
url: /security/security-txt.html
26+
exclude_versions: ["2.3"]
27+
2428
- label: X-Frame-Options header
2529
url: /config-guide/secy/secy-xframe.html
2630

‎src/_data/toc/release-notes.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ pages:
1313
- label: Magento Commerce 2.4.0 Release Notes
1414
url: /release-notes/release-notes-2-4-0-commerce.html
1515

16+
- label: Magento B2B Release Notes
17+
url: /release-notes/b2b-release-notes.html
18+
1619

1720
- label: 2.3 Release Notes
1821
include_versions: ["2.3"]

‎src/_includes/cloud/enable-ssh.md

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
You must create an SSH key pair on every machine and workspace you and your team expect to work with and access {{site.data.var.ece}} and GitHub branches. The SSH keys connect you to GitHub to manage branches and push code without having to constantly supply your username and password. You can add multiple SSH keys to GitHub per each workspace you use.
1+
You must create an SSH key pair on every machine and workspace that requires access to {{site.data.var.ece}} project source code and environments. The SSH keys allow you to connect to GitHub to manage source code and to connect to cloud servers without having to constantly supply your username and password.
2+
3+
You can add multiple SSH keys for each system or workspace that you use.
24

35
The SSH keys require the following:
46

5-
* Set up SSH keys as the [Magento file system owner]({{ site.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
6-
* Create the keys using the email address used for the GitHub account.
7+
- Set up SSH keys as the [Magento file system owner]({{ site.baseurl }}/cloud/before/before-workspace-file-sys-owner.html).
8+
- Create the keys using the GitHub account email address.
79

810
For more information on SSH keys, see the following:
911

10-
* [Connecting to GitHub with SSH](https://help.github.com/articles/connecting-to-github-with-ssh/)
11-
* [Manually generating your SSH key in Windows](https://docs.joyent.com/public-cloud/getting-started/ssh-keys/generating-an-ssh-key-manually/manually-generating-your-ssh-key-in-windows)
12-
* [ssh-keygen man page](http://linux.die.net/man/1/ssh-keygen)
12+
- [Connecting to GitHub with SSH](https://help.github.com/articles/connecting-to-github-with-ssh/)
13+
- [Manually generating your SSH key in Windows](https://docs.joyent.com/public-cloud/getting-started/ssh-keys/generating-an-ssh-key-manually/manually-generating-your-ssh-key-in-windows)
14+
- [ssh-keygen man page](http://linux.die.net/man/1/ssh-keygen)
1315

1416
## Locate an existing SSH key pair {#existing}
1517

@@ -33,8 +35,8 @@ If you do not have SSH keys, you need to generate the keys for adding to your Ma
3335

3436
If you already have SSH keys, continue to:
3537

36-
* [Add a public SSH key to your Magento account](#ssh-add-to-account) section
37-
* [Add your SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
38+
- [Add a public SSH key to your Magento account](#ssh-add-to-account) section
39+
- [Add your SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)
3840

3941
## Create a new SSH key pair {#ssh-create-new-key-pair}
4042

@@ -72,6 +74,9 @@ To create an SSH key pair:
7274
IdentityFile ~/.ssh/id_rsa
7375
```
7476

77+
{:.bs-callout-info}
78+
You can specify multiple SSH keys by adding multiple `IdentityFile` entries to your configuration.
79+
7580
For Windows:
7681

7782
```shell
@@ -112,14 +117,15 @@ After adding the SSH keys, test the SSH connection to GitHub:
112117

113118
You can add SSH keys to your account in any of the following ways:
114119

115-
* Using the [{{site.data.var.ece}} CLI](#add-key-cli)
116-
* Using the [{{site.data.var.ece}} Web Interface](#add-key-web)
120+
- Using the [{{site.data.var.ece}} CLI](#add-key-cli)
121+
- Using the [{{site.data.var.ece}} Web Interface](#add-key-web)
117122

118123
### Add a key using the CLI {#add-key-cli}
119124

125+
{:.procedure}
120126
To add an SSH key using the CLI:
121127

122-
1. Open a terminal application on your local.
128+
1. Open a terminal application on your local workstation.
123129
1. If you haven't done so already, log in (or switch to) the [Magento file system owner]({{ site.baseurl }}/cloud/before/before-workspace-file-sys-owner.html) to the server on which your SSH keys are located.
124130

125131
1. Log in to your project:
@@ -134,13 +140,14 @@ To add an SSH key using the CLI:
134140
magento-cloud ssh-key:add ~/.ssh/id_rsa.pub
135141
```
136142

137-
#### Add a key using the Project Web Interface {#add-key-web}
143+
### Add a key using the Project Web Interface {#add-key-web}
138144

139145
You will select and add your SSH public key to each environment in your account.
140146

141-
* Starter: Add to Master (Production) and any environments you create by branching from Master
142-
* Pro: Add to Master Integration environment. After your Staging and Production environments are provisioned, you can add the SSH keys to those environments.
147+
- Starter: Add to Master (Production) and any environments you create by branching from Master
148+
- Pro: Add the key to Staging, Production, and Integration environments
143149

150+
{:.procedure}
144151
To add an SSH key using the Project Web Interface:
145152

146153
1. Copy your SSH public key to the clipboard.
@@ -173,3 +180,7 @@ git config --global user.email <your e-mail address>
173180
```
174181

175182
For more information, see [First-Time Git Setup](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup#_first_time)
183+
184+
## SSH access with MFA
185+
186+
{{ site.data.var.ece }} projects that have multi-factor authentication (MFA) enabled require all {{ site.data.var.ece }} accounts with SSH access to have two-factor authentication and to complete additional steps when using SSH to connect to GitHub or to project environments. See [Enable MFA for SSH access]({{ site.baseurl}}/cloud/project/project-enable-mfa-enforcement.html).

‎src/assets/i/flag.svg

Lines changed: 6 additions & 0 deletions
Loading

‎src/cloud/before/before-workspace-ssh.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ redirect_from:
66
functional_areas:
77
- Cloud
88
- Setup
9+
- Security
10+
- Config
911
---
1012

1113
{:.ref-header}
@@ -22,6 +24,42 @@ When initially setting up your local environment, you need to add the SSH keys t
2224

2325
{% include cloud/enable-ssh.md %}
2426

27+
### Unable to access projects without MFA
28+
29+
If you authenticate to a project with multi-factor authentication (MFA) enabled, you might receive the following error when connecting to other projects that do not require MFA:
30+
31+
```bash
32+
ssh [email protected]
33+
[email protected]: Permission denied (publickey).
34+
```
35+
36+
During the SSH certificate generation, the Magento Cloud CLI adds an additional SSH key to your local environment. That key will be used by default if your local SSH configuration does not include the SSH key for project access.
37+
38+
{:.procedure}
39+
To add your SSH key to the local configuration:
40+
41+
1. Create the `config` file if it does not exists.
42+
43+
```bash
44+
touch ~/.ssh/config
45+
```
46+
47+
1. Add an `IdentityFile` configuration.
48+
49+
```yaml
50+
Host *
51+
IdentityFile ~/.ssh/id_rsa
52+
```
53+
54+
{:.bs-callout-info}
55+
You can specify multiple SSH keys by adding multiple `IdentityFile` entries to your configuration.
56+
57+
1. Reload your SSH configuration to apply the changes.
58+
59+
```bash
60+
source ~/.ssh/config
61+
```
62+
2563
{:.ref-header}
2664
Next step
2765

‎src/cloud/cdn/cloud-fastly.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ title: Fastly
44
functional_areas:
55
- Cloud
66
- Setup
7+
- Security
78
---
89

910
Fastly provides the following services to optimize and secure content delivery operations for your {{ site.data.var.ece }} projects. These services are included with your {{ site.data.var.ece }} subscription at no additional cost.

‎src/cloud/cdn/fastly-vcl-whitelist.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ redirect_from:
66
functional_areas:
77
- Cloud
88
- Setup
9+
- Security
910
---
1011

11-
12-
You can use the a Fastly Edge ACL list in combination with custom VCL code snippet to filter incoming requests and allow access by IP address. The ACL list specifies the IP addresses to allow.
12+
You can use a Fastly Edge ACL list in combination with a custom VCL code snippet to filter incoming requests and allow access by IP address. The ACL list specifies the IP addresses to allow.
1313

1414
Create an allow list to limit access to your Staging environment so that only requests from specified IP addresses for internal developers and approved external services are permitted. You can also create an allow list to secure access to the Magento Admin UI on Staging and Production environments.
1515

‎src/cloud/cdn/fastly-waf-service.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ title: Web Application Firewall (WAF)
44
functional_areas:
55
- Cloud
66
- Install
7+
- Security
8+
- Compliance
79
---
810

911
Powered by Fastly, the web application firewall (WAF) service for {{ site.data.var.ece }} detects, logs, and blocks malicious request traffic before it can damage your sites or network. The WAF service is available on production environments only.

‎src/cloud/project/privatelink-service.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,25 @@ To test the connection to the VPC endpoint service:
153153
```
154154
{:.no-copy}
155155

156+
1. Run the following command to to ensure the service is listening on VM:
157+
158+
```bash
159+
netstat -na |grep <port>
160+
```
161+
162+
1. Run the following command to check the packages flow:
163+
164+
```bash
165+
tcpdump -i <ethernet interface> -tt -nn port <destination port> and host <source host>
166+
```
167+
168+
Check the following internal settings to ensure that the configuration is valid:
169+
170+
- Endpoint and endpoint services settings
171+
- NLB settings
172+
- The target groups in NLB and verify they are healthy
173+
- The netcat/curl endpoint URL from each VM ( listed above)
174+
156175
See the following articles for help troubleshooting connection issues:
157176

158177
- [AWS: Troubleshooting endpoint service connections][]
@@ -172,7 +191,7 @@ Submit a Magento Support ticket to change an existing PrivateLink configuration.
172191

173192
The customer VPC must have the following resources available to support bidirectional PrivateLink connections:
174193

175-
- A Network Load Balancer
194+
- A Network Load Balancer (NLB)
176195
- An endpoint service configuration that enables access to an application or service from the customer VPC
177196
- An [interface endpoint][] (AWS) or [private endpoint][] (Azure) that allows Magento to connect to endpoint services hosted in your VPC
178197

0 commit comments

Comments
 (0)