Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

Commit

Permalink
Remove trailing spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
dshevtsov committed Aug 19, 2019
1 parent 9250d88 commit 061a10f
Show file tree
Hide file tree
Showing 528 changed files with 4,651 additions and 4,652 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This pull request (PR) ...

- ...

<!--
<!--
If you are fixing a GitHub issue, note it using GitHub keyword format (https://help.github.com/en/articles/closing-issues-using-keywords#closing-an-issue-in-a-different-repository) to close the issue when this pull request is merged. Example: `Fixes #1234`
`master` is the default branch. Merged pull requests to `master` go live on the site automatically. Any requested changes to content on the `master` branch must be related to the released codebase. Any content related to future releases goes in the `develop` branch.
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ If you have questions, open an issue and ask us. We're looking forward to hearin

## Build DevDocs in Windows

Some of the technologies we use to develop DevDocs is not compatible with Windows, such as [Jekyll](https://jekyllrb.com/docs/windows/). For this reason, we do not support DevDocs management in Windows; however, we have documented the following procedures to build the DevDocs in a Windows environment. Any further use of this setup or troubleshooting is up to you.
Some of the technologies we use to develop DevDocs is not compatible with Windows, such as [Jekyll](https://jekyllrb.com/docs/windows/). For this reason, we do not support DevDocs management in Windows; however, we have documented the following procedures to build the DevDocs in a Windows environment. Any further use of this setup or troubleshooting is up to you.

Download software:

Expand All @@ -248,7 +248,7 @@ Only Administrators can use Chocolatey features. You can use the Administrator a

- In the Windows UI, open search and type `path`.
- In the Windows CMD console, type `echo %path%`.

You should see `C:\ProgramData\chocolatey\bin` in the path.

1. Close and reopen the command prompt before using `choco` commands.
Expand All @@ -272,7 +272,7 @@ If you have Ruby installed on the workstation, then you can skip this installati
- In the Windows UI, open search and type `path`.
- In the Windows CMD console, type `echo %path%`.

> **NOTE**
> **NOTE**
> If you encounter problems with Ruby, or the `gem` command is not recognized, you can install the `rubyinstaller-devkit.exe` development kit located in the `c:\ProgramData\chocolatey\bin` folder.

### Install Git for Windows
Expand Down Expand Up @@ -345,5 +345,5 @@ You may have to close and reopen the Git Bash application after the Choco instal
Server running... press ctrl-c to stop.
```

> **NOTE**
> **NOTE**
> The `.bash_profile` file CAN be created and managed using Git Bash, which is useful for aliases and other customizations, This file is in the `users/Administrator` folder.
4 changes: 2 additions & 2 deletions _includes/cloud/cloud-fastly-manage-vcl-from-admin.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ You can delete custom VCL snippet code from your Fastly configuration by uploadi
- Save the configuration.

- Upload the VCL to Fastly to apply your changes.
- Use the Fastly API [Delete custom VCL snippet]({{ page.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-vcl) operation

- Use the Fastly API [Delete custom VCL snippet]({{ page.baseurl }}/cloud/cdn/cloud-vcl-custom-snippets.html#manage-vcl) operation
to delete the snippet completely, or submit a Magento support ticket to request deletion.


Expand Down
310 changes: 155 additions & 155 deletions _includes/cloud/enable-ssh.md
Original file line number Diff line number Diff line change
@@ -1,155 +1,155 @@
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.

The SSH keys require the following:

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

For more information on SSH keys, see the following:

* [Connecting to GitHub with SSH](https://help.github.com/articles/connecting-to-github-with-ssh/)
* [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)
* [ssh-keygen man page](http://linux.die.net/man/1/ssh-keygen)

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

An existing SSH key pair is typically located in the `.ssh` subdirectory of the user's home directory. This folder is hidden and may not display in the file manager or finder unless configured to display hidden files and folders.

You can quickly verify if you have SSH keys by entering commands using terminal access.

To check for SSH keys, enter the following command:

ls ~/.ssh

If you have SSH keys, a directory listing is displayed similar to the following:

id_rsa id_rsa.pub known_hosts

If you do not have SSH keys, you need to generate the keys for adding to your Magento ECE account and GitHub account. See [Create a new SSH key pair](#ssh-create-new-key-pair).

If you already have SSH keys, continue to:
* [Add a public SSH key to your Magento account](#ssh-add-to-account) section
* [Add your SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)

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

Use the `ssh-keygen` command to create an SSH key pair. `ssh-keygen` is typically installed on Linux systems.

#### To create an SSH key pair:

1. The command syntax follows, entering the email used for your GitHub account:

```bash
ssh-keygen -t rsa
```

GitHub also uses the key length `-b 4096` in the command. Follow the prompts to complete the key.

1. When prompted to "Enter a file in which to save the key," press **Enter** to save the file to the default location. The prompt displays the location.

1. When prompted to enter a secure passphrase, enter a phrase to use like a password. Make note of this passphrase. You may be requested to enter it depending on tasks you complete using a terminal during development.

1. After creating the SSH key pair, start the ssh-agent:

For Mac or Linux:

```bash
eval "$(ssh-agent -s)"
```
For Mac, you can edit the `~/.ssh/config` file to automatically load keys into the ssh-agent and store passphrases in your keychain.

```
Host *
AddKeysToAgent yes
UseKeychain yes
IdentityFile ~/.ssh/id_rsa
```

For Windows:

```shell
eval $(ssh-agent -s)
```

1. Add the SSH key to the ssh-agent. If you used a different name for the key file name, replace `id_rsa` with that file name.

For Mac:

```bash
ssh-add -K ~/.ssh/id_rsa
```

For Windows or Linux:

```shell
ssh-add ~/.ssh/id_rsa
```

1. [Add your SSH key to your GitHub account.](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) The instructions include Mac, Windows, and Linux.

### Test the SSH keys {#test}

After adding the SSH keys, test the SSH connection to GitHub:

1. In the terminal, enter the following command:

ssh -T git@github.com

2. You may see a warning that the authenticity of the host can't be established followed by an RSA fingerprint. Enter `yes` to continue.
3. If successful, you should receive a success message. If you receive a permission denied error, see [Error: Permission denied (publickey)](https://help.github.com/articles/error-permission-denied-publickey) troubleshooting on GitHub.
## Add a public SSH key to your Magento account {#ssh-add-to-account}
You can add SSH keys to your account in any of the following ways:
* Using the [{{site.data.var.ece}} CLI](#add-key-cli)
* Using the [{{site.data.var.ece}} Web Interface](#add-key-web)
### Add a key using the CLI {#add-key-cli}
To add an SSH key using the CLI:
1. Open a terminal application on your local.
2. If you haven't done so already, log in (or switch to) the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html) to the server on which your SSH keys are located.

3. Log in to your project:

magento-cloud login

3. Add the key:

magento-cloud ssh-key:add ~/.ssh/id_rsa.pub

#### Add a key using the Project Web Interface {#add-key-web}

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

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

To add an SSH key using the Project Web Interface:

1. Copy your SSH public key to the clipboard.

If you do not already have SSH keys on that machine, see [GitHub documentation](https://help.github.com/articles/generating-an-ssh-key) to create them.
2. Login and access your project through the [Project Web Interface](https://accounts.magento.cloud).
3. In your selected branch, an icon displays if you do not have an SSH key added.

![No SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-install.png)
4. Copy and paste the content of your public SSH key in the screen.

![Add SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-add.png)
5. Follow the prompts on your screen to complete the task.

## Set global Git variables

Set required global Git variables on the machine to commit or push to a Git branch. These variables set Git credentials for accessing your GitHub account.

To set variables, enter the following commands on every workspace:

git config --global user.name "<your name>"
git config --global user.email <your e-mail address>

For more information, see [First-Time Git Setup](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup#_first_time)
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.

The SSH keys require the following:

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

For more information on SSH keys, see the following:

* [Connecting to GitHub with SSH](https://help.github.com/articles/connecting-to-github-with-ssh/)
* [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)
* [ssh-keygen man page](http://linux.die.net/man/1/ssh-keygen)

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

An existing SSH key pair is typically located in the `.ssh` subdirectory of the user's home directory. This folder is hidden and may not display in the file manager or finder unless configured to display hidden files and folders.

You can quickly verify if you have SSH keys by entering commands using terminal access.

To check for SSH keys, enter the following command:

ls ~/.ssh

If you have SSH keys, a directory listing is displayed similar to the following:

id_rsa id_rsa.pub known_hosts

If you do not have SSH keys, you need to generate the keys for adding to your Magento ECE account and GitHub account. See [Create a new SSH key pair](#ssh-create-new-key-pair).

If you already have SSH keys, continue to:
* [Add a public SSH key to your Magento account](#ssh-add-to-account) section
* [Add your SSH key to your GitHub account](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/)

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

Use the `ssh-keygen` command to create an SSH key pair. `ssh-keygen` is typically installed on Linux systems.

#### To create an SSH key pair:

1. The command syntax follows, entering the email used for your GitHub account:

```bash
ssh-keygen -t rsa
```

GitHub also uses the key length `-b 4096` in the command. Follow the prompts to complete the key.

1. When prompted to "Enter a file in which to save the key," press **Enter** to save the file to the default location. The prompt displays the location.

1. When prompted to enter a secure passphrase, enter a phrase to use like a password. Make note of this passphrase. You may be requested to enter it depending on tasks you complete using a terminal during development.

1. After creating the SSH key pair, start the ssh-agent:

For Mac or Linux:

```bash
eval "$(ssh-agent -s)"
```

For Mac, you can edit the `~/.ssh/config` file to automatically load keys into the ssh-agent and store passphrases in your keychain.

```
Host *
AddKeysToAgent yes
UseKeychain yes
IdentityFile ~/.ssh/id_rsa
```

For Windows:

```shell
eval $(ssh-agent -s)
```

1. Add the SSH key to the ssh-agent. If you used a different name for the key file name, replace `id_rsa` with that file name.

For Mac:

```bash
ssh-add -K ~/.ssh/id_rsa
```

For Windows or Linux:

```shell
ssh-add ~/.ssh/id_rsa
```

1. [Add your SSH key to your GitHub account.](https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/) The instructions include Mac, Windows, and Linux.

### Test the SSH keys {#test}

After adding the SSH keys, test the SSH connection to GitHub:

1. In the terminal, enter the following command:

ssh -T git@github.com

2. You may see a warning that the authenticity of the host can't be established followed by an RSA fingerprint. Enter `yes` to continue.
3. If successful, you should receive a success message. If you receive a permission denied error, see [Error: Permission denied (publickey)](https://help.github.com/articles/error-permission-denied-publickey) troubleshooting on GitHub.
## Add a public SSH key to your Magento account {#ssh-add-to-account}
You can add SSH keys to your account in any of the following ways:
* Using the [{{site.data.var.ece}} CLI](#add-key-cli)
* Using the [{{site.data.var.ece}} Web Interface](#add-key-web)
### Add a key using the CLI {#add-key-cli}
To add an SSH key using the CLI:
1. Open a terminal application on your local.
2. If you haven't done so already, log in (or switch to) the [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html) to the server on which your SSH keys are located.

3. Log in to your project:

magento-cloud login

3. Add the key:

magento-cloud ssh-key:add ~/.ssh/id_rsa.pub

#### Add a key using the Project Web Interface {#add-key-web}

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

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

To add an SSH key using the Project Web Interface:

1. Copy your SSH public key to the clipboard.

If you do not already have SSH keys on that machine, see [GitHub documentation](https://help.github.com/articles/generating-an-ssh-key) to create them.
2. Login and access your project through the [Project Web Interface](https://accounts.magento.cloud).
3. In your selected branch, an icon displays if you do not have an SSH key added.

![No SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-install.png)
4. Copy and paste the content of your public SSH key in the screen.

![Add SSH key]({{ site.baseurl }}/common/images/cloud_ssh-key-add.png)
5. Follow the prompts on your screen to complete the task.

## Set global Git variables

Set required global Git variables on the machine to commit or push to a Git branch. These variables set Git credentials for accessing your GitHub account.

To set variables, enter the following commands on every workspace:

git config --global user.name "<your name>"
git config --global user.email <your e-mail address>

For more information, see [First-Time Git Setup](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup#_first_time)
Loading

0 comments on commit 061a10f

Please sign in to comment.