vynil/domain
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-01-25 18:35:22 +01:00
parent 0727fca591
commit 8c4348d215
97 changed files with 402 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/nextcloud/collabora.tf
View File

@@ -36,7 +36,7 @@ resource "kubectl_manifest" "collabora_deploy" {
imagePullPolicy: "${var.images.collabora.pullPolicy}"
env:
- name: aliasgroup1
value: "https://${local.dns-name}"
value: "https://${local.dns_name}"
- name: DONT_GEN_SSL_CERT
value: "true"
- name: extra_params

6
apps/nextcloud/configs.tf
View File

@@ -17,7 +17,7 @@ locals {
fi
}
run_as ./occ --no-warnings config:system:set trusted_domains 0 --value=nextcloud
run_as ./occ --no-warnings config:system:set trusted_domains 1 --value="${local.dns-name}"
run_as ./occ --no-warnings config:system:set trusted_domains 1 --value="${local.dns_name}"
run_as ./occ app:install user_oidc ||:
run_as ./occ user_oidc:provider "$${OAUTH2_CONNECTOR_NAME}" --clientid="$${OAUTH2_CLIENT_ID}" \
--clientsecret="$${OAUTH2_CLIENT_SECRET}" \
@@ -41,14 +41,14 @@ locals {
var.apps.collabora?[
"run_as ./occ app:install richdocuments ||:",
"run_as ./occ app:enable richdocuments ||:",
"run_as ./occ config:app:set richdocuments wopi_url --value=\"https://collabora.${local.dns-name}/\"",
"run_as ./occ config:app:set richdocuments wopi_url --value=\"https://collabora.${local.dns_name}/\"",
"run_as ./occ config:app:set richdocuments federation_use_trusted_domains --value=yes",
"run_as ./occ richdocuments:activate-config ||:",
]:["run_as ./occ app:disable richdocuments ||:"],
var.apps.onlyoffice?[
"run_as ./occ app:install onlyoffice ||:",
"run_as ./occ app:enable onlyoffice ||:",
"run_as ./occ --no-warnings config:app:set onlyoffice DocumentServerUrl --value=\"https://onlyoffice.${local.dns-name}/\"",
"run_as ./occ --no-warnings config:app:set onlyoffice DocumentServerUrl --value=\"https://onlyoffice.${local.dns_name}/\"",
"run_as ./occ --no-warnings config:app:set onlyoffice DocumentServerInternalUrl --value=\"http://${var.instance}-onlyoffice/\"",
"run_as ./occ --no-warnings config:app:set onlyoffice StorageUrl --value=\"http://nextcloud/\"",
"run_as ./occ --no-warnings config:app:set onlyoffice jwt_secret --value=\"$${ONLYOFFICE_JWT_SECRET}\"",

12
apps/nextcloud/datas.tf
View File

@@ -81,7 +81,7 @@ data "kustomization_overlay" "data" {
secretKeyRef:
name: "${var.instance}-${var.component}-pg-app"
- name: NEXTCLOUD_TRUSTED_DOMAINS
value: "${local.dns-name}"
value: "${local.dns_name}"
- name: REDIS_HOST
value: "${var.instance}-${var.component}-redis.${var.namespace}.svc"
- name: REDIS_HOST_PORT
@@ -134,12 +134,12 @@ data "kustomization_overlay" "data" {
httpGet:
httpHeaders:
- name: Host
value: "${local.dns-name}"
value: "${local.dns_name}"
livenessProbe:
httpGet:
httpHeaders:
- name: Host
value: "${local.dns-name}"
value: "${local.dns_name}"
EOF
}
patches {
@@ -163,7 +163,7 @@ data "kustomization_overlay" "data" {
imagePullPolicy: "${var.images.exporter.pullPolicy}"
env:
- name: NEXTCLOUD_SERVER
value: "https://${local.dns-name}"
value: "https://${local.dns_name}"
- name: NEXTCLOUD_TLS_SKIP_VERIFY
value: "${var.issuer=="letsencrypt-prod"?"false":"true"}"
EOF
@@ -182,10 +182,10 @@ data "kustomization_overlay" "data" {
k8up.io/backup: "true"
spec:
accessModes:
- "${var.storage.accessMode}"
- "${var.storage.volume.accessMode}"
resources:
requests:
storage: "${var.storage.size}"
storage: "${var.storage.volume.size}"
EOF
}
patches {

8
apps/nextcloud/index.yaml
View File

@@ -21,7 +21,7 @@ options:
examples:
- your-company
type: string
app-group:
app_group:
default: ''
examples:
- ''
@@ -36,12 +36,12 @@ options:
examples:
- letsencrypt-prod
type: string
domain-name:
domain_name:
default: your_company.com
examples:
- your_company.com
type: string
ingress-class:
ingress_class:
default: traefik
examples:
- traefik
@@ -497,7 +497,7 @@ options:
default: '14'
type: string
type: object
sub-domain:
sub_domain:
default: files
examples:
- files

28
apps/nextcloud/presentation.tf
View File

@@ -1,9 +1,9 @@
locals {
dns-name = "${var.sub-domain}.${var.domain-name}"
dns-collabora = "collabora.${local.dns-name}"
dns-onlyoffice = "onlyoffice.${local.dns-name}"
dns-names = [local.dns-name]
app-name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
dns_name = "${var.sub_domain}.${var.domain_name}"
dns-collabora = "collabora.${local.dns_name}"
dns-onlyoffice = "onlyoffice.${local.dns_name}"
dns_names = [local.dns_name]
app_name = var.component == var.instance ? var.instance : format("%s-%s", var.component, var.instance)
icon = "apps/theming/favicon"
service = {
"name" = "${var.component}"
@@ -31,9 +31,9 @@ module "ingress" {
instance = var.instance
namespace = var.namespace
issuer = var.issuer
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.common-labels
dns-names = local.dns-names
dns_names = local.dns_names
middlewares = ["${var.instance}-sslenforce", "${var.instance}-redirectdav", "${var.instance}-redirectindex"]
service = local.service
providers = {
@@ -45,8 +45,8 @@ module "application" {
source = "/dist/modules/application"
component = var.component
instance = var.instance
app-group = var.app-group
dns-name = local.dns-name
app_group = var.app_group
dns_name = local.dns_name
icon = local.icon
protocol_provider = module.oauth2.provider-id
providers = {
@@ -60,7 +60,7 @@ module "oauth2" {
instance = var.instance
namespace = var.namespace
labels = local.common-labels
dns-name = local.dns-name
dns_name = local.dns_name
redirect-path = "apps/user_oidc/code"
providers = {
kubernetes = kubernetes
@@ -90,9 +90,9 @@ module "collabora-ingress" {
instance = var.instance
namespace = var.namespace
issuer = var.issuer
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.collabora-labels
dns-names = [local.dns-collabora]
dns_names = [local.dns-collabora]
middlewares = []
service = local.collabora-service
providers = {
@@ -121,9 +121,9 @@ module "onlyoffice-ingress" {
instance = var.instance
namespace = var.namespace
issuer = var.issuer
ingress-class = var.ingress-class
ingress_class = var.ingress_class
labels = local.onlyoffice-labels
dns-names = [local.dns-onlyoffice]
dns_names = [local.dns-onlyoffice]
middlewares = []
service = local.onlyoffice-service
providers = {

6
apps/nextcloud/redis.tf
View File

@@ -13,7 +13,7 @@ resource "kubectl_manifest" "prj_redis" {
labels: ${jsonencode(local.redis-labels)}
spec:
kubernetesConfig:
image: "${var.redis.image}"
image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"
imagePullPolicy: "IfNotPresent"
storage:
volumeClaimTemplate:
@@ -21,10 +21,10 @@ resource "kubectl_manifest" "prj_redis" {
accessModes: ["ReadWriteOnce"]
resources:
requests:
storage: "${var.redis.storage}"
storage: "${var.storage.redis}"
redisExporter:
enabled: ${var.redis.exporter.enabled}
image: "${var.redis.exporter.image}"
image: "${var.images.redis_exporter.registry}/${var.images.redis_exporter.repository}:${var.images.redis_exporter.tag}"
securityContext:
runAsUser: 1000
fsGroup: 1000