Fixes to things

workloads/nextcloud/ncbackup-secret.yml

@@ -6,11 +6,13 @@ metadata:
   namespace: nextcloud
 spec:
   encryptedData:
-    sshkey: AgAHwqLiQkDbYf6Y3Y2gscpAVtFc7wba+K1gcpPtCtxHJkeIwKgv7tICZWPafu7ECLkwovhMWUsWNWGZ5bZt/gSQmDbS0gb8jujfTZG7kBU27bspZR7wQasj/eJDwuOT5nuVSEl5jnPRaVVzd7KP0sSw28dW6SZnqBm4VH2ED37p6ZfXXx6IP2UOLCPzHt6k2pSRfyJz6OJ6AEyy77lND/HYFps+XjVOdLpv1dHdqzT+xFikIdvZ48J90ZVWEllaLraZzyY9McyeqKvHBnFy8qsZzzuMMBEzDrNy8Ol2XHsYnSVLhFFzO5ynY8nXYejndOUMVfzPvhud2X8/l54EKWlrSOLYanskO6xWF0iIPn9Nh+xRpU73KaAMtO1zlYJgbYw901MJ3vwLWfsQxRnyUmpZb0fXmp30JXRN5sq1k7W7PIiHm2TKsswcWGf9Bjf0DsDo/Km43OonVPuraN6cRKNduQjmCpAwMsyq2Ril0E8Z02ExGMR2U5fc9gD+pnNocK6beq0HKhN7+oo0/xIOpN1iwbI41Id+iKZt3gIMd6XEWchAP33ArYa2mckYhdFG/2gJNz4qDGxyJvFIfkw/pec7ogREtfrFVZkwER4AoAjR1bVZKJy6tI1hCu7JTa2xEOwvwoObYJmnrgehE1IwYCbntBQFArYbLuysRzBW1fGAA5gYDwdA+axkjTOnjg88MQbJCGwSZe4wevI2LZK1+04g/+Fe4uCQx3Lm2WrNq2GnpxTikh27sO/bg4//tfHhsJ0DQRCJhClAsS8xkdTaceLtOHBe0lxmmSZhki/88iEf2wvVLjR73NxFCuDmsTHwmtRZ8z+Dc4sYiLhiY0e0wts92OOOcmxB/OvPY9Jcbv+PE+ZKSb8lnPWoK+mupSwUmYVLV/+DIFj0ksiVmQTyQqRs+yY9IRNrk+AqEn7vWd/6xGUZ18YD90teeELsEvSZGxhpVVDoo+2PBhUfZpofBNWp399JbEXk3orwnp5oCGeDOMTin88fBpyqQpvrR4ldgS5PBy4qog21MGbcEEO4qqB+misBGW4Q3lf4XNi1irs35uFSkDntZjztcLFXtrb+vLK69N+vgV8L8IR5oNA5Bd69svikkDKcXzmhSHCadbFff5cUYfTI2FWzS7ExqWocKZkEJiyw567n1NOZicRYHTfBkxDtsa3DLmgQIPu7+tpt6HIqVsad33n+TyD/N6XwB3fiKVTVsIbhdc1Zqy060B7T7wRXCHmLX3n+//Q=
+    host: AgAX+qFQTYLfNw3IBT0yq20+LrW6hcESwQOLy8zLVpEsDNPo6fe/VpWleqi2k0NEAp0cDACcIEAt4zexLlurbHQElWpbzsjA6NP0FAgaa+Luby1XFyX6OhjgItFPAzxZMDEkLXh10bdumX25IKVMe2avHxNwpqBbNoCAMOT8D2ynWeFr3ckguzqjjAJyl1KFNI3MRqa7XzhZITdufRkAyun/3Wvv/s7m2IQeh1p3ryJnR3V/VYkeisTq47sC2TNlB60Ja3dWWKyZjMTFCEgxo0DIaySC4ma/+R2WyTODncq3b0IzNfG2QHl2tSKpNCH8ROejEyVD8L2YI+g1wY3RM6+2slntUy1/if+/gdcuVyVLOl/ncHEAEkh/b2WEeeccHg7MX2aRLaGJiyNXRNQkoORSXIVWmFHezlpmmqutwktJIX+j2i8Q2l/yOgwMe+tSDjF8aWXyTP3nbRa22ZPywn9L23Ioj1O6kATDcYJRjtfMidevtDrOeCskYOj8x2vxg9ftHG8Wyg9uX29EFSN3JFlL11/iPrhBSrqjYEUp3BGbQRmpDyqw6emKS2rgB6OQDQ1Tv9NyhyE1PwdEnwcZ4UgxVh9wlc4hOUsxZxaQ3p+XQQHwIj3LwqGs0yLpTMgWtuQ5Ub8znT4v9CFELKMBMaJip/DiqGsv0U0Jte4up5bc/zV0DszWLSgD4DZoNxsqQ30NcXVG6DIldJ/vExCwQZlJJC0=
-    user: AgAm6sUGdIvvLyDFYtch+4judEnqn8HLrATzuABMdC4iBjE+tRymeemdxcdFdMvetvHq/m3TPEPwWHEQ+FhWa0N6sTS68PLLmGVZZC2RltmtEmIwS/fHh5yYlsqu5Rjq4H0B3h8YG7azjV/2a/RES8epi5qPD3kc+kWoJYuh/lvL7whEqfQ+ClTlef3pvazLtX7O+VGBp2/RoXN4xM/aGzo92rjBx0Y0LVpyjviFjdkaK9Q4mSRWZZT40SKAtwyYwkixM2L0aCPKW482684foaoPifT24VX6gVxyOr8tktAKITY4gX184P+FhDoF1R7SXTegUe8eN3se0P8KhRNTWEJgkRrdJgR+hBl9opuM3lBVAOnotQokK3i+Qcxi4/vYLawF+AteT1WQneAqIEgqWb/GX4xpgpzagaqMCUPfazX6JRZCEZuMQaOk5FSyPYEyIgLdMXkE6iCf/C67aeKrO8sxK7wVTMfkMLdk70TshR6IVnUsw4xZNG0iBz9cXELlW/UB7EaFBk2vEMt6MRYDke0dth2nl30YNmjfmpjzWI6lp/y0Scc2Mat54O/tfDkk1nxswGLau6vgY5AWtntVgz0GGfcc9cdF82wGCHzqU1L82Npu/q18MKbw1YT+TosU23FHoy3+/mqo8FHbmriGk3M/n7UO7H3zCVu4Yj7vg7/qCS4z2TKkGxxhuTVpIoutTyUaaWrZ
+    sshkey: AgBjW5j6BUAWX+zaQWnaXnXKNB70stbV7iHDX60+22m3GLTKR2z2Me5qDsnNzF/QTTKtb7M3Yoed8NA2Oo4j/GAGkIA15+w4hJeyOfMDCrgcLP2/j6E2aweGQHfoOR3SztoAEF0NCB4QO3bozBuUu9/LwXN8ug/vsV4HAmlxG1crPpWNDdy9z34tNwnrumkGvuhqxInQt1WxNgsrpLoda76p37ds0hWWb+jIEaQET3bXLckjeRo630CJaRiawbibVZYGyMOZa18sFSYEAKweOvDhzTdjuXHQ73+/joBthF3oPh9rVQ3Exu96BmP8kKa15jQs5WWCHlQXhN5MabSs5feJIj19QiUTna7/cQYPU3Moxze0lhdIFZ+gMchrvmMMi5SBEdHNa2z1h6TQb0DXwpCwbJ6puceWXGMwRMH94LYAHzoQFwh3V0M3rslXWy7RAz7J1iwzVTVytOaGvGgZd1uRk0kyaz5fdlJNm4BpChlUGnpttaFfF7X8+ISrZf3iNRWcKhkEJR3mB/jCdC4PRikz2B8zahMtEiHNeltymEWXMyriByoksI+vkTx1Kbbj72vmJnj5suoSdvD5of1xr7hi/uY8UJSxd8yhdpldFE6BxYSrvUzenmr5wa4XvkGDPXblfh7TwqlTOhbFeWGMz2nxLH7YVzGkEzlPQmtyC3hvh2D+G7h5s2YeoCUzmHI6Q5POdLdBY2zrbinr8mkS7T4/rqtH1YSF0sA8pC3q+8QQBseo1yvDd8rIHwMT3VyGBv04aE+6YGZJ4i/Ws5shIPhiMrDC5q+JFJEHpoy6syqrtBV41hBgdPDvIDBMMc2wOncIuG0Bl68ztCMIAP5zbmeHtjJ7zqyI7BuMr4sCS6I5vpB9QWiyGubuGtVWegy/bTjCiuKRJMHEE/tQ6u1KOTMEW3D76HAQ1vXvGIKKFKscbEwubwFIBET6r8T6vipeWtgRXEsMXgSOJE1Vy/VLxZcvROoVznYcmxhOKF8oH9wa3SIYbvGWKSieU7TX/upgAwnoX8mlwIc/d4YRIkA+c8psdmVbep3YvSFJnVoJHMs0WCQb1zY3Csp3daXnwxJv839JWT7vOkOpY4MgZjZ9RnzaSdjhQeKAd9zfdb2EiMZS/85VFAdRUaMpS+telsUtl0UNXdVNH3IzIHauXc5FB+hMwcTwuA8oUjlqf5nCv+iV3OMwurxpy3wD0C6DiGsY+BJheLwmC1E+Shg86xiL6Bk1SlGlRxWTLR1eO2M=
+    user: AgBdWvLQQepIp2PQcV86EVsWBQ8ZtHgChgH7fotr2LbMHfaVbJv2W+qKtjpBmj8Nza8nw1albaKlikdt6e5fiO7qhg4TW+fddVRXX1vUNeELBw/pElEeDCpT2mpaZG4yD080i+MtMiJOFI3M13S0s5pUxcca06qDH2XUGP2yRzsPs3IP2tWnozyxQ+L6h184wlbQN9G3CWSyct6ExkDNvUT4lOWqhvt+8MMP6R6QbnxHOHDrTZHq+BZs+Kcl+ehnyNrGqF8hOesPfqPhkaRqrmaUHR0ZPnxBLvNvnlUjju/D5Ceb5XSp7PMOZUOmzdwGVrEAUUjAOPOq20VGh80QXNhS3WU/5LPE0yj+RbxknBvF0zu5dw+eLnrEBBu++lonFaYJc2R6rlyvLDmQv+BEKh8QzK9X3emwF9M9bQIh2t6g+UKi3FZrgVndSwAolXpMykD6XWvNE3x6gx1LPRUjZkTEKgPieOzaXEFtW0sUAhW9i5MPImDIXX5M18VcQv9fOHUfSC9XIC2KEYKCRA95JZX9vdnh9AbKMF0ial0YpAyTyyLEyro8CdACBSIrVzSEOqlxmcS9L7WV0VmegJir3CgnhjHZX9f+dddsiCgy6BMYxmzvs/hLnKHcghv560lYJAaFt5LxMIOXHaCU+I06KvPapn+BYuYZs5SAkkvwZUHWa9KrEDMhP5l8h0uMDnZvRVcHxlzp
   template:
     metadata:
       creationTimestamp: null
       name: ncbackup
       namespace: nextcloud
     type: Opaque
+

workloads/nextcloud/nextcloud-cron.yml

@@ -81,15 +81,13 @@ spec:
           - name: gitlab-regcred
           containers:
           - name: ncbackup
-            image: registry.gitlab.com/shouptech/ncbackup:628132427
+            image: registry.gitlab.com/shouptech/ncbackup:628141981
             imagePullPolicy: IfNotPresent
             env:
             - name: NC_CONFIG_FILE
               value: /var/www/html/config/config.php
             - name: NC_DATA_PATH
               value: /var/www/html/
-            - name: NC_DATA_DEST
-              value: /bkup/data/
             - name: POSTGRES_USER
               valueFrom:
                 secretKeyRef:
@@ -100,19 +98,22 @@ spec:
                 secretKeyRef:
                   name: postgres
                   key: POSTGRES_PASSWORD
+            - name: POSTGRES_HOST
+              value: postgres
+            - name: POSTGRES_PORT
+              value: "5432"
+            - name: POSTGRES_DEST
+              value: /bkup/db/
             - name: SSH_USER
               valueFrom:
                 secretKeyRef:
                   name: ncbackup
                   key: user
-            - name: POSTGRES_HOST
+            - name: SSH_HOST
-              value: postgres
+              valueFrom:
-            - name: POSTGRES_PORT
+                secretKeyRef:
-              value: "5432"
+                  name: ncbackup
-            - name: POSTGRES_DB
+                  key: host
-              value: nextcloud
-            - name: POSTGRES_DEST
-              value: /bkup/db/
             volumeMounts:
             - name: nextcloud-data
               mountPath: /var/www/html