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

Commit 2901af6

Browse files
committed
#5245: Hard tabs. Folder: guides/cloud
1 parent 61e09ff commit 2901af6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1947
-1708
lines changed

guides/v2.2/cloud/basic-information/starter-architecture.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@ The Production and Staging environments include the following technologies. You
7474

7575
Each service runs in its own secure container. Containers are managed together in the project. Some services are built-in, such as the following:
7676

77-
* HTTP router (handling incoming requests, but also caching and redirects)
78-
* PHP application server
79-
* Git
80-
* Secure Shell (SSH)
77+
* HTTP router (handling incoming requests, but also caching and redirects)
78+
* PHP application server
79+
* Git
80+
* Secure Shell (SSH)
8181

8282
You can even have multiple applications running in the same project. Building a microservice oriented architecture with {{site.data.var.ee}} is as easy as managing a monolithic application.
8383

8484
### Software versions {#cloud-arch-software}
8585

8686
{{site.data.var.ece}} uses:
8787

88-
* Operating system: Debian GNU/Linux 8 (jessie)
89-
* Web server: [nginx](https://glossary.magento.com/nginx) 1.8
88+
* Operating system: Debian GNU/Linux 8 (jessie)
89+
* Web server: [nginx](https://glossary.magento.com/nginx) 1.8
9090

9191
You cannot upgrade the operating system and web server software to a new version, but you can configure versions for the following software:
9292

@@ -100,9 +100,9 @@ In the Staging and Production environments, you use Fastly for CDN and caching.
100100

101101
You use the following files to configure the software versions that you want to use in your implementation.
102102

103-
* [`.magento.app.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_magento-app.html)
104-
* [`routes.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_routes.html)
105-
* [`services.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_services.html)
103+
* [`.magento.app.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_magento-app.html)
104+
* [`routes.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_routes.html)
105+
* [`services.yaml`]({{ page.baseurl }}/cloud/project/project-conf-files_services.html)
106106

107107
### Backup and disaster recovery {#backup}
108108

guides/v2.2/cloud/before/before-setup-env-2_clone.md

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -23,52 +23,52 @@ Some Git commands cannot complete an action in your {{site.data.var.ece}} projec
2323

2424
#### To clone a project master environment:
2525

26-
1. Log in to your local workstation with a [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html) account.
26+
1. Log in to your local workstation with a [Magento file system owner]({{ page.baseurl }}/cloud/before/before-workspace-file-sys-owner.html) account.
2727

28-
1. Change to the web server or virtual host _docroot_ directory.
28+
1. Change to the web server or virtual host _docroot_ directory.
2929

30-
1. Log in to the Magento Cloud CLI.
30+
1. Log in to the Magento Cloud CLI.
3131

32-
```bash
33-
magento-cloud login
34-
```
32+
```bash
33+
magento-cloud login
34+
```
3535

36-
1. List your projects.
36+
1. List your projects.
3737

38-
```bash
39-
magento-cloud project:list
40-
```
38+
```bash
39+
magento-cloud project:list
40+
```
4141

42-
1. Clone a project.
42+
1. Clone a project.
4343

44-
```bash
45-
magento-cloud project:get <project-ID>
46-
```
44+
```bash
45+
magento-cloud project:get <project-ID>
46+
```
4747

48-
When prompted for a directory name, enter `magento2`.
48+
When prompted for a directory name, enter `magento2`.
4949

50-
1. Change to the `magento2` directory.
50+
1. Change to the `magento2` directory.
5151

52-
1. List available environments for the project.
52+
1. List available environments for the project.
5353

54-
```bash
55-
magento-cloud environment:list
56-
```
54+
```bash
55+
magento-cloud environment:list
56+
```
5757

58-
{:.bs-callout .bs-callout-info}
59-
The `magento-cloud environment:list` command displays environment hierarchies, whereas the `git branch` command does not.
58+
{:.bs-callout .bs-callout-info}
59+
The `magento-cloud environment:list` command displays environment hierarchies, whereas the `git branch` command does not.
6060

61-
1. Fetch the remote branches.
61+
1. Fetch the remote branches.
6262

63-
```bash
64-
git fetch magento
65-
```
63+
```bash
64+
git fetch magento
65+
```
6666

67-
1. Pull updated code.
67+
1. Pull updated code.
6868

69-
```bash
70-
git pull magento <environment-ID>
71-
```
69+
```bash
70+
git pull magento <environment-ID>
71+
```
7272

7373
## Change the Magento ADMIN variables
7474

@@ -79,7 +79,7 @@ We recommend changing the environment-level variables for the Magento Admin URL
7979
- **ADMIN_PASSWORD**—A password for the administrative user. When the project was created, the License Owner received a default password in email.
8080
- **ADMIN_URL**— The relative URL to access the Admin panel, such as `<domain>/admin`. For security reasons, we recommend you choose a value other than `admin` or `backend` or another term that is easy to guess.
8181

82-
{:.bs-callout .bs-callout-info}
82+
{: .bs-callout-info }
8383
Make note of any updated values so that you can use them to install Magento from the command line and to verify the installation. The values for the `ADMIN_EMAIL`, `ADMIN_USERNAME`, and `ADMIN_PASSWORD` variables are used only for installation.
8484

8585
#### To view existing variables: {#variablelist}
@@ -128,56 +128,56 @@ Every time you add or modify a variable using the web interface or the CLI, the
128128

129129
Alternatively, you can add or update variables in the Project Web Interface.
130130

131-
1. Log in to [your {{site.data.var.ece}} account](https://accounts.magento.cloud).
131+
1. Log in to [your {{site.data.var.ece}} account](https://accounts.magento.cloud).
132132

133-
1. Click the **Configure environment** gear icon ![Configure your environment]({{ site.baseurl }}/common/images/cloud_edit-project.png) next to the Project name.
133+
1. Click the **Configure environment** gear icon ![Configure your environment]({{ site.baseurl }}/common/images/cloud_edit-project.png) next to the Project name.
134134

135-
![Project without code]({{ site.baseurl }}/common/images/cloud_project_empty.png)
135+
![Project without code]({{ site.baseurl }}/common/images/cloud_project_empty.png)
136136

137-
1. Select the **Variables** tab.
137+
1. Select the **Variables** tab.
138138

139-
1. Click **Add Variable**.
139+
1. Click **Add Variable**.
140140

141-
1. Enter the **Name** and **Value** for the variable. For example, enter `ADMIN_EMAIL` and your License Owner email address or another accessible email for resetting the password for the default admin account.
141+
1. Enter the **Name** and **Value** for the variable. For example, enter `ADMIN_EMAIL` and your License Owner email address or another accessible email for resetting the password for the default admin account.
142142

143-
![Project variable]({{ site.baseurl }}/common/images/cloud_project_variable.png)
143+
![Project variable]({{ site.baseurl }}/common/images/cloud_project_variable.png)
144144

145-
1. Click **Add variable**. After you add the variable, wait until deployment completes.
145+
1. Click **Add variable**. After you add the variable, wait until deployment completes.
146146

147147
## Create a branch for development {#branch}
148148

149149
After cloning your project and updating the Magento administrator account configuration, you can branch for development. As stated earlier, you must create an environment using the `magento-cloud environment:branch <branch-name>` command or the Project Web Interface for the environment to become _active_.
150150

151151
- For [Starter]({{ page.baseurl }}/cloud/basic-information/starter-develop-deploy-workflow.html#clone-branch), consider creating a branch for `staging`, then create a development branch based on the `staging` branch.
152-
* For [Pro]({{ page.baseurl }}/cloud/architecture/pro-develop-deploy-workflow.html), create development branches based on the Integration environment.
152+
- For [Pro]({{ page.baseurl }}/cloud/architecture/pro-develop-deploy-workflow.html), create development branches based on the Integration environment.
153153

154154
#### To branch from master:
155155

156-
1. Do one of the following from the CLI.
156+
1. Do one of the following from the CLI.
157157

158-
- To create a new environment:
158+
- To create a new environment:
159159

160-
```bash
161-
magento-cloud branch <environment-name> <parent-environment-ID>
162-
```
160+
```bash
161+
magento-cloud branch <environment-name> <parent-environment-ID>
162+
```
163163

164-
- To check out an existing environment:
164+
- To check out an existing environment:
165165

166-
```bash
167-
magento-cloud checkout <environment-name>
168-
```
166+
```bash
167+
magento-cloud checkout <environment-name>
168+
```
169169

170-
1. Update dependencies.
170+
1. Update dependencies.
171171

172-
```bash
173-
composer --no-ansi --no-interaction install --no-progress --prefer-dist --optimize-autoloader
174-
```
172+
```bash
173+
composer --no-ansi --no-interaction install --no-progress --prefer-dist --optimize-autoloader
174+
```
175175

176-
1. Create a [snapshot]({{ page.baseurl }}/cloud/project/project-webint-snap.html) of the environment.
176+
1. Create a [snapshot]({{ page.baseurl }}/cloud/project/project-webint-snap.html) of the environment.
177177

178-
```bash
179-
magento-cloud snapshot:create -e <environment-ID>
180-
```
178+
```bash
179+
magento-cloud snapshot:create -e <environment-ID>
180+
```
181181

182182
#### Next step:
183183
[Install Magento]({{ page.baseurl }}/cloud/before/before-setup-env-install.html)

guides/v2.2/cloud/before/before-workspace-file-sys-owner.md

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,68 +24,85 @@ Create the Magento file system owner with a strong password. Magento file system
2424

2525
To create the Magento file system owner, enter the following command as a user with `root` privileges:
2626

27-
adduser <username>
27+
```bash
28+
adduser <username>
29+
```
2830

2931
To give the user a password, enter the following command as a user with `root` privileges:
3032

31-
passwd <username>
33+
```bash
34+
passwd <username>
35+
```
3236

3337
Follow the prompts on your screen to create a password for the user.
3438

35-
{: .bs-callout .bs-callout-warning}
39+
{: .bs-callout-warning }
3640
If you do not have `root` privileges on your Magento server, you can use another local user account. Confirm that the user has a strong password and continue with [Put the Magento file system owner in the web server group](#install-update-depend-user-add2group).
3741

3842
For example, to create a user named `magento_user` and give the user a password, enter:
3943

40-
sudo adduser magento_user
41-
sudo passwd magento_user
44+
```bash
45+
sudo adduser magento_user
46+
```
4247

43-
{: .bs-callout .bs-callout-warning}
48+
```bash
49+
sudo passwd magento_user
50+
```
51+
52+
{: .bs-callout-warning }
4453
Because the point of creating this user is to provide added security, it is essential that you create a strong password.
4554

4655
## Find the web server user's group {#install-update-depend-user-findgroup}
4756

4857
To find the web server user's group:
4958

50-
* CentOS:
59+
* CentOS:
60+
61+
```bash
62+
grep -E -i '^user|^group' /etc/httpd/conf/httpd.conf
63+
```
64+
65+
or
5166

52-
```bash
53-
grep -E -i '^user|^group' /etc/httpd/conf/httpd.conf
54-
```
55-
or
56-
```bash
57-
grep -Ei '^user|^group' /etc/httpd/conf/httpd.conf
58-
```
67+
```bash
68+
grep -Ei '^user|^group' /etc/httpd/conf/httpd.conf
69+
```
5970

60-
Typically, the user and group name are both `apache`
71+
Typically, the user and group name are both `apache`
6172

62-
* Ubuntu: `ps aux | grep apache` to find the apache user, then `groups <apache user>` to find the group
73+
* Ubuntu: `ps aux | grep apache` to find the apache user, then `groups <apache user>` to find the group
6374

64-
Typically, the username and the group name are both `www-data`
75+
Typically, the username and the group name are both `www-data`
6576

6677
## Put the Magento file system owner in the web server's primary group {#install-update-depend-user-add2group}
6778

6879
Assuming the typical Apache group name for CentOS and Ubuntu, enter the following command as a user with `root` privileges:
6980

70-
* CentOS: `usermod -g apache <username>`
71-
* Ubuntu: `usermod -g www-data <username>`
81+
* CentOS: `usermod -g apache <username>`
82+
* Ubuntu: `usermod -g www-data <username>`
7283

7384
For example, to add the user `magento_user` to the `apache` primary group on CentOS:
7485

75-
usermod -g apache magento_user
86+
```bash
87+
usermod -g apache magento_user
88+
```
7689

7790
To confirm your Magento user is a member of the web server group, enter the following command:
7891

79-
groups <username>
92+
```bash
93+
groups <username>
94+
```
8095

8196
A sample result follows:
8297

83-
magento_user : apache
98+
```terminal
99+
magento_user : apache
100+
```
84101

85102
To complete the task, restart the web server:
86103

87-
* Ubuntu: `service apache2 restart`
88-
* CentOS: `service httpd restart`
104+
* Ubuntu: `service apache2 restart`
105+
* CentOS: `service httpd restart`
89106

90107
#### Next step:
91108
[Clone and branch the project]({{ page.baseurl }}/cloud/before/before-setup-env-2_clone.html)

0 commit comments

Comments
 (0)