Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/environments/update-environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ ssh_enabled | boolean | body | Enables or disables SSH access for the environmen
trusted_ssh_ips | array | body | An array of IPv4 addresses allowed to connect over SSH

When you update `newrelic_license_key`, the change takes effect on the next
[deployment](../deployments/index.md). A `null` value disables the New Relic APM
integration. Amezmo encrypts the key at rest, decrypts it at instance creation
[deployment](../deployments/index.md). A `null` value disables the New Relic Application Performance Monitoring
(<abbr title="Application Performance Monitoring">APM</abbr>) integration. Amezmo encrypts the key at rest, decrypts it at instance creation
and stores it in the `newrelic.ini` PHP configuration file. You can read the
stored value with `php --ri newrelic | grep newrelic.license`.

Expand Down
4 changes: 2 additions & 2 deletions caching/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# PHP Caching

Caching dynamically generated PHP files can increase site speed by saving the result in a static file and serving it in subsequent requests.
PHP pages are cached by the unique URI associated with each page.
PHP pages are cached by the unique Uniform Resource Identifier (<abbr title="Uniform Resource Identifier">URI</abbr>) associated with each page.

With caching enabled, dynamically generated PHP pages are cached at the edge and served as static files.
Caching makes applications significantly faster by reducing the amount of time and resources it takes to render a page.
Expand Down Expand Up @@ -38,7 +38,7 @@ To disable cookies, see the documentation for your framework.
- **Marketing pages**
Your marketing pages are dynamically generated with a template engine such as
[Blade](https://laravel.com/docs/blade), or [Twig](https://twig.symfony.com/). These pages don't change often but each HTTP request must
call into PHP-FPM and run the PHP engine to generate the page. Caching these pages would make your marketing site behave as if it was a static HTML site instead.
call into PHP-<abbr title="FastCGI Process Manager">FPM</abbr> (FastCGI Process Manager) and run the PHP engine to generate the page. Caching these pages would make your marketing site behave as if it was a static HTML site instead.
- **WordPress**
Your blog posts probably don't change often, so there's no reason
to have PHP regenerate the page for each requests.
Expand Down
2 changes: 1 addition & 1 deletion caching/patterns.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Amezmo caches your PHP script output based on a set of caching patterns that you must provided from the settings tab
under Caching. See below for sample caching URL patterns.

Caching conditions operate on the Request-URI, not the URL. For example, if our domain is `example.com`,
Caching conditions operate on the Request-<abbr title="Uniform Resource Identifier">URI</abbr> (Uniform Resource Identifier), not the URL. For example, if our domain is `example.com`,
Caching URI patterns target everything after the `.com`

The examples below are regular expression based an exact match. Matching happens per repository/environment
Expand Down
2 changes: 1 addition & 1 deletion configuration/storage.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ from `/webroot/storage/public` to `/webroot/current/public`.
See the [public directory documentation](public-directory.md) for more details.

When uploading files from your PHP app, the default owner and group is `www-data`. At this time,
Amezmo has chosen not to modify the default PHP FPM configuration in an effort to run
Amezmo has chosen not to modify the default PHP FastCGI Process Manager (<abbr title="FastCGI Process Manager">FPM</abbr>) configuration in an effort to run
the FPM daemon as a non-shell capable access user. We recommend the following file system permissions when
writing and uploading new files to your instance.

Expand Down
2 changes: 1 addition & 1 deletion domains/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ minutes.
Point your domain at your instance with one of these records:

- An A record to your instance's public IP address.
- A CNAME record to your [development subdomain](development-subdomain.md).
- A Canonical Name (<abbr title="Canonical Name">CNAME</abbr>) record to your [development subdomain](development-subdomain.md).

The Domains tab shows the exact IP address and subdomain to use. A root domain
usually can't use a CNAME, so use the A record for the root and a CNAME for
Expand Down
4 changes: 2 additions & 2 deletions instances/enable-or-disable-ssh.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ From the Overview tab, you can enable or disable SSH access to your instance
with the green toggle. When SSH is off, your instance does not respond to SSH
requests.

Once SSH is on, see [connecting over SSH](ssh.md) for the login command and SFTP
details.
Once SSH is on, see [connecting over SSH](ssh.md) for the login command and SSH File Transfer Protocol
(<abbr title="SSH File Transfer Protocol">SFTP</abbr>) details.

![Instance Overview tab showing the SSH access toggle and the list of added public keys.](https://s3.us-east-2.amazonaws.com/static.amezmo.net/SSHKeyList.png){.img-enlargable}

Expand Down
2 changes: 1 addition & 1 deletion instances/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ For pricing and features, see the [pricing](/pricing) page.
- Nginx
- Redis
- Node.js, [NPM](../npm/index.md) and Yarn
- Optimized PHP-FPM
- Optimized PHP-<abbr title="FastCGI Process Manager">FPM</abbr> (FastCGI Process Manager)
- Composer and [Composer 2](../php/composer.md)
- [Development subdomain](../domains/development-subdomain.md)
- Staging environments
Expand Down
3 changes: 3 additions & 0 deletions instances/ssh.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ $ ssh -i <path to your private key> -p $PORT deployer@$DOMAIN.lb2.amezmo.co

## SFTP Command

Transfer files to and from your instance over SSH File Transfer Protocol
(<abbr title="SSH File Transfer Protocol">SFTP</abbr>).

{title="SFTP command"}
```bash
$ sftp -i <path to your private key> -P $PORT deployer@$DOMAIN.lb3.amezmo.co
Expand Down
2 changes: 1 addition & 1 deletion logs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ lists them on the Logs tab. To set your framework up to write there, see
Amezmo also surfaces the server logs for your stack:

- Nginx error log
- PHP-FPM log
- PHP-<abbr title="FastCGI Process Manager">FPM</abbr> (FastCGI Process Manager) log
- MySQL error log, if your instance runs MySQL

Which logs appear depends on what your instance runs.
Expand Down
5 changes: 3 additions & 2 deletions nginx/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

{.lead}
**Nginx** runs in front of every application on Amezmo and serves it in
production from the first deploy. It terminates TLS, serves static files
production from the first deploy. It terminates Transport Layer Security
(<abbr title="Transport Layer Security">TLS</abbr>), serves static files
directly from your public document root and passes dynamic requests to
PHP-FPM. You adjust the parts that vary per application through the pages below.
PHP-<abbr title="FastCGI Process Manager">FPM</abbr> (FastCGI Process Manager). You adjust the parts that vary per application through the pages below.

- [Configuration](config.md) documents the directives Amezmo generates and the
values you can override.
Expand Down
2 changes: 1 addition & 1 deletion php/extensions.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ platform can provision extra extensions for your instance.

## New Relic

New Relic APM isn't a PHP extension you install. It's a feature of
New Relic Application Performance Monitoring (<abbr title="Application Performance Monitoring">APM</abbr>) isn't a PHP extension you install. It's a feature of
dedicated-memory plans. On a qualifying plan, turn it on by setting a
``newrelic_license_key`` environment variable with your New Relic license key.
2 changes: 1 addition & 1 deletion php/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PHP

PHP on Amezmo comes with FPM and the PHP command line. The common extensions you
PHP on Amezmo comes with FastCGI Process Manager (<abbr title="FastCGI Process Manager">FPM</abbr>) and the PHP command line. The common extensions you
expect are installed by default, so you can focus on your code, not
configuration.

Expand Down
2 changes: 1 addition & 1 deletion php/versions.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# PHP Versions

You choose a PHP version when you launch an instance, and you can change it
later. The version applies to both FPM and the PHP command line, so your web
later. The version applies to both FastCGI Process Manager (<abbr title="FastCGI Process Manager">FPM</abbr>) and the PHP command line, so your web
requests and your scripts run the same PHP.

## Available Versions
Expand Down
4 changes: 2 additions & 2 deletions policies/index.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Resource policy

Containers are allocated a memory reservation and a swap allocation. If the total memory is exceeded, the container will be killed.
Container restarts do not happen automatically. Excessive OOM events will result in the container being shut down.
Container restarts do not happen automatically. Excessive Out of Memory (<abbr title="Out of Memory">OOM</abbr>) events will result in the container being shut down.

## OOM Policy
## Out of Memory Policy
Amezmo may take the following actions when an OOM event happens.

- Increase the memory of your instance automatically
Expand Down
Loading