Skip to content

Commit f39afac

Browse files
committed
Revert "Merge pull request linode#6813 from jddocs/rc-v1.298.0"
This reverts commit 6633604, reversing changes made to 70687a2.
1 parent 6633604 commit f39afac

File tree

26 files changed

+139
-71
lines changed

26 files changed

+139
-71
lines changed
-6 KB
Binary file not shown.

docs/products/tools/marketplace/_shortguides/marketplace-required-limited-user-fields-shortguide/index.md

-18
This file was deleted.

docs/products/tools/marketplace/guides/docker/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ aliases: ['/platform/marketplace/deploying-docker-with-marketplace-apps/', '/pla
3333

3434
### Docker Options
3535

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

3838
{{< content "marketplace-custom-domain-fields-shortguide">}}
3939
- **Email address for SOA Record:** This should be the email address of your server administrator.

docs/products/tools/marketplace/guides/focalboard/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ authors: ["Linode"]
3434

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

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

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

docs/products/tools/marketplace/guides/harbor/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Harbor is an excellent compliment to the [Linode Kubernetes Engine (LKE)](/docs/
3636

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

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

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

docs/products/tools/marketplace/guides/joplin/index.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ authors: ["Linode"]
2525

2626
## Configuration Options
2727

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

3131
### Joplin Options
3232

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

35-
{{< content "marketplace-required-limited-user-fields-shortguide">}}
36+
{{< content "marketplace-limited-user-fields-shortguide">}}
3637

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

docs/products/tools/marketplace/guides/kepler/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ Kepler requires a valid license to use the software beyond the initial 14 day fr
4545
- **Website Title:** Enter a title for your WordPress site.
4646

4747
{{< note >}}
48-
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.
48+
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.
4949
{{< /note >}}
5050

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

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

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

7878
```command
79-
cat /root/.credentials
79+
cat /root/.linode_credentials.txt
8080
```
8181

8282
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.

docs/products/tools/marketplace/guides/lamp-stack/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ A LAMP (Linux, [Apache](https://www.apache.org), [MySQL](https://www.mysql.com),
3535
- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.
3636

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

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

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

docs/products/tools/marketplace/guides/lemp-stack/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ The LEMP stack (Linux, [NGINX](https://www.nginx.com/), [MySQL](https://www.mysq
3636
- **Email address** *(required)*: Enter the email address to use for generating the SSL certificates.
3737

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

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

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

docs/products/tools/marketplace/guides/mainconcept-ffmpeg-plugins-demo/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The versions of MainConcept Plugins for FFmpeg included in this deployment are f
4343

4444
### MainConcept Plugins for FFmpeg Options
4545

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

4848
## Getting Started after Deployment
4949

docs/products/tools/marketplace/guides/mainconcept-live-encoder-demo/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The version of MainConcept Live Encoder in this deployment is a free demo. It ad
3636

3737
- **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.
3838

39-
{{< content "marketplace-required-limited-user-fields-shortguide">}}
39+
{{< content "marketplace-limited-user-fields-shortguide">}}
4040
{{< content "marketplace-custom-domain-fields-shortguide">}}
4141

4242
## Getting Started after Deployment

docs/products/tools/marketplace/guides/mainconcept-p2-avc-ultra-demo/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This version of the P2 AVC-ULTRA Transcoder is a free version that demonstrates
3434

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

37-
{{< content "marketplace-required-limited-user-fields-shortguide">}}
37+
{{< content "marketplace-limited-user-fields-shortguide">}}
3838
{{< content "marketplace-custom-domain-fields-shortguide">}}
3939

4040
## Getting Started after Deployment

docs/products/tools/marketplace/guides/mainconcept-xavc-transcoder-demo/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This version of the XAVC Transcoder is a free version that demonstrates how Main
3434

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

37-
{{< content "marketplace-required-limited-user-fields-shortguide">}}
37+
{{< content "marketplace-limited-user-fields-shortguide">}}
3838
{{< content "marketplace-custom-domain-fields-shortguide">}}
3939

4040
## Getting Started after Deployment

docs/products/tools/marketplace/guides/mainconcept-xdcam-transcoder-demo/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This version of the XDCAM Transcoder is a free version that demonstrates how Mai
3434

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

37-
{{< content "marketplace-required-limited-user-fields-shortguide">}}
37+
{{< content "marketplace-limited-user-fields-shortguide">}}
3838
{{< content "marketplace-custom-domain-fields-shortguide">}}
3939

4040
## Getting Started after Deployment

docs/products/tools/marketplace/guides/nextcloud/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ authors: ["Linode"]
3434

3535
### NextCloud Options
3636

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

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

docs/products/tools/marketplace/guides/nirvashare/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ NirvaShare is a simplified and secure enterprise file sharing solution built on
3434

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

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

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

docs/products/tools/marketplace/guides/odoo/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ authors: ["Linode"]
3434

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

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

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

docs/products/tools/marketplace/guides/peppermint/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ authors: ["Linode"]
3232

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

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

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

docs/products/tools/marketplace/guides/secure-your-server/index.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ This Marketplace App automatically configures a new Compute Instance with a limi
2828

2929
#### Limited User (Required)
3030

31-
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.
31+
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.
3232

33-
- **Limited sudo user:** Enter your preferred username for the limited user. *No Capital Letters, Spaces, or Special Characters*
33+
- **Limited sudo user:** Enter your preferred username for the limited user.
34+
- **Password for the limited user:** Enter a *strong* password for the new user.
3435
- **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.
3536
- **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/).
3637

37-
{{< note type="warning" title="Locating Your Sudo Password As Root">}}
38-
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.
39-
{{< /note >}}
40-
4138
{{< content "marketplace-custom-domain-fields-shortguide">}}
4239

4340
- **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.
41+
- **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.
42+
43+
{{< content "email-warning-shortguide" >}}
4444

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

docs/products/tools/marketplace/guides/simplex/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SimpleX Chat is a private messaging platform that uses temporary anonymous ident
3737

3838
### Linode Options
3939

40-
{{< content "marketplace-required-limited-user-fields-shortguide">}}
40+
{{< content "marketplace-limited-user-fields-shortguide">}}
4141
{{< content "marketplace-custom-domain-fields-shortguide">}}
4242

4343
## Getting Started after Deployment

docs/products/tools/marketplace/guides/uptime-kuma/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ authors: ["Linode"]
3434

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

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

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

docs/products/tools/marketplace/guides/woocommerce/index.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ external_resources:
2929

3030
## Configuration Options
3131

32-
- **Supported distributions:** Ubuntu 22.04 LTS
32+
- **Supported distributions:** Debian 10
3333
- **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.
3434

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

4444
{{< note >}}
45-
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.
45+
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.
4646
{{< /note >}}
4747

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

5050
{{< content "marketplace-custom-domain-fields-shortguide">}}
5151
- **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.
@@ -67,7 +67,7 @@ Once the app has been *fully* deployed, you need to obtain the credentials from
6767
1. Once logged in, access the credentials file by runing the following command:
6868

6969
```command
70-
cat /root/.credentials
70+
cat /root/.linode_credentials.txt
7171
```
7272

7373
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.

docs/products/tools/marketplace/guides/wordpress/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ authors: ["Linode"]
4343
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.
4444
{{< /note >}}
4545

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

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

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

6565
```command
66-
cat /root/.credentials
66+
cat /root/.linode_credentials.txt
6767
```
6868

6969
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.

0 commit comments

Comments
 (0)