diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 6a5bbf3..0ad3bde 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,4 +1,4 @@ -{{ define "main" }} +{{- define "main" -}}

{{ .Title | markdownify }}

@@ -6,20 +6,20 @@ {{ .Content }} -{{ end }} +{{- end -}} -{{ define "aside" }} - {{ if .Params.description }}

{{ .Params.description }}

{{ end }} - {{ if or (.Params.author) (.Params.date) }} +{{- define "aside" -}} + {{- if .Params.description -}}

{{ .Params.description }}

{{- end -}} + {{- if or (.Params.author) (.Params.date) -}}

- {{ if .Params.author }}By {{ .Params.author }}{{ if .Date }}, {{ end }}{{ end }} + {{- if .Params.author -}}By {{ .Params.author }}{{ if .Date }}, {{ end }}{{- end -}} {{ if .Date }}{{ .Date.Format "2006-01-02" }}{{ end }}

- {{ end }} + {{- end -}} - {{ if and (.Params.toc) (.TableOfContents) }} + {{- if and (.Params.toc) (.TableOfContents) -}}
{{ .Title }}: {{ .TableOfContents }} - {{ end }} -{{ end }} + {{- end -}} +{{- end -}} diff --git a/layouts/index.html b/layouts/index.html index a4fd682..1d4259a 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,17 +1,16 @@ {{ define "main" }}
- - {{ .Content }} + {{ .Content }}

Recently

diff --git a/layouts/partials/about.html b/layouts/partials/about.html index c95d585..2ff04a9 100644 --- a/layouts/partials/about.html +++ b/layouts/partials/about.html @@ -1,7 +1,7 @@ {{ with .Site.Params.about }}
- {{ with .logo }} {{ end }} - {{ with .logo_image }}{{ end }} + {{- with .logo -}} {{- end -}} + {{- with .logo_image -}}{{- end -}}

{{ .title }}

{{ with .description }}

{{ . | markdownify }}

{{ end }}
@@ -15,7 +15,7 @@ chaosfem.tw/@t4tamsin
  • - code + code
  • work code diff --git a/layouts/shortcodes/code-details.html b/layouts/shortcodes/code-details.html index 3d3fe1a..a21fef9 100644 --- a/layouts/shortcodes/code-details.html +++ b/layouts/shortcodes/code-details.html @@ -1,6 +1,6 @@

    {{ .Get "summary" | markdownify }} -{{ printf "```%s%s```" (.Get "lang") (.Get "details") | markdownify}} +{{- printf "```%s%s```" (.Get "lang") (.Get "details") | markdownify -}}

    diff --git a/public/categories/index.html b/public/categories/index.html index 0b4f56c..205e3ba 100644 --- a/public/categories/index.html +++ b/public/categories/index.html @@ -39,37 +39,17 @@ -
    -

    Categories

    - - - - - - +

    Categories

  • - code + code
  • work code @@ -99,8 +79,6 @@
    - -
    diff --git a/public/categories/tutorial/index.html b/public/categories/tutorial/index.html index 6eb1244..e1e1847 100644 --- a/public/categories/tutorial/index.html +++ b/public/categories/tutorial/index.html @@ -39,40 +39,18 @@ -
    -

    Tutorial

    - - - - - - +

    Tutorial

  • - code + code
  • work code @@ -102,8 +80,6 @@
    - -
    diff --git a/public/index.html b/public/index.html index 6614e5b..fb23abe 100644 --- a/public/index.html +++ b/public/index.html @@ -40,36 +40,23 @@
    - it's a website!

    Recently

    -
    @@ -77,10 +64,7 @@
  • - code + code
  • work code diff --git a/public/posts/hugo-on-k8s-nginx/index.html b/public/posts/hugo-on-k8s-nginx/index.html index 9988aa4..fc8d6e4 100644 --- a/public/posts/hugo-on-k8s-nginx/index.html +++ b/public/posts/hugo-on-k8s-nginx/index.html @@ -39,18 +39,11 @@ -
    -
    +

    Hugo on Kubernetes & NGINX

    @@ -164,8 +157,7 @@ out:

    the rest of this is pretty much boilerplate:

    -kubectl apply -f https://estradiol.cloud/posts/hugo-on-k8s/site.yaml -
    # estradiol-cloud.yaml
    +kubectl apply -f https://estradiol.cloud/posts/hugo-on-k8s/site.yaml
    # estradiol-cloud.yaml
     apiVersion: v1
     kind: ConfigMap
     metadata:
    @@ -237,8 +229,7 @@ out:

    - name: nginx-server-block configMap: name: nginx-server-block -
    -
    +


    @@ -258,8 +249,7 @@ right? yes. networking is always the easy part.

    replicas7 and in-cluster service discovery.

    -kubectl apply -f https://estradiol.cloud/posts/hugo-on-k8s-nginx/service.yaml -
    # service.yaml
    +kubectl apply -f https://estradiol.cloud/posts/hugo-on-k8s-nginx/service.yaml
    # service.yaml
     apiVersion: v1
     kind: Service
     metadata:
    @@ -277,16 +267,14 @@ replicas    port: 80
         protocol: TCP
         targetPort: http
    -
    -
    +

    next, i need an Ingress to handle traffic inbound to the cluster and direct it to the Service:

    -kubectl apply -f https://estradiol.cloud/posts/hugo-on-k8s-nginx/ingress.yaml -
    # ingress.yaml
    +kubectl apply -f https://estradiol.cloud/posts/hugo-on-k8s-nginx/ingress.yaml
    # ingress.yaml
     apiVersion: networking.k8s.io/v1
     kind: Ingress
     metadata:
    @@ -306,8 +294,7 @@ and direct it to the Service:

    name: http path: / pathType: Prefix -
    -
    +

    this part expresses a routing rule: traffic reaching the cluster via @@ -333,8 +320,7 @@ replace all my YAML with a call out to this chart and a few lines of configuration, assuming i have helm client installed:

    -helm upgrade --install --create-namespace --namespace estradiol-cloud -f https://estradiol.cloud/posts/hugo-on-k8s-nginx/values.yaml oci://registry-1.docker.io/bitnamicharts/nginx -
    # values.yaml
    +helm upgrade --install --create-namespace --namespace estradiol-cloud -f https://estradiol.cloud/posts/hugo-on-k8s-nginx/values.yaml oci://registry-1.docker.io/bitnamicharts/nginx
    # values.yaml
     cloneStaticSiteFromGit:
       enabled: true
       repository: "https://code.estradiol.cloud/tamsin/estradiol.cloud.git"
    @@ -363,8 +349,7 @@ configuration, assuming i have hel
       }
     service:
       type: ClusterIP
    -
    -
    +

    diagram: helm setup

    @@ -420,8 +405,7 @@ the bitnami Helm charts:

    my values.yaml:

    -release.yaml -
    apiVersion: helm.toolkit.fluxcd.io/v2beta1
    +release.yaml
    apiVersion: helm.toolkit.fluxcd.io/v2beta1
     kind: HelmRelease
     metadata:
       name: web
    @@ -466,8 +450,7 @@ my values.yaml:

    } service: type: ClusterIP -
    -
    +

    when i push these to my flux source repository, the Helm @@ -543,15 +526,11 @@ dependency for my flux source repository, i also depend on GitLab d

    -
    -
    - - -

    it's estradiol.cloud!

    +

    it's estradiol.cloud!

    the regrown limb can be monstrous, duplicated, potent. We have all been injured, profoundly.

    @@ -569,7 +548,7 @@ dependency for my flux source repository, i also depend on GitLab d chaosfem.tw/@t4tamsin
  • - code + code
  • work code @@ -580,17 +559,8 @@ dependency for my flux source repository, i also depend on GitLab d
    -
    -

    kubernetes is for girls

    - -

    - - 2024-03-12 -

    - - - -
    +

    kubernetes is for girls

    2024-03-12 +


    Hugo on Kubernetes & NGINX: - -
    diff --git a/public/posts/index.html b/public/posts/index.html index bb30b3a..fe1cb14 100644 --- a/public/posts/index.html +++ b/public/posts/index.html @@ -39,40 +39,18 @@ -
    -

    Posts

    - - - - - - +

    Posts

  • - code + code
  • work code @@ -102,8 +80,6 @@
    - -
    diff --git a/public/posts/miniflux-rss/index.html b/public/posts/miniflux-rss/index.html index a1d8355..a636be6 100644 --- a/public/posts/miniflux-rss/index.html +++ b/public/posts/miniflux-rss/index.html @@ -39,18 +39,11 @@ -
    -
    +

    Miniflux for Self-Hosted RSS

    @@ -78,8 +71,7 @@ bitnami chart), but using it in the existing chart required:

    -values.yaml -
    ingress:
    +values.yaml
    ingress:
       main:
         enabled: true
         className: nginx
    @@ -103,22 +95,17 @@ bitnami chart), but using it in the existing chart required:
        persistence:
          enabled: true
          size: 10Gi
    -
    -
    +

    -
    -
    - - -

    it's estradiol.cloud!

    +

    it's estradiol.cloud!

    the regrown limb can be monstrous, duplicated, potent. We have all been injured, profoundly.

    @@ -136,7 +123,7 @@ bitnami chart), but using it in the existing chart required: chaosfem.tw/@t4tamsin
  • - code + code
  • work code @@ -147,17 +134,8 @@ bitnami chart), but using it in the existing chart required:
    -
    - - -

    - - 2024-03-04 +

    2024-03-04

    - - - -
    diff --git a/public/tags/flux/index.html b/public/tags/flux/index.html index 0101e78..dec9a95 100644 --- a/public/tags/flux/index.html +++ b/public/tags/flux/index.html @@ -39,37 +39,17 @@ -
    -

    Flux

    - - - - - - +

    Flux

  • - code + code
  • work code @@ -99,8 +79,6 @@
    - -
    diff --git a/public/tags/hugo/index.html b/public/tags/hugo/index.html index 111c9be..cca7bad 100644 --- a/public/tags/hugo/index.html +++ b/public/tags/hugo/index.html @@ -39,37 +39,17 @@ -
    -

    Hugo

    - - - - - - +

    Hugo

  • - code + code
  • work code @@ -99,8 +79,6 @@
    - -
    diff --git a/public/tags/index.html b/public/tags/index.html index 70b145b..78fbd00 100644 --- a/public/tags/index.html +++ b/public/tags/index.html @@ -39,52 +39,22 @@ -
    -

    Tags

    - - - - - - +

    Tags

  • - code + code
  • work code @@ -114,8 +84,6 @@
    - -
    diff --git a/public/tags/k8s/index.html b/public/tags/k8s/index.html index 202e099..1d97899 100644 --- a/public/tags/k8s/index.html +++ b/public/tags/k8s/index.html @@ -39,40 +39,18 @@ -
    -

    K8s

    - - - - - - +

    K8s

  • - code + code
  • work code @@ -102,8 +80,6 @@
    - -
    diff --git a/public/tags/meta/index.html b/public/tags/meta/index.html index b451289..50861ba 100644 --- a/public/tags/meta/index.html +++ b/public/tags/meta/index.html @@ -39,40 +39,18 @@ -
    -

    Meta

    - - - - - - +

    Meta

  • - code + code
  • work code @@ -102,8 +80,6 @@
    - -
    diff --git a/public/tags/miniflux/index.html b/public/tags/miniflux/index.html index 96f8826..fdb0c99 100644 --- a/public/tags/miniflux/index.html +++ b/public/tags/miniflux/index.html @@ -39,37 +39,17 @@ -
    -

    Miniflux

    - - - - - - +

    Miniflux

  • - code + code
  • work code @@ -99,8 +79,6 @@
    - -
    diff --git a/public/tags/rss/index.html b/public/tags/rss/index.html index 050e6ad..590753f 100644 --- a/public/tags/rss/index.html +++ b/public/tags/rss/index.html @@ -39,37 +39,17 @@ -
    -

    Rss

    - - - - - - +

    Rss

  • - code + code
  • work code @@ -99,8 +79,6 @@
    - -