diff --git a/homer/configmaps.yaml b/homer/configmaps.yaml index 9131955..b4ff920 100644 --- a/homer/configmaps.yaml +++ b/homer/configmaps.yaml @@ -368,12 +368,12 @@ data: # tag: "kanban" # keywords: "kanban" # url: "https://kanban.apps.undercloud.dev" - - name: "Rallly" + - name: "Polly" logo: "assets/logos/doodle.png" subtitle: "find Appointments" - tag: "rallly" - keywords: "doodle rallly termine appointments" - url: "https://rallly.apps.undercloud.dev" + tag: "polly" + keywords: "doodle polly termine appointments" + url: "https://polly.apps.undercloud.dev" - name: "Communication" icon: "fas fa-cloud" items: diff --git a/polly/polly.yaml b/polly/polly.yaml index c730fc4..7fcf1ea 100644 --- a/polly/polly.yaml +++ b/polly/polly.yaml @@ -9,11 +9,12 @@ metadata: name: polly-secrets namespace: polly type: Opaque +data: + admin-password: NElzVGhlTWluZEtpbGxlcg== stringData: postgres-password: "change-this-db-password" database-url: "postgresql://polly:change-this-db-password@postgres:5432/polly" session-secret: "change-this-to-a-random-secret-with-at-least-32-characters" - admin-password: "change-this-admin-password" --- apiVersion: v1 kind: PersistentVolumeClaim @@ -141,15 +142,15 @@ spec: value: "https://polly.apps.undercloud.dev" - name: BASE_URL value: "https://polly.apps.undercloud.dev" - #- name: ADMIN_USERNAME - # value: "admin" - #- name: ADMIN_PASSWORD - # valueFrom: - # secretKeyRef: - # name: polly-secrets - # key: admin-password - #- name: ADMIN_EMAIL - # value: "admin@undercloud.dev" + - name: ADMIN_USERNAME + value: "admin" + - name: ADMIN_PASSWORD + valueFrom: + secretKeyRef: + name: polly-secrets + key: admin-password + - name: ADMIN_EMAIL + value: "admin@undercloud.dev" - name: SEED_DEMO_DATA value: "true" ports: diff --git a/sshwifty/sshwifty.yaml b/sshwifty/sshwifty.yaml index 2200a51..5ee6f36 100644 --- a/sshwifty/sshwifty.yaml +++ b/sshwifty/sshwifty.yaml @@ -60,14 +60,29 @@ data: "TabColor": "112233", "Meta": { "User": "core", - "Authentication": "Password", - "Password": "" + "Authentication": "Private Key", + "Private Key": "file:///config/id_ed25519" + } } ], "OnlyAllowPresetRemotes": false } - +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: ssh-key + namespace: sshwifty +data: + id_ed25519: | + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACD5sHjDsr8ZemeVMzCiySNb2vsPCJU5dLQBkJIxnm4h2wAAAKBLYJ18S2Cd + fAAAAAtzc2gtZWQyNTUxOQAAACD5sHjDsr8ZemeVMzCiySNb2vsPCJU5dLQBkJIxnm4h2w + AAAECKxXExaNu1eTO7kcxGJdl+CV50jnVAKCY4AySb1tYsGfmweMOyvxl6Z5UzMKLJI1va + +w8IlTl0tAGQkjGebiHbAAAAHHNlYmFzdGlhbkB1bmRlcmNsb3VkLWZsYXRjYXIB + -----END OPENSSH PRIVATE KEY----- --- apiVersion: apps/v1 @@ -103,10 +118,16 @@ spec: - name: sshwifty-config mountPath: "/config" readOnly: true + - name: ssh-key + mountPath: "/config" + readOnly: true volumes: - name: sshwifty-config configMap: name: sshwifty-config + - name: ssh-key + configMap: + name: ssh-key --- apiVersion: v1 kind: Service