fix
This commit is contained in:
@@ -1,4 +1,10 @@
|
||||
locals {
|
||||
script-wrap = <<-EOF
|
||||
#!/bin/bash
|
||||
cp /etc/local-ca/ca.crt /usr/local/share/ca-certificates/
|
||||
update-ca-certificate
|
||||
exec /entrypoint.sh "$@"
|
||||
EOF
|
||||
script-head = <<-EOF
|
||||
#!/bin/bash
|
||||
export user=www-data
|
||||
@@ -9,8 +15,6 @@ locals {
|
||||
sh -c "$*"
|
||||
fi
|
||||
}
|
||||
cp /etc/local-ca/ca.crt /usr/local/share/ca-certificates/
|
||||
update-ca-certificate
|
||||
run_as ./occ app:install user_oidc ||:
|
||||
run_as ./occ user_oidc:provider "$${OAUTH2_CONNECTOR_NAME}" --clientid="$${OAUTH2_CLIENT_ID}" \
|
||||
--clientsecret="$${OAUTH2_CLIENT_SECRET}" \
|
||||
@@ -24,6 +28,10 @@ locals {
|
||||
var.apps.notes?["run_as ./occ app:install notes ||:"]:[],
|
||||
var.apps.tasks?["run_as ./occ app:install tasks ||:"]:[],
|
||||
var.apps.spreed?["run_as ./occ app:install spreed ||:"]:[])
|
||||
data-config-init = {
|
||||
"autostart.sh" = join("\n", concat([local.script-head],local.script-apps))
|
||||
"wrapper" = local.script-wrap
|
||||
}
|
||||
}
|
||||
|
||||
resource "kubectl_manifest" "nextcloud-config" {
|
||||
@@ -34,6 +42,6 @@ resource "kubectl_manifest" "nextcloud-config" {
|
||||
name: "${var.component}-${var.instance}-init"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
data: ${jsonencode({ "autostart.sh" = join("\n", concat([local.script-head],local.script-apps))})}
|
||||
data: ${jsonencode(local.data-config-init)}
|
||||
EOF
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user