From 41eda7df93ef264c4b83659dc741bf37a56fead7 Mon Sep 17 00:00:00 2001 From: Taylor Bantle Date: Fri, 3 May 2024 14:07:34 -0700 Subject: [PATCH 1/2] Fix doltlab broken links --- .../content/guides/administrator/administrator.md | 10 +++++----- .../content/guides/administrator/enterprise.md | 4 ++-- .../pre-installer-administrator-guide.md | 2 +- .../doltlab/content/guides/installation/linux.md | 7 ++++--- .../content/guides/installation/start-doltlab.md | 14 +++++++------- .../content/introduction/getting-started.md | 10 +++++----- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/packages/doltlab/content/guides/administrator/administrator.md b/packages/doltlab/content/guides/administrator/administrator.md index e415d7221..4da92f1e4 100644 --- a/packages/doltlab/content/guides/administrator/administrator.md +++ b/packages/doltlab/content/guides/administrator/administrator.md @@ -10,7 +10,7 @@ This guide will cover how to perform common DoltLab administrator configuration 4. [Send service logs to the DoltLab team](#send-service-logs) 5. [Authenticate a Dolt client to use a DoltLab account](#auth-dolt-client) 6. [Monitor DoltLab with cAdvisor and Prometheus](#prometheus) -7. [Connect DoltLab to an SMTP server](#connect-smtp-server) +7. [Connect DoltLab to an SMTP server](#connect-smtp-server) 8. [Connect DoltLab to an SMTP server with implicit TLS](#smtp-implicit-tls) 9. [Troubleshoot SMTP server connection problems](#troubleshoot-smtp-connection) 10. [Set up a SMTP server using any Gmail address](#set-up-a-smtp-server-using-any-gmail-address) @@ -26,7 +26,7 @@ This guide will cover how to perform common DoltLab administrator configuration

File issues and view release notes

-DoltLab's source code is currently closed, but you can file DoltLab issues the [issues repository](https://github.com/dolthub/doltlab-issues). Release notes are available [here](../introduction/installation/release-notes.md). +DoltLab's source code is currently closed, but you can file DoltLab issues the [issues repository](https://github.com/dolthub/doltlab-issues). Release notes are available [here](../../release-notes.md).

Backup and restore volumes

@@ -98,7 +98,7 @@ docker volume rm doltlab_doltlabdb-dolt-data docker volume rm doltlab_doltlabdb-dolt-backups ``` -Next, [start DoltLab's services](../introduction/installation/start-doltlab.md) using the `start.sh` script. After the script completes, stop DoltLab once more with `./stop.sh`. Doing this will recreate the required containers so that their volumes can be updated with the commands below. +Next, [start DoltLab's services](../installation/start-doltlab.md) using the `start.sh` script. After the script completes, stop DoltLab once more with `./stop.sh`. Doing this will recreate the required containers so that their volumes can be updated with the commands below. Once the services are stopped, `cd` into the directory containing the `remote-data.tar` backup file and run: @@ -354,7 +354,7 @@ Additionally, TLS verification can be skipped by adding the additional argument DoltLab requires a connection to an existing SMTP server in order for users to create accounts, verify email addresses, reset forgotten passwords, and collaborate on databases. -DoltLab creates a [default user](../../introduction/installation/start-doltlab.md), `admin`, when if first starts up, which allows administrators to sign-in to their DoltLab instance, even if they are experiencing SMTP server connection issues. +DoltLab creates a [default user](../installation/start-doltlab.md), `admin`, when if first starts up, which allows administrators to sign-in to their DoltLab instance, even if they are experiencing SMTP server connection issues. To help troubleshoot and resolve SMTP server connection issues, we've published the following [go tool](https://github.com/dolthub/doltlab-issues/blob/main/go/cmd/smtp_connection_helper/main.go) to help diagnose the SMTP connection issues on the host running DoltLab. @@ -610,7 +610,7 @@ You can now restart DoltLab with the `./start.sh` script, and it will be served

Improve DoltLab performance

-It is possible to limit the number of concurrent Jobs running on a DoltLab host, which might be starving the host for resources and affecting DoltLab's performance. +It is possible to limit the number of concurrent Jobs running on a DoltLab host, which might be starving the host for resources and affecting DoltLab's performance. When users upload files on a DoltLab instance, or merge a pull request, DoltLab creates a Job corresponding to this work. These Jobs spawn new Docker containers that performs the required work. diff --git a/packages/doltlab/content/guides/administrator/enterprise.md b/packages/doltlab/content/guides/administrator/enterprise.md index fee0ea0bd..f2ba5c7c0 100644 --- a/packages/doltlab/content/guides/administrator/enterprise.md +++ b/packages/doltlab/content/guides/administrator/enterprise.md @@ -4,7 +4,7 @@ title: "DoltLab Enterprise Guide" This guide will cover how to run DoltLab in Enterprise mode and use exclusive features not covered in the [Administrator's Guide](../administrator/administrator.md). -To start DoltLab in Enterprise mode, when [running the installer](../introduction/installation/start-doltlab.md) supply the following additional arguments: +To start DoltLab in Enterprise mode, when [running the installer](../installation/start-doltlab.md) supply the following additional arguments: ```bash ./installer \ @@ -34,7 +34,7 @@ You can use a custom logo on DoltLab by running the `installer` with the argumen DoltLab Enterprise allows administrators to customize the automated emails their DoltLab instance sends to its users. -Custom emails can be configured with the `installer` by supplying the argument `--custom-email-templates=true`. The installer will generate the email template files at `./doltlabapi/templates/email` which match the files described below. You can customize these files and they will be used by DoltLab. Each file is named according to use-case. The names and paths of these files should NOT be changed. +Custom emails can be configured with the `installer` by supplying the argument `--custom-email-templates=true`. The installer will generate the email template files at `./doltlabapi/templates/email` which match the files described below. You can customize these files and they will be used by DoltLab. Each file is named according to use-case. The names and paths of these files should NOT be changed. - `collabInvite.txt` sent to invite user to be a database collaborator. - `invite.txt` sent to invite a user to join an organization. diff --git a/packages/doltlab/content/guides/administrator/pre-installer-administrator-guide.md b/packages/doltlab/content/guides/administrator/pre-installer-administrator-guide.md index f95aabdc3..98bf1f145 100644 --- a/packages/doltlab/content/guides/administrator/pre-installer-administrator-guide.md +++ b/packages/doltlab/content/guides/administrator/pre-installer-administrator-guide.md @@ -94,7 +94,7 @@ docker volume rm doltlab_doltlabdb-dolt-data docker volume rm doltlab_doltlabdb-dolt-backups ``` -Next, [start DoltLab's services](../introduction/installation/start-doltlab-pre-installer.md) using the `start-doltlab.sh` script. After the script completes, stop DoltLab once more with `docker-compose stop`. Doing this will recreate the required containers so that their volumes can be updated with the commands below. +Next, [start DoltLab's services](../installation/start-doltlab.md) using the `start-doltlab.sh` script. After the script completes, stop DoltLab once more with `docker-compose stop`. Doing this will recreate the required containers so that their volumes can be updated with the commands below. Once the services are stopped, `cd` into the directory containing the `remote-data.tar` backup file and run: diff --git a/packages/doltlab/content/guides/installation/linux.md b/packages/doltlab/content/guides/installation/linux.md index dfa6eb874..9efd7757e 100644 --- a/packages/doltlab/content/guides/installation/linux.md +++ b/packages/doltlab/content/guides/installation/linux.md @@ -17,6 +17,7 @@ cd doltlab ``` Or, to install a specific version of DoltLab, run: + ```bash export DOLTLAB_VERSION=v2.1.1 curl -LO https://doltlab-releases.s3.amazonaws.com/linux/amd64/doltlab-${DOLTLAB_VERSION}.zip @@ -28,12 +29,12 @@ The contents of the resulting `doltlab` directory can vary depending on the vers Inside the `doltlab` directory you'll find the following binaries: -* installer -* smtp_connection_helper +- installer +- smtp_connection_helper The `installer` binary, is the primary interface for configuring a DoltLab instance. This tool will create all other assets DoltLab needs to run, based on the arguments you supply it. -The `smtp_connection_helper` binary can be used to help you troubleshoot any issues connecting your DoltLab instance to your existing SMTP server. This tool uses similar code to DoltLab's email service and sends a test email if the connection to the SMTP server is properly configured. The source code for the tool is available [here](https://gist.github.com/coffeegoddd/66f5aeec98640ff8a22a1b6910826667) and basic instructions for using the tool are [here](./administrator.md#troubleshoot-smtp-connection). +The `smtp_connection_helper` binary can be used to help you troubleshoot any issues connecting your DoltLab instance to your existing SMTP server. This tool uses similar code to DoltLab's email service and sends a test email if the connection to the SMTP server is properly configured. The source code for the tool is available [here](https://gist.github.com/coffeegoddd/66f5aeec98640ff8a22a1b6910826667) and basic instructions for using the tool are [here](../administrator/administrator.md#troubleshoot-smtp-connection). # Next Steps diff --git a/packages/doltlab/content/guides/installation/start-doltlab.md b/packages/doltlab/content/guides/installation/start-doltlab.md index ea7680649..84b2ed539 100644 --- a/packages/doltlab/content/guides/installation/start-doltlab.md +++ b/packages/doltlab/content/guides/installation/start-doltlab.md @@ -2,7 +2,7 @@ title: Start DoltLab --- -The following describes how to start the latest versions of DoltLab, >= `v2.1.2`, that contain the `installer` binary. For instructions on how to start an older version of DoltLab that do not have the `installer`, please see the [pre-installer guide](./start-doltlab-pre-installer.md). +The following describes how to start the latest versions of DoltLab, >= `v2.1.2`, that contain the `installer` binary. For instructions on how to start an older version of DoltLab that do not have the `installer`, please see the [pre-installer guide](../../older/installation/start-doltlab-pre-installer.md). In the simplest configuration the `installer` will generate four local DoltLab assets: a `docker-compose.yaml` file, an `envoy.json` file, a `start.sh` script, and a `stop.sh` script. @@ -37,12 +37,12 @@ If the argument `--default-user-email` is not provided to the `installer` before Additionally, the first time the `installer` is run, it will generate the all passwords it needs to initialize your DoltLab instance. These passwords are stored in `./.secrets`. -* `./.secrets/default_user_pass.priv`, contains the password for the default user. -* `./.secrets/dolt_admin_password.priv`, contains the `dolthubadmin` password for DoltLab's application database. -* `./.secrets/dolt_dolthubapi_password.priv`, contains the `dolthubapi` password for DoltLab's application database. -* `./.secrets/smtp_username.priv`, contains the SMTP username for an SMTP server. This will have a placeholder value if no SMTP server is configured. -* `./.secrets/smtp_password.priv`, contains the SMTP password for an SMTP server. This will have a placeholder value if no SMTP server is configured. -* `./.secrets/smtp_oauth_token.priv`, contains the SMTP oauth token for an SMTP server. This will have a placeholder value if no SMTP server is configured. +- `./.secrets/default_user_pass.priv`, contains the password for the default user. +- `./.secrets/dolt_admin_password.priv`, contains the `dolthubadmin` password for DoltLab's application database. +- `./.secrets/dolt_dolthubapi_password.priv`, contains the `dolthubapi` password for DoltLab's application database. +- `./.secrets/smtp_username.priv`, contains the SMTP username for an SMTP server. This will have a placeholder value if no SMTP server is configured. +- `./.secrets/smtp_password.priv`, contains the SMTP password for an SMTP server. This will have a placeholder value if no SMTP server is configured. +- `./.secrets/smtp_oauth_token.priv`, contains the SMTP oauth token for an SMTP server. This will have a placeholder value if no SMTP server is configured. DoltLab uses the values of `DOLT_PASSWORD` and `DOLTHUBAPI_PASSWORD` contained in the generated secrets to initialize DoltLab's application database using the following SQL statements: diff --git a/packages/doltlab/content/introduction/getting-started.md b/packages/doltlab/content/introduction/getting-started.md index 48f0f8a45..8583cf73f 100644 --- a/packages/doltlab/content/introduction/getting-started.md +++ b/packages/doltlab/content/introduction/getting-started.md @@ -186,7 +186,7 @@ If `docker ps` works without `sudo`, you are in business. Now, my host is set up for DoltLab, I need to generate the configuration needed to run it. This is done with the installer as well, this time by only passing in the name of your host. -```sh +````sh ubuntu@ip-10-2-0-24:~/doltlab$ ./installer --host 54.191.163.60 2024-04-30T23:38:43.844Z INFO metrics/emitter.go:111 Successfully sent DoltLab usage metrics @@ -257,7 +257,7 @@ cc278092afcb55de755e9b05725b86bb122eddd128264ee17134418dc154f455 ✔ Container doltlab-doltlabapi-1 Started 0.0s ✔ Container doltlab-doltlabgraphql-1 Started 0.0s ✔ Container doltlab-doltlabui-1 Started 0.0s -``` +```` Now the moment of truth, I hit the IP over `http`, not `https`, http://54.191.163.60/. Bam! @@ -355,7 +355,7 @@ You're now ready to try out all the Dolt and DoltLab experiences like Pull Reque ## Create new users -As discussed in [the single user section](#single-user), creating users requires a working SMTP server to send emails. Configuring an email server for DoltLab is beyond the scope of this Getting Started guide. You have a bunch of options, the simplest being using any Gmail address' SMTP server. Consult [this guide to set up an email server for DoltLab](../../guides/administrator#set-up-a-smtp-server-using-any-gmail-address). +As discussed in [the single user section](#single-user), creating users requires a working SMTP server to send emails. Configuring an email server for DoltLab is beyond the scope of this Getting Started guide. You have a bunch of options, the simplest being using any Gmail address' SMTP server. Consult [this guide to set up an email server for DoltLab](../guides/administrator/administrator.md#set-up-a-smtp-server-using-any-gmail-address). ## Receive Email Notifications @@ -371,8 +371,8 @@ Right now, you're stuck hitting the IP address of your host. In order to use a c ## Custom Logo/Colors -Yay! Our first DoltLab Enterprise feature. If you would like a custom logo and color scheme for your DoltLab instance, you are going to need [DoltLab Enterprise](../../guides/enterprise). DoltLab Enterprise is $5,000/month for unlimited users. It comes with Enterprise Support for Dolt as well. Among [other features](../..//guides/enterprise), DoltLab Enterprise allows you to customize the look and feel of your DoltLab instance. Learn how to [configure your DoltLab as Enterprise](../../guides/enterprise) and [set up your custom look and feel here](../../guides/enterprise#use-custom-logo). +Yay! Our first DoltLab Enterprise feature. If you would like a custom logo and color scheme for your DoltLab instance, you are going to need [DoltLab Enterprise](../guides/administrator/enterprise.md). DoltLab Enterprise is $5,000/month for unlimited users. It comes with Enterprise Support for Dolt as well. Among [other features](../..//guides/enterprise), DoltLab Enterprise allows you to customize the look and feel of your DoltLab instance. Learn how to [configure your DoltLab as Enterprise](../../guides/enterprise) and [set up your custom look and feel here](../../guides/enterprise#use-custom-logo). ## Scalability -Lastly, your DoltLab is running on a single host. All the components will scale to the size of that host including storing all the databases that are created. Storage and compute requirements can get big quickly. In order to break your DoltLab up into multiple instances and use cloud storage to store your databases, you need [DoltLab Enterprise](https://docs.doltlab.com/guides/enterprise). Learn [how to set up Enterprise here](../../guides/enterprise). \ No newline at end of file +Lastly, your DoltLab is running on a single host. All the components will scale to the size of that host including storing all the databases that are created. Storage and compute requirements can get big quickly. In order to break your DoltLab up into multiple instances and use cloud storage to store your databases, you need [DoltLab Enterprise](https://docs.doltlab.com/guides/enterprise). Learn [how to set up Enterprise here](../../guides/enterprise). From 1d8026b04fea4acaa2ef2050b81026d6e74501c6 Mon Sep 17 00:00:00 2001 From: Taylor Bantle Date: Fri, 3 May 2024 14:18:34 -0700 Subject: [PATCH 2/2] Fixes --- .../administrator/pre-installer-administrator-guide.md | 4 ++-- packages/doltlab/content/introduction/getting-started.md | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/doltlab/content/guides/administrator/pre-installer-administrator-guide.md b/packages/doltlab/content/guides/administrator/pre-installer-administrator-guide.md index 98bf1f145..b1fe74b56 100644 --- a/packages/doltlab/content/guides/administrator/pre-installer-administrator-guide.md +++ b/packages/doltlab/content/guides/administrator/pre-installer-administrator-guide.md @@ -94,7 +94,7 @@ docker volume rm doltlab_doltlabdb-dolt-data docker volume rm doltlab_doltlabdb-dolt-backups ``` -Next, [start DoltLab's services](../installation/start-doltlab.md) using the `start-doltlab.sh` script. After the script completes, stop DoltLab once more with `docker-compose stop`. Doing this will recreate the required containers so that their volumes can be updated with the commands below. +Next, [start DoltLab's services](../../older/installation/start-doltlab-pre-installer.md) using the `start-doltlab.sh` script. After the script completes, stop DoltLab once more with `docker-compose stop`. Doing this will recreate the required containers so that their volumes can be updated with the commands below. Once the services are stopped, `cd` into the directory containing the `remote-data.tar` backup file and run: @@ -187,7 +187,7 @@ SET session_replication_role = replica; ... ``` -[Start DoltLab's services](./installation.md#start-doltlab) again using the `start-doltlab.sh` script. After the script completes, `cd` into the directory containing the `postgres-dump.sql` file and run: +[Start DoltLab's services](../installation/start-doltlab.md) again using the `start-doltlab.sh` script. After the script completes, `cd` into the directory containing the `postgres-dump.sql` file and run: > For DoltLab `v0.7.0` and later, use `--network doltlab` below. diff --git a/packages/doltlab/content/introduction/getting-started.md b/packages/doltlab/content/introduction/getting-started.md index 8583cf73f..ade541511 100644 --- a/packages/doltlab/content/introduction/getting-started.md +++ b/packages/doltlab/content/introduction/getting-started.md @@ -186,7 +186,7 @@ If `docker ps` works without `sudo`, you are in business. Now, my host is set up for DoltLab, I need to generate the configuration needed to run it. This is done with the installer as well, this time by only passing in the name of your host. -````sh +```sh ubuntu@ip-10-2-0-24:~/doltlab$ ./installer --host 54.191.163.60 2024-04-30T23:38:43.844Z INFO metrics/emitter.go:111 Successfully sent DoltLab usage metrics @@ -198,6 +198,7 @@ ubuntu@ip-10-2-0-24:~/doltlab$ ./installer --host 54.191.163.60 2024-04-30T23:38:43.844Z INFO cmd/main.go:628 To sign-in to DoltLab as the default user, use {"username": "admin", "password: value of DEFAULT_USER_PASSWORD, stored at": "/home/ubuntu/doltlab/.secrets/default_user_pass.priv"} Then, I just run the `start.sh` that was generated. This pulls all the Docker images and runs them. +``` ```sh ubuntu@ip-10-2-0-124:~/doltlab$ ./start.sh @@ -257,7 +258,7 @@ cc278092afcb55de755e9b05725b86bb122eddd128264ee17134418dc154f455 ✔ Container doltlab-doltlabapi-1 Started 0.0s ✔ Container doltlab-doltlabgraphql-1 Started 0.0s ✔ Container doltlab-doltlabui-1 Started 0.0s -```` +``` Now the moment of truth, I hit the IP over `http`, not `https`, http://54.191.163.60/. Bam!