Compare commits
9 commits
062fe473bb
...
6672a721d1
| Author | SHA1 | Date | |
|---|---|---|---|
| 6672a721d1 | |||
|
1d4288caf5 |
|||
|
343b1d27af |
|||
|
a635c718cd |
|||
|
2f5561f4cb |
|||
| 63dcbff693 | |||
| 2deb70474e | |||
| 53fc602e13 | |||
| 73b05c330a |
11 changed files with 43 additions and 38 deletions
|
|
@ -20,5 +20,5 @@ jobs:
|
||||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
cache: true
|
cache: true
|
||||||
registry: git.roboces.dev
|
registry: git.roboces.dev
|
||||||
tag: nextcloud-30.0.1
|
tag: nextcloud-30.0.2
|
||||||
path: docker/nextcloud
|
path: docker/nextcloud
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ services:
|
||||||
max-size: "500m"
|
max-size: "500m"
|
||||||
max-file: "2"
|
max-file: "2"
|
||||||
signal:
|
signal:
|
||||||
image: netbirdio/signal:0.31.0
|
image: netbirdio/signal:0.31.1
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- netbird-signal:/var/lib/netbird
|
- netbird-signal:/var/lib/netbird
|
||||||
|
|
@ -35,7 +35,7 @@ services:
|
||||||
max-size: "500m"
|
max-size: "500m"
|
||||||
max-file: "2"
|
max-file: "2"
|
||||||
relay:
|
relay:
|
||||||
image: netbirdio/relay:0.31.0
|
image: netbirdio/relay:0.31.1
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
NB_LOG_LEVEL: ${NB_LOG_LEVEL:-info}
|
NB_LOG_LEVEL: ${NB_LOG_LEVEL:-info}
|
||||||
|
|
@ -50,7 +50,7 @@ services:
|
||||||
max-size: "500m"
|
max-size: "500m"
|
||||||
max-file: "2"
|
max-file: "2"
|
||||||
management:
|
management:
|
||||||
image: netbirdio/management:0.31.0
|
image: netbirdio/management:0.31.1
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
- dashboard
|
- dashboard
|
||||||
|
|
@ -91,7 +91,7 @@ services:
|
||||||
max-file: "2"
|
max-file: "2"
|
||||||
|
|
||||||
peer-1:
|
peer-1:
|
||||||
image: netbirdio/netbird:0.30.3
|
image: netbirdio/netbird:0.31.1
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ${NETBIRD_PEER_VOLUME:-/mnt/nas1/shared/netbird/peer-1}/data:/etc/netbird
|
- ${NETBIRD_PEER_VOLUME:-/mnt/nas1/shared/netbird/peer-1}/data:/etc/netbird
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ services:
|
||||||
- nextcloud
|
- nextcloud
|
||||||
|
|
||||||
nextcloud:
|
nextcloud:
|
||||||
image: git.roboces.dev/catalin/fukuops:nextcloud-30.0.1
|
image: git.roboces.dev/catalin/fukuops:nextcloud-30.0.2
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/nas1/legacy-storage/cloud/cloud/data:/var/www/html/data
|
- /mnt/nas1/legacy-storage/cloud/cloud/data:/var/www/html/data
|
||||||
- /mnt/nas1/legacy-storage/cloud/cloud/config:/var/www/html/config
|
- /mnt/nas1/legacy-storage/cloud/cloud/config:/var/www/html/config
|
||||||
|
|
@ -22,6 +22,8 @@ services:
|
||||||
- /mnt/nas1/legacy-storage/cloud/cloud/apps:/var/www/html/apps
|
- /mnt/nas1/legacy-storage/cloud/cloud/apps:/var/www/html/apps
|
||||||
- type: tmpfs
|
- type: tmpfs
|
||||||
target: /tmp:exec
|
target: /tmp:exec
|
||||||
|
- supervisorlog:/var/log/supervisor:z
|
||||||
|
- supervisorpid:/var/run/supervisord/:z
|
||||||
environment:
|
environment:
|
||||||
PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-2048M}
|
PHP_MEMORY_LIMIT: ${PHP_MEMORY_LIMIT:-2048M}
|
||||||
NEXTCLOUD_INIT_HTACCESS: ${NEXTCLOUD_INIT_HTACCESS:-1}
|
NEXTCLOUD_INIT_HTACCESS: ${NEXTCLOUD_INIT_HTACCESS:-1}
|
||||||
|
|
@ -33,3 +35,6 @@ services:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
nextcloud: {}
|
nextcloud: {}
|
||||||
|
volumes:
|
||||||
|
supervisorlog: {}
|
||||||
|
supervisorpid: {}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ services:
|
||||||
|
|
||||||
webserver:
|
webserver:
|
||||||
|
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:2.13.4
|
image: ghcr.io/paperless-ngx/paperless-ngx:2.13.5
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- 8002:8000
|
- 8002:8000
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ spec:
|
||||||
sources:
|
sources:
|
||||||
- chart: forgejo
|
- chart: forgejo
|
||||||
repoURL: code.forgejo.org/forgejo-helm
|
repoURL: code.forgejo.org/forgejo-helm
|
||||||
targetRevision: 10.0.2
|
targetRevision: 10.1.0
|
||||||
helm:
|
helm:
|
||||||
valuesObject:
|
valuesObject:
|
||||||
replicaCount: 2
|
replicaCount: 2
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ spec:
|
||||||
sources:
|
sources:
|
||||||
- chart: renovate
|
- chart: renovate
|
||||||
repoURL: https://docs.renovatebot.com/helm-charts
|
repoURL: https://docs.renovatebot.com/helm-charts
|
||||||
targetRevision: 39.8.*
|
targetRevision: 39.10.*
|
||||||
helm:
|
helm:
|
||||||
valuesObject:
|
valuesObject:
|
||||||
renovate:
|
renovate:
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: miniflux
|
- name: miniflux
|
||||||
image: miniflux/miniflux:2.2.2
|
image: miniflux/miniflux:2.2.3
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
securityContext:
|
securityContext:
|
||||||
allowPrivilegeEscalation: false
|
allowPrivilegeEscalation: false
|
||||||
|
|
|
||||||
|
|
@ -33,21 +33,6 @@ resource "authentik_group" "vpn" {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
module "firezone" {
|
|
||||||
source = "../modules/authentik-oidc"
|
|
||||||
app_name = "Firezone"
|
|
||||||
app_slug = "firezone"
|
|
||||||
client_id = var.firezone_client_id
|
|
||||||
client_secret = var.firezone_client_secret
|
|
||||||
app_access_group_id = authentik_group.admins.id
|
|
||||||
redirect_uris = ["https://fz.fukurokuju.dev/auth/oidc/authentik/callback/"]
|
|
||||||
app_icon = "https://www.firezone.dev/icon.svg"
|
|
||||||
app_description = "VPN"
|
|
||||||
app_publisher = "Firezone"
|
|
||||||
app_url = "https://fz.fukurokuju.dev"
|
|
||||||
sub_mode = "hashed_user_id"
|
|
||||||
}
|
|
||||||
|
|
||||||
module "gitea" {
|
module "gitea" {
|
||||||
source = "../modules/authentik-oidc"
|
source = "../modules/authentik-oidc"
|
||||||
app_name = "Gitea"
|
app_name = "Gitea"
|
||||||
|
|
@ -160,4 +145,5 @@ module "netbird" {
|
||||||
"goauthentik.io/providers/oauth2/scope-authentik_api"
|
"goauthentik.io/providers/oauth2/scope-authentik_api"
|
||||||
]
|
]
|
||||||
app_icon = "https://vpn.fukurokuju.dev/apple-icon.png"
|
app_icon = "https://vpn.fukurokuju.dev/apple-icon.png"
|
||||||
|
access_token_validity = "days=10"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,9 @@ data "authentik_property_mapping_provider_scope" "default-scopes" {
|
||||||
], var.extra_property_mappings)
|
], var.extra_property_mappings)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data "authentik_flow" "default-provider-invalidation-flow" {
|
||||||
|
slug = "default-provider-invalidation-flow "
|
||||||
|
}
|
||||||
|
|
||||||
resource "authentik_provider_oauth2" "provider_oidc" {
|
resource "authentik_provider_oauth2" "provider_oidc" {
|
||||||
name = var.app_name
|
name = var.app_name
|
||||||
|
|
@ -40,6 +43,8 @@ resource "authentik_provider_oauth2" "provider_oidc" {
|
||||||
signing_key = var.oidc_signing_key
|
signing_key = var.oidc_signing_key
|
||||||
access_code_validity = var.access_code_validity
|
access_code_validity = var.access_code_validity
|
||||||
access_token_validity = var.access_token_validity
|
access_token_validity = var.access_token_validity
|
||||||
|
refresh_token_validity = var.refresh_token_validity
|
||||||
|
invalidation_flow = data.authentik_flow.default-provider-invalidation-flow.id
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,6 +90,11 @@ variable "access_token_validity" {
|
||||||
default = "minutes=10"
|
default = "minutes=10"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "refresh_token_validity" {
|
||||||
|
type = string
|
||||||
|
default = "days=30"
|
||||||
|
}
|
||||||
|
|
||||||
variable "extra_property_mappings" {
|
variable "extra_property_mappings" {
|
||||||
type = list(string)
|
type = list(string)
|
||||||
default = []
|
default = []
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,9 @@ data "authentik_flow" "default-authentication-flow" {
|
||||||
slug = "default-authentication-flow"
|
slug = "default-authentication-flow"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data "authentik_flow" "default-provider-invalidation-flow" {
|
||||||
|
slug = "default-provider-invalidation-flow "
|
||||||
|
}
|
||||||
|
|
||||||
resource "authentik_provider_proxy" "provider_proxy" {
|
resource "authentik_provider_proxy" "provider_proxy" {
|
||||||
authorization_flow = data.authentik_flow.default-authorization-flow.id
|
authorization_flow = data.authentik_flow.default-authorization-flow.id
|
||||||
|
|
@ -24,6 +27,7 @@ resource "authentik_provider_proxy" "provider_proxy" {
|
||||||
internal_host = var.internal_host
|
internal_host = var.internal_host
|
||||||
name = var.app_name
|
name = var.app_name
|
||||||
internal_host_ssl_validation = var.internal_host_ssl_validation
|
internal_host_ssl_validation = var.internal_host_ssl_validation
|
||||||
|
invalidation_flow = data.authentik_flow.default-provider-invalidation-flow.id
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue