From 48d9b3f7bd7487de7fa4fe12c663315d9879efab Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Wed, 20 Jul 2022 21:05:43 +0100 Subject: [PATCH] bin/stack: update template, occ, add kube logs --- .config/shell/server | 3 ++- .local/bin/server/stack-template | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.config/shell/server b/.config/shell/server index 3c80513..c5ae2ec 100644 --- a/.config/shell/server +++ b/.config/shell/server @@ -55,8 +55,9 @@ stack() { else "$0" sso cli "$command" "$@" fi;; # app clis via kubectl - (occ) "$0" exec nc-nextcloud -it -- su www-data -s /bin/bash -c "php $command $*";; + (occ) "$0" exec nc-nextcloud -c nextcloud -it -- su www-data -s /bin/bash -c "php $command $*";; (exec) "$0" kube exec "$@";; + (logs) "$0" kube logs "$@";; (kube) if ! pod=$("$0" pod "$2-\(0\|[0-f]\+\)") then echo "No pod found for $2" >&2 diff --git a/.local/bin/server/stack-template b/.local/bin/server/stack-template index 5362b4a..15a3e23 100755 --- a/.local/bin/server/stack-template +++ b/.local/bin/server/stack-template @@ -71,12 +71,7 @@ data: # TODO verify structure matches chart ingress: enabled: true - # Bitnami style - hostname: "$subdomain.\${domain}" - tls: true - certManager: true - # Gitea style - enabled: true + # Elaborate style annotations: kubernetes.io/tls-acme: "true" hosts: @@ -88,7 +83,19 @@ data: - secretName: $app-tls hosts: - "$subdomain.\${domain}" - # TODO Adjust OIDC SSO to service + # Bitnami style + hostname: "$subdomain.\${domain}" + tls: true + certManager: true + # TODO Adjust Mailer config + # mailer: + # enabled: "\${outgoing_mail_enabled}" + # host: "\${outgoing_mail_smtp_host}" + # port: "\${outgoing_mail_smtp_port}" + # username: "\${outgoing_mail_smtp_user}" + # password: "\${outgoing_mail_smtp_password}" + # fromemail: "\${outgoing_mail_from_address}" + # TODO Adjust OpenID Connect Single Sign-On Configuration # - name: Stackspin # key: "\${client_id}" # secret: "\${client_secret}"