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
2 changes: 1 addition & 1 deletion website/docs/add-secure-apps/applications/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The following options can be configured:

If the authentik server does not have a volume mounted under `/media`, you'll get a text input. This accepts absolute URLs. If you've mounted single files into the container, you can reference them using `https://authentik.company/media/my-file.png`.

If there is a mount under `/media` or if [S3 storage](../../install-config/storage-s3.md) is configured, you'll instead see a field to upload a file.
If there is a mount under `/media` or if [S3 storage](../../sys-mgmt/ops/storage-s3.md) is configured, you'll instead see a field to upload a file.

- _Publisher_: Text shown below the application
- _Description_: Subtext shown on the application card below the publisher
6 changes: 3 additions & 3 deletions website/docs/install-config/index.mdx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
title: Installation
title: Installation and Configuration
---

Everything you need to get authentik up and running!

For information about upgrading to a new version, refer to the <b>Upgrade</b> section in the relevant [Release Notes](../releases) and to our [Upgrade authentik](./upgrade.mdx) documentation.

The installation process for our free open source version and our [Enterprise](../enterprise/index.md) version are exactly the same. For information about obtaining an Enterprise license, refer to [License management](../enterprise/manage-enterprise.md#license-management) documentation.

For information about upgrading to a new version, refer to the <b>Upgrade</b> section in the relevant [Release Notes](../releases) and to our [Upgrade authentik](./upgrade.mdx) documentation.

import DocCardList from "@theme/DocCardList";

<DocCardList />
2 changes: 1 addition & 1 deletion website/docs/releases/2022/v2022.12.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ slug: "/releases/2022.12"

- Bundled GeoIP City database

authentik now comes with a bundled MaxMind GeoLite2 City database. This allows everyone to take advantage of the extra data provided by GeoIP. The default docker-compose file removes the GeoIP update container as it is no longer needed. See more [here](../../install-config/geoip.mdx).
authentik now comes with a bundled MaxMind GeoLite2 City database. This allows everyone to take advantage of the extra data provided by GeoIP. The default docker-compose file removes the GeoIP update container as it is no longer needed. See more [here](../../sys-mgmt/ops/geoip.mdx).

- Improved UX for user & group management and stage/policy binding

Expand Down
2 changes: 1 addition & 1 deletion website/docs/releases/2024/v2024.2.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ slug: /releases/2024.2

- **S3 file storage**

Media files can now be stored on S3. Follow the [setup guide](../../install-config/storage-s3.md) to get started.
Media files can now be stored on S3. Follow the [setup guide](../../sys-mgmt/ops/storage-s3.md) to get started.

- **_Pretend user exists_ option for Identification stage**

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# GeoIP

authentik supports GeoIP to add additional information to login/authorization/enrollment requests. Additionally, a [GeoIP policy](../customize/policies/index.md#geoip-policy) can be used to make policy decisions based on the lookup result.
authentik supports GeoIP to add additional information to login/authorization/enrollment requests. Additionally, a [GeoIP policy](../../customize/policies/index.md#geoip-policy) can be used to make policy decisions based on the lookup result.

### Configuration

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ The `ENDPOINT` setting specifies how authentik talks to the S3 provider.

The `CUSTOM_DOMAIN` setting specifies how URLs are constructed to be shown on the web interface. For example, an object stored at `application-icons/application.png` with a `CUSTOM__DOMAIN` setting of `s3.provider/authentik-media` will result in a URL of `https://s3.provider/authentik-media/application-icons/application.png`. You can also use subdomains for your buckets depending on what your S3 provider offers: `authentik-media.s3.provider`. Whether HTTPS is used is controlled by `AUTHENTIK_STORAGE__MEDIA__S3__SECURE_URLS`, which defaults to true.

For more control over settings, refer to the [configuration reference](./configuration/configuration.mdx#media-storage-settings)
For more control over settings, refer to the [configuration reference](../../install-config/configuration/configuration.mdx#media-storage-settings)

### Migrating between storage backends

Expand Down
16 changes: 16 additions & 0 deletions website/netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1073,3 +1073,19 @@
to = "/docs/developer-docs/translation"
status = 302
force = true


# Moved GeoIP and S3 under System Management/user_basic_operations

[[redirects]]
from = "/docs/install-config/storage-s3"
to = "/docs/sys-mgmt/ops/storage-s3"
status = 302
force = true


[[redirects]]
from = "/docs/install-config/geoip"
to = "/docs/sys-mgmt/ops/geoip"
status = 302
force = true
8 changes: 5 additions & 3 deletions website/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,8 @@ export default {
"install-config/upgrade",
"install-config/beta",
"install-config/reverse-proxy",
"install-config/geoip",
"install-config/automated-install",
"install-config/air-gapped",
"install-config/storage-s3",
],
},
{
Expand Down Expand Up @@ -543,7 +541,11 @@ export default {
type: "category",
label: "Operations",
collapsed: true,
items: ["sys-mgmt/ops/monitoring"],
items: [
"sys-mgmt/ops/monitoring",
"sys-mgmt/ops/storage-s3",
"sys-mgmt/ops/geoip",
],
},
{
type: "category",
Expand Down