diff --git a/.gitattributes b/.gitattributes index 41cb5bc..c2b8e77 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,2 @@ src/static/** filter=lfs diff=lfs merge=lfs -text src/static/**/* filter=lfs diff=lfs merge=lfs -text -src/assets/**/* filter=lfs diff=lfs merge=lfs -text -src/assets/** filter=lfs diff=lfs merge=lfs -text -src-bak/static/** filter=lfs diff=lfs merge=lfs -text -src-bak/static/**/* filter=lfs diff=lfs merge=lfs -text diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 7ee79a2..b249eeb 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: badhouseplants-net description: A Helm chart for Kubernetes type: application -version: 0.8.5 +version: 0.8.6 appVersion: "4.20.0" dependencies: - name: remark42 diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 1a0aacc..7b0ee77 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -41,7 +41,7 @@ spec: mountPath: "/tmp" readOnly: true - name: {{ .Values.volumes.rclone.name }} - mountPath: /assets + mountPath: /static readOnly: false resources: {{- toYaml .Values.rclone.container.resources | nindent 12 }} @@ -59,7 +59,7 @@ spec: {{- end }} volumeMounts: - name: {{ .Values.volumes.rclone.name }} - mountPath: /src/assets + mountPath: /src/static readOnly: false - name: {{ .Values.volumes.public.name }} mountPath: /src/public diff --git a/chart/values.yaml b/chart/values.yaml index 3671d73..ed5d115 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -10,7 +10,7 @@ nginx: tag: latest rclone: - command: "rclone copy -P badhouseplants-public:/badhouseplants-net-main /assets" + command: "rclone copy -P badhouseplants-public:/badhouseplants-net-main /static" container: name: rclone resources: {} diff --git a/kube/values-preview.yaml b/kube/values-preview.yaml index c4a721d..5789c75 100644 --- a/kube/values-preview.yaml +++ b/kube/values-preview.yaml @@ -26,4 +26,4 @@ values: | anonymous: true secretKey: $ARGO_REMARK_SECRET rclone: - command: 'rclone copy -P badhouseplants-public:/badhouseplants-net/$ARGO_APP_IMAGE_TAG /assets' + command: 'rclone copy -P badhouseplants-public:/badhouseplants-net/$ARGO_APP_IMAGE_TAG /static' diff --git a/scripts/upload-media.pl b/scripts/upload-media.pl index 71ae760..13eb20d 100755 --- a/scripts/upload-media.pl +++ b/scripts/upload-media.pl @@ -19,7 +19,7 @@ print `git -C /tmp/$git_commit_sha lfs pull` or die; print "Creating a new hashed dir in the common bucket\n"; -print `rclone copy /tmp/$git_commit_sha/src/assets "$common_bucket/$git_commit_sha"` or die; +print `rclone copy /tmp/$git_commit_sha/src/static "$common_bucket/$git_commit_sha"` or die; if ($git_branch eq $main_branch) { print "Syncing to the production bucket\n"; diff --git a/src/assets/avatar.png b/src/assets/avatar.png deleted file mode 100644 index 54ec2f3..0000000 --- a/src/assets/avatar.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:475223457ecd56a9b4450e39a1273727f98c4b0c78c6427992f4f77f6b90b957 -size 686006 diff --git a/src/assets/jsconfig.json b/src/assets/jsconfig.json deleted file mode 100644 index fc0f90a..0000000 --- a/src/assets/jsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e16de0174ab4983fd8a83f2174362003b1f65973247eea4ff4d67143b8d8639c -size 109 diff --git a/src/hugo.yaml b/src/hugo.yaml index 74a3a83..a049ac5 100644 --- a/src/hugo.yaml +++ b/src/hugo.yaml @@ -10,7 +10,7 @@ Params: sidebar: avatar: enable: true - local: true + local: false src: avatar.png subtitle: PunkOps by allanger comments: diff --git a/src/assets/icons/beats.svg b/src/static/icons/beats.svg similarity index 100% rename from src/assets/icons/beats.svg rename to src/static/icons/beats.svg diff --git a/src/assets/posts/argocd-dynamic-environment-per-branch-part-1/cover.png b/src/static/posts/argocd-dynamic-environment-per-branch-part-1/cover.png similarity index 100% rename from src/assets/posts/argocd-dynamic-environment-per-branch-part-1/cover.png rename to src/static/posts/argocd-dynamic-environment-per-branch-part-1/cover.png diff --git a/src/assets/posts/argocd-dynamic-environment-per-branch-part-1/drone-pipeline.png b/src/static/posts/argocd-dynamic-environment-per-branch-part-1/drone-pipeline.png similarity index 100% rename from src/assets/posts/argocd-dynamic-environment-per-branch-part-1/drone-pipeline.png rename to src/static/posts/argocd-dynamic-environment-per-branch-part-1/drone-pipeline.png diff --git a/src/assets/posts/argocd-vs-helmfile/app-of-apps-main.png b/src/static/posts/argocd-vs-helmfile/app-of-apps-main.png similarity index 100% rename from src/assets/posts/argocd-vs-helmfile/app-of-apps-main.png rename to src/static/posts/argocd-vs-helmfile/app-of-apps-main.png diff --git a/src/assets/posts/argocd-vs-helmfile/applicationset-test.png b/src/static/posts/argocd-vs-helmfile/applicationset-test.png similarity index 100% rename from src/assets/posts/argocd-vs-helmfile/applicationset-test.png rename to src/static/posts/argocd-vs-helmfile/applicationset-test.png diff --git a/src/assets/posts/argocd-vs-helmfile/cover-applications.png b/src/static/posts/argocd-vs-helmfile/cover-applications.png similarity index 100% rename from src/assets/posts/argocd-vs-helmfile/cover-applications.png rename to src/static/posts/argocd-vs-helmfile/cover-applications.png diff --git a/src/assets/posts/argocd-vs-helmfile/cover-applicationset.png b/src/static/posts/argocd-vs-helmfile/cover-applicationset.png similarity index 100% rename from src/assets/posts/argocd-vs-helmfile/cover-applicationset.png rename to src/static/posts/argocd-vs-helmfile/cover-applicationset.png diff --git a/src/assets/posts/argocd-vs-helmfile/diff-in-ui.png b/src/static/posts/argocd-vs-helmfile/diff-in-ui.png similarity index 100% rename from src/assets/posts/argocd-vs-helmfile/diff-in-ui.png rename to src/static/posts/argocd-vs-helmfile/diff-in-ui.png diff --git a/src/assets/posts/argocd-vs-helmfile/goldilocks-ui.png b/src/static/posts/argocd-vs-helmfile/goldilocks-ui.png similarity index 100% rename from src/assets/posts/argocd-vs-helmfile/goldilocks-ui.png rename to src/static/posts/argocd-vs-helmfile/goldilocks-ui.png diff --git a/src/assets/posts/argocd-vs-helmfile/update-in-ui.png b/src/static/posts/argocd-vs-helmfile/update-in-ui.png similarity index 100% rename from src/assets/posts/argocd-vs-helmfile/update-in-ui.png rename to src/static/posts/argocd-vs-helmfile/update-in-ui.png diff --git a/src/assets/posts/creating-a-sample-pack-kick/Kick_final_result.mp3 b/src/static/posts/creating-a-sample-pack-kick/Kick_final_result.mp3 similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/Kick_final_result.mp3 rename to src/static/posts/creating-a-sample-pack-kick/Kick_final_result.mp3 diff --git a/src/assets/posts/creating-a-sample-pack-kick/Kick_v1.mp3 b/src/static/posts/creating-a-sample-pack-kick/Kick_v1.mp3 similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/Kick_v1.mp3 rename to src/static/posts/creating-a-sample-pack-kick/Kick_v1.mp3 diff --git a/src/assets/posts/creating-a-sample-pack-kick/Kick_v2.mkv b/src/static/posts/creating-a-sample-pack-kick/Kick_v2.mkv similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/Kick_v2.mkv rename to src/static/posts/creating-a-sample-pack-kick/Kick_v2.mkv diff --git a/src/assets/posts/creating-a-sample-pack-kick/Kick_v2.mp4 b/src/static/posts/creating-a-sample-pack-kick/Kick_v2.mp4 similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/Kick_v2.mp4 rename to src/static/posts/creating-a-sample-pack-kick/Kick_v2.mp4 diff --git a/src/assets/posts/creating-a-sample-pack-kick/Kick_v3.mkv b/src/static/posts/creating-a-sample-pack-kick/Kick_v3.mkv similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/Kick_v3.mkv rename to src/static/posts/creating-a-sample-pack-kick/Kick_v3.mkv diff --git a/src/assets/posts/creating-a-sample-pack-kick/Kick_v3.mp4 b/src/static/posts/creating-a-sample-pack-kick/Kick_v3.mp4 similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/Kick_v3.mp4 rename to src/static/posts/creating-a-sample-pack-kick/Kick_v3.mp4 diff --git a/src/assets/posts/creating-a-sample-pack-kick/Kick_v4.mkv b/src/static/posts/creating-a-sample-pack-kick/Kick_v4.mkv similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/Kick_v4.mkv rename to src/static/posts/creating-a-sample-pack-kick/Kick_v4.mkv diff --git a/src/assets/posts/creating-a-sample-pack-kick/Kick_v4.mp4 b/src/static/posts/creating-a-sample-pack-kick/Kick_v4.mp4 similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/Kick_v4.mp4 rename to src/static/posts/creating-a-sample-pack-kick/Kick_v4.mp4 diff --git a/src/assets/posts/creating-a-sample-pack-kick/cover.png b/src/static/posts/creating-a-sample-pack-kick/cover.png similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/cover.png rename to src/static/posts/creating-a-sample-pack-kick/cover.png diff --git a/src/assets/posts/creating-a-sample-pack-kick/disable_note_track.png b/src/static/posts/creating-a-sample-pack-kick/disable_note_track.png similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/disable_note_track.png rename to src/static/posts/creating-a-sample-pack-kick/disable_note_track.png diff --git a/src/assets/posts/creating-a-sample-pack-kick/init_vital.png b/src/static/posts/creating-a-sample-pack-kick/init_vital.png similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/init_vital.png rename to src/static/posts/creating-a-sample-pack-kick/init_vital.png diff --git a/src/assets/posts/creating-a-sample-pack-kick/kick_basic_shape.png b/src/static/posts/creating-a-sample-pack-kick/kick_basic_shape.png similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/kick_basic_shape.png rename to src/static/posts/creating-a-sample-pack-kick/kick_basic_shape.png diff --git a/src/assets/posts/creating-a-sample-pack-kick/kick_lfo_1.png b/src/static/posts/creating-a-sample-pack-kick/kick_lfo_1.png similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/kick_lfo_1.png rename to src/static/posts/creating-a-sample-pack-kick/kick_lfo_1.png diff --git a/src/assets/posts/creating-a-sample-pack-kick/kick_lfo_2.png b/src/static/posts/creating-a-sample-pack-kick/kick_lfo_2.png similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/kick_lfo_2.png rename to src/static/posts/creating-a-sample-pack-kick/kick_lfo_2.png diff --git a/src/assets/posts/creating-a-sample-pack-kick/unison_phase.png b/src/static/posts/creating-a-sample-pack-kick/unison_phase.png similarity index 100% rename from src/assets/posts/creating-a-sample-pack-kick/unison_phase.png rename to src/static/posts/creating-a-sample-pack-kick/unison_phase.png diff --git a/src/assets/posts/dont-use-argocd-for-infrastructure/3-clusters-and-gitea.png b/src/static/posts/dont-use-argocd-for-infrastructure/3-clusters-and-gitea.png similarity index 100% rename from src/assets/posts/dont-use-argocd-for-infrastructure/3-clusters-and-gitea.png rename to src/static/posts/dont-use-argocd-for-infrastructure/3-clusters-and-gitea.png diff --git a/src/assets/posts/dont-use-argocd-for-infrastructure/3-clusters.png b/src/static/posts/dont-use-argocd-for-infrastructure/3-clusters.png similarity index 100% rename from src/assets/posts/dont-use-argocd-for-infrastructure/3-clusters.png rename to src/static/posts/dont-use-argocd-for-infrastructure/3-clusters.png diff --git a/src/assets/posts/dont-use-argocd-for-infrastructure/cover.png b/src/static/posts/dont-use-argocd-for-infrastructure/cover.png similarity index 100% rename from src/assets/posts/dont-use-argocd-for-infrastructure/cover.png rename to src/static/posts/dont-use-argocd-for-infrastructure/cover.png