Skip to content

Commit

Permalink
Revert "Merge pull request #6813 from jddocs/rc-v1.298.0"
Browse files Browse the repository at this point in the history
This reverts commit 6633604, reversing
changes made to 70687a2.
  • Loading branch information
nmelehan committed Jan 18, 2024
1 parent 6633604 commit f39afac
Show file tree
Hide file tree
Showing 26 changed files with 139 additions and 71 deletions.
Binary file removed docs/guides/platform/marketplace/.DS_Store
Binary file not shown.

This file was deleted.

2 changes: 1 addition & 1 deletion docs/products/tools/marketplace/guides/docker/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ aliases: ['/platform/marketplace/deploying-docker-with-marketplace-apps/', '/pla

### Docker Options

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}
- **Email address for SOA Record:** This should be the email address of your server administrator.
Expand Down
2 changes: 1 addition & 1 deletion docs/products/tools/marketplace/guides/focalboard/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ authors: ["Linode"]

- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
2 changes: 1 addition & 1 deletion docs/products/tools/marketplace/guides/harbor/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Harbor is an excellent compliment to the [Linode Kubernetes Engine (LKE)](/docs/

- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
5 changes: 3 additions & 2 deletions docs/products/tools/marketplace/guides/joplin/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ authors: ["Linode"]

## Configuration Options

- **Supported distributions:** Ubuntu 22.04 LTS
- **Supported distributions:** Ubuntu 20.04 LTS
- **Recommended plan:** All plan types and sizes can be used.

### Joplin Options

- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.
- **Password for the postgres database** *(required)*: Enter the password you wish to use for the `joplin` database user.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
6 changes: 3 additions & 3 deletions docs/products/tools/marketplace/guides/kepler/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ Kepler requires a valid license to use the software beyond the initial 14 day fr
- **Website Title:** Enter a title for your WordPress site.

{{< note >}}
The passwords for the WordPress Admin User, WordPress Database User and MySQL root user are automatically generated and provided in the file `/root/.credentials` when the WordPress deployment completes.
The passwords for the WordPress Admin User, WordPress Database User and MySQL root user are automatically generated and provided in the file `/root/.linode_credentials.txt` when the WordPress deployment completes.
{{< /note >}}

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-special-character-limitations-shortguide">}}

Expand Down Expand Up @@ -76,7 +76,7 @@ Once the app has been *fully* deployed, you need to obtain the credentials from
1. Once logged in, access the credentials file by runing the following command:

```command
cat /root/.credentials
cat /root/.linode_credentials.txt
```

1. This displays the passwords that were automatically generated when the instance was deployed. Once you save these passwords, you can safely delete this file.
Expand Down
4 changes: 2 additions & 2 deletions docs/products/tools/marketplace/guides/lamp-stack/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ A LAMP (Linux, [Apache](https://www.apache.org), [MySQL](https://www.mysql.com),
- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.

{{< note >}}
The password for the MySQL root user is automatically generated and provided in the file `/root/.credentials` when the LAMP deployment completes.
The password for the MySQL root user is automatically generated and provided in the file `/root/.linode_credentials.txt` when the LAMP deployment completes.
{{< /note >}}

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
4 changes: 2 additions & 2 deletions docs/products/tools/marketplace/guides/lemp-stack/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ The LEMP stack (Linux, [NGINX](https://www.nginx.com/), [MySQL](https://www.mysq
- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.

{{< note >}}
The password for the MySQL root user is automatically generated and provided in the file `/root/.credentials` when the LEMP deployment completes.
The password for the MySQL root user is automatically generated and provided in the file `/root/.linode_credentials.txt` when the LEMP deployment completes.
{{< /note >}}

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ The versions of MainConcept Plugins for FFmpeg included in this deployment are f

### MainConcept Plugins for FFmpeg Options

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

## Getting Started after Deployment

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The version of MainConcept Live Encoder in this deployment is a free demo. It ad

- **Email address for SSL Generation (Required):** This is the contact email address used for communication regarding the SSL certificate created during deployment. This should be the email address of your web server administrator.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}
{{< content "marketplace-custom-domain-fields-shortguide">}}

## Getting Started after Deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This version of the P2 AVC-ULTRA Transcoder is a free version that demonstrates

- **API Port** : Sets the port for the HTTP REST API endpoint. Defaults to port 8080.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}
{{< content "marketplace-custom-domain-fields-shortguide">}}

## Getting Started after Deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This version of the XAVC Transcoder is a free version that demonstrates how Main

- **API Port** : Sets the port for the HTTP REST API endpoint. Defaults to port 8080.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}
{{< content "marketplace-custom-domain-fields-shortguide">}}

## Getting Started after Deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This version of the XDCAM Transcoder is a free version that demonstrates how Mai

- **API Port** : Sets the port for the HTTP REST API endpoint. Defaults to port 8080.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}
{{< content "marketplace-custom-domain-fields-shortguide">}}

## Getting Started after Deployment
Expand Down
2 changes: 1 addition & 1 deletion docs/products/tools/marketplace/guides/nextcloud/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ authors: ["Linode"]

### NextCloud Options

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
2 changes: 1 addition & 1 deletion docs/products/tools/marketplace/guides/nirvashare/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ NirvaShare is a simplified and secure enterprise file sharing solution built on

- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
2 changes: 1 addition & 1 deletion docs/products/tools/marketplace/guides/odoo/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ authors: ["Linode"]

- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
2 changes: 1 addition & 1 deletion docs/products/tools/marketplace/guides/peppermint/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ authors: ["Linode"]

- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ This Marketplace App automatically configures a new Compute Instance with a limi

#### Limited User (Required)

You can fill out the following fields to automatically create a limited sudo user for your new Compute Instance. This account will be assigned to the *sudo* group, which provides elevated permission when running commands with the `sudo` prefix.
Fill out the following fields to automatically create a limited user for your new Compute Instance. This account will be assigned to the *sudo* group, which provides elevated permission when running commands with the `sudo` prefix.

- **Limited sudo user:** Enter your preferred username for the limited user. *No Capital Letters, Spaces, or Special Characters*
- **Limited sudo user:** Enter your preferred username for the limited user.
- **Password for the limited user:** Enter a *strong* password for the new user.
- **SSH public key for the limited user:** If you wish to login as the limited user through public key authentication (without entering a password), enter your public key here. See [Creating an SSH Key Pair and Configuring Public Key Authentication on a Server](/docs/guides/use-public-key-authentication-with-ssh/) for instructions on generating a key pair.
- **Disable root access over SSH:** To block the root user from logging in over SSH, select *Yes* (recommended). You can still switch to the root user once logged in and you can also log in as root through [Lish](/docs/products/compute/compute-instances/guides/lish/).

{{< note type="warning" title="Locating Your Sudo Password As Root">}}
If you disable root access for your deployment and do not enter a valid SSH public key, you will need to login as the root user via the [Lish console](/docs/products/compute/compute-instances/guides/lish/) and locate the credentials file found at `/root/.credentials` to obtain the limited sudo user password.
{{< /note >}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

- **Email address:** The start of authority (SOA) email address for this server. This is a required field if you want the installer to create DNS records.
- **Send email from domain:** If you'd like to be able to send email from the custom domain you optionally configured, select **Yes**. This configures the related DNS records, allows traffic through relevant ports within the internal firewall, and sets the rDNS. It does not configure any email software or guarantee email deliverability.

{{< content "email-warning-shortguide" >}}

{{< content "marketplace-special-character-limitations-shortguide">}}

Expand Down
2 changes: 1 addition & 1 deletion docs/products/tools/marketplace/guides/simplex/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ SimpleX Chat is a private messaging platform that uses temporary anonymous ident

### Linode Options

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}
{{< content "marketplace-custom-domain-fields-shortguide">}}

## Getting Started after Deployment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ authors: ["Linode"]

- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand Down
8 changes: 4 additions & 4 deletions docs/products/tools/marketplace/guides/woocommerce/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ external_resources:

## Configuration Options

- **Supported distributions:** Ubuntu 22.04 LTS
- **Supported distributions:** Debian 10
- **Recommended minimum plan:** All plan types and sizes can be used, though a minimum of a 4GB Dedicated CPU Compute Instance is recommended for production websites.

### WooCommerce Options
Expand All @@ -42,10 +42,10 @@ external_resources:
- **Website Title:** Enter a title for your WordPress site.

{{< note >}}
The passwords for the WordPress Admin User, WordPress Database User and MySQL root user are automatically generated and provided in the file `/root/.credentials` when the WordPress deployment completes.
The passwords for the WordPress Admin User, WordPress Database User and MySQL root user are automatically generated and provided in the file `/root/.linode_credentials.txt` when the WordPress deployment completes.
{{< /note >}}

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}
- **Would you like to be able to send password reset emails for WordPress?** Creates the required DNS records and configures the server so you can send emails from WordPress, such as for resetting a password.
Expand All @@ -67,7 +67,7 @@ Once the app has been *fully* deployed, you need to obtain the credentials from
1. Once logged in, access the credentials file by runing the following command:

```command
cat /root/.credentials
cat /root/.linode_credentials.txt
```

1. This displays the passwords that were automatically generated when the instance was deployed. Once you save these passwords, you can safely delete this file.
Expand Down
4 changes: 2 additions & 2 deletions docs/products/tools/marketplace/guides/wordpress/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ authors: ["Linode"]
The passwords for the WordPress Admin User, WordPress Database User and MySQL root user are automatically generated and provided in the file `/root/.linode_credentials.txt` when the WordPress deployment completes.
{{< /note >}}

{{< content "marketplace-required-limited-user-fields-shortguide">}}
{{< content "marketplace-limited-user-fields-shortguide">}}

{{< content "marketplace-custom-domain-fields-shortguide">}}

Expand All @@ -63,7 +63,7 @@ Once the app has been *fully* deployed, you need to obtain the credentials from
1. Once logged in, access the credentials file by running the following command:

```command
cat /root/.credentials
cat /root/.linode_credentials.txt
```

1. This displays the passwords that were automatically generated when the instance was deployed. Once you save these passwords, you can safely delete this file.
Expand Down
Loading

0 comments on commit f39afac

Please sign in to comment.