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
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ If you see the following licensing error, it means you have exceeded the number

*"Unfortunately your license limits have been exceeded, and you will no longer be able to create or deploy releases. Your Octopus Deploy license only allows X active nodes. You currently have Y active nodes."*

You can still login to your Octopus instance. You are only restricted from creating or deploying releases.
You can still log in to your Octopus instance. You are only restricted from creating or deploying releases.

This may unintentionally occur if you have copied or moved your Octopus folders on your servers and you have multiple instances pointing to the same Octopus database.

Expand Down
2 changes: 1 addition & 1 deletion src/pages/docs/argo-cd/instances/argo-user.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ To do this, the following must be performed:
## Create a new User
To create a new user in Argo, you must update the `argocd-cm` configmap (typically in the argo-cd namespace).

The following shows a configmap with a new user called `octopus` which is able to generate an apiKey, but cannot login
The following shows a configmap with a new user called `octopus` which is able to generate an apiKey, but cannot log in
via Argo's web-ui.
```
apiVersion: v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ Now that we have configured our Service Fabric cluster to use AAD, we can assign
In the Azure Active Directory:

- Create a user that you will use for deploying to your Service Fabric cluster.
- Login to the Azure Portal with this user (so you get past any temporary password shenanigans).
- Log into the Azure Portal with this user (so you get past any temporary password shenanigans).

Once we know this user is valid and can login, we can proceed again to your Azure Active Directory in the Azure Portal:
Once we know this user is valid and can log in, we can proceed again to your Azure Active Directory in the Azure Portal:

- Go to **App registrations**.
- Select your cluster application that you setup earlier.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ For this guide, we will start with the following deployment process for the Octo
:::

:::div{.success}
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/01-octofx-original/deployments/process). Please login as a guest.
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/01-octofx-original/deployments/process). Please log in as a guest.
:::

## Zero configuration rollback
Expand All @@ -62,7 +62,7 @@ The updated deployment process will be:
:::

:::div{.success}
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/02-octofx-simple-rollback/deployments/process). Please login as a guest.
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/02-octofx-simple-rollback/deployments/process). Please log in as a guest.
:::

### Calculate deployment mode
Expand Down Expand Up @@ -120,7 +120,7 @@ The resulting process will be:
:::

:::div{.success}
View that deployment process on [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/03-octofx-complex-rollback/deployments/process). Please login as a guest.
View that deployment process on [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/03-octofx-complex-rollback/deployments/process). Please log in as a guest.
:::

### Comparison to simple rollback process
Expand Down
4 changes: 2 additions & 2 deletions src/pages/docs/deployments/patterns/rollbacks/nginx/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The existing deployment process is:
:::

:::div{.success}
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/01-octofx-original/deployments/process). Please login as a guest.
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/01-octofx-original/deployments/process). Please log in as a guest.
:::

## Zero-configuration rollback
Expand All @@ -61,7 +61,7 @@ The updated deployment process will be:
:::

:::div{.success}
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/bestbags-rollback/deployments/process). Please login as a guest.
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/bestbags-rollback/deployments/process). Please log in as a guest.
:::

### calculate deployment mode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ For this guide, we'll start with an existing deployment process for deploying th
:::

:::div{.success}
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/01-petclinic-original/deployments/process). Please login as a guest.
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/01-petclinic-original/deployments/process). Please log in as a guest.
:::

## Zero-configuration rollback
Expand All @@ -67,7 +67,7 @@ The updated deployment process for a simple rollback would look like this:
:::

:::div{.success}
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/02-petclinic-simplerollback/deployments/process). Please login as a guest.
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/02-petclinic-simplerollback/deployments/process). Please log in as a guest.
:::

### Calculate deployment mode
Expand Down Expand Up @@ -114,7 +114,7 @@ The new deployment process would look like this:
:::

:::div{.success}
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/03-petclinic-complexrollback/deployments/process). Please login as a guest.
View the deployment process on our [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/03-petclinic-complexrollback/deployments/process). Please log in as a guest.
:::

Next, we'll go through the newly added and altered steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ Complete the wizard, then navigate to the roles view to ensure the Tentacle serv

## Connect Octopus Server to a clustered Tentacle {#ClusteringTentacles-ConnectOctopusServer}

Login to the Octopus Portal and go to the **environments** page. Under the desired environment, click **Add Deployment Target**.
Log into the Octopus Portal and go to the **environments** page. Under the desired environment, click **Add Deployment Target**.

For the target type, choose **Listening Tentacle**.

Expand Down
6 changes: 3 additions & 3 deletions src/pages/docs/kubernetes/tutorials/kubernetes-rollbacks.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ For this guide, we'll start with an existing deployment process for deploying Pe
:::

:::div{.success}
View that deployment process on [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/01-kubernetes-original/deployments/process). Please login as a guest.
View that deployment process on [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/01-kubernetes-original/deployments/process). Please lo gin as a guest.
:::

## Zero-configuration Rollback
Expand All @@ -60,7 +60,7 @@ The updated deployment process for a simple rollback would look like this:
:::

:::div{.success}
View that deployment process on [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/02-kubernetes-simple-rollback/deployments/process). Please login as a guest.
View that deployment process on [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/02-kubernetes-simple-rollback/deployments/process). Please log in as a guest.
:::

### Calculate deployment mode
Expand Down Expand Up @@ -115,7 +115,7 @@ The new deployment process would look like this:
:::

:::div{.success}
View that deployment process on [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/03-kubernetes-complex-rollback/deployments/process). Please login as a guest.
View that deployment process on [samples instance](https://samples.octopus.app/app#/Spaces-762/projects/03-kubernetes-complex-rollback/deployments/process). Please log in as a guest.
:::

Next, we'll go through the newly added and altered steps:
Expand Down
2 changes: 1 addition & 1 deletion src/pages/docs/octopus-rest-api/cli/octopus-login.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ navOrder: 72
---
import SamplesInstance from 'src/shared-content/samples/samples-instance.include.md';

Login to your Octopus server using OpenID Connect (OIDC) or an API key. If no arguments are provided then login will be done interactively allowing creation of an API key.
Log into your Octopus server using OpenID Connect (OIDC) or an API key. If no arguments are provided then login will be done interactively allowing creation of an API key.

```
Usage:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
id-token: write # This is required to obtain the ID token from GitHub Actions
contents: read # For example: this is required to check out code, remove if not needed
steps:
- name: Login to Octopus
- name: Log into Octopus
uses: OctopusDeploy/login@v1
with:
server: https://my.octopus.app
Expand Down
2 changes: 1 addition & 1 deletion src/pages/docs/octopus-rest-api/openid-connect/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
id-token: write # This is required to obtain the ID token from GitHub Actions
contents: read # For example: this is required to check out code, remove if not needed
steps:
- name: Login to Octopus
- name: Log into Octopus
uses: OctopusDeploy/login@v1
with:
server: https://my.octopus.app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Codefresh pipelines allow you to customize steps to create, deploy and promote r

Octopus Deploy has several custom pipeline steps available:

- [Login to Octopus](https://codefresh.io/steps/step/octopusdeploy-login)
- [Log into Octopus](https://codefresh.io/steps/step/octopusdeploy-login)
- [Create a package](https://codefresh.io/steps/step/octopusdeploy-create-package)
- [Push a package](https://codefresh.io/steps/step/octopusdeploy-push-package)
- [Create a release](https://codefresh.io/steps/step/octopusdeploy-create-release)
Expand Down Expand Up @@ -53,7 +53,7 @@ The following steps require Octopus server authentication:

There are two options for authentication. You can:

1. Use the [Login to Octopus step](https://codefresh.io/steps/step/octopusdeploy-login) and provide `OCTOPUS_ACCESS_TOKEN` as an argument for each step.
1. Use the [Log into Octopus step](https://codefresh.io/steps/step/octopusdeploy-login) and provide `OCTOPUS_ACCESS_TOKEN` as an argument for each step.
2. Skip the login step and provide an `OCTOPUS_API_KEY` as an argument for each step.

## Codefresh variables
Expand Down Expand Up @@ -320,7 +320,7 @@ Octopus Deploy steps and examples are available from the [Codefresh Marketplace]

Each step includes one or two examples to help with setting up a workflow. Basic examples include only required arguments, and complex examples include both required and optional arguments.

## Login to Octopus
## Log into Octopus
The **octopusdeploy-login** step authenticates to Octopus via OIDC, so your Octopus server needs a [service account with OIDC enabled](/docs/octopus-rest-api/openid-connect/other-issuers).
To allow connections from Codefresh, the service account's OIDC identity should have **Issuer** `https://oidc.codefresh.io` and a **Subject** matching the [Codefresh subject claim for your preferred pipeline trigger](https://codefresh.io/docs/docs/integrations/oidc-pipelines/#codefresh-trigger-types-for-subject-claims).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Integrating GitHub Actions with Octopus Deploy allows you to trigger events in O
## Octopus Deploy Actions

Octopus Deploy provides GitHub Actions which enable you to:
- [Login to Octopus Deploy](https://github.com/marketplace/actions/login-to-octopus-deploy)
- [Log into Octopus Deploy](https://github.com/marketplace/actions/login-to-octopus-deploy)
- [Install Octopus CLI](https://github.com/marketplace/actions/install-octopus-cli)
- [Create a Release](https://github.com/marketplace/actions/create-release-in-octopus-deploy)
- [Deploy a Release](https://github.com/marketplace/actions/deploy-a-release-in-octopus-deploy)
Expand Down Expand Up @@ -62,8 +62,8 @@ jobs:
- name: Your build ✨
run: echo "Your build steps!"

# Action to Login to Octopus Deploy
- name: Login to Octopus Deploy 🐙
# Action to log into Octopus Deploy
- name: Log into Octopus Deploy 🐙
uses: OctopusDeploy/login@v1
with:
server: https://acme.octopus.app
Expand Down Expand Up @@ -149,8 +149,8 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

# Action to Login to Octopus Deploy
- name: Login to Octopus Deploy 🐙
# Action to log into Octopus Deploy
- name: Log into Octopus Deploy 🐙
uses: OctopusDeploy/login@v1
with:
server: ${{ secrets.SERVER }}
Expand Down Expand Up @@ -225,8 +225,8 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

# Action to Login to Octopus Deploy
- name: Login to Octopus Deploy 🐙
# Action to log into Octopus Deploy
- name: Log into Octopus Deploy 🐙
uses: OctopusDeploy/login@v1
with:
server: ${{ secrets.SERVER }}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/docs/security/authentication/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Let's consider that we have UsernamePassword enabled and we create some users, a

This scenario would work equally with Microsoft Entra ID or Google Workspace in place of Active Directory.

You can also specify the details for multiple logins for each user. For example, you could specify that a user can log is as a specific UPN/SamAccountName from Active Directory or that they could login using a specific account/email address using Google Workspace. Whichever option is actually used to login, Octopus will identify them as the same user.
You can also specify the details for multiple logins for each user. For example, you could specify that a user can log is as a specific UPN/SamAccountName from Active Directory or that they could log in using a specific account/email address using Google Workspace. Whichever option is actually used to log in, Octopus will identify them as the same user.

### Matching external identities to Octopus users {#matching-external-identities}

Expand Down