AAAAA

2025-03-09 06:53:25 +00:00 · 2025-03-09 06:53:25 +00:00 · ab48932ad5
commit ab48932ad5
parent c4e53afdf1
13 changed files with 201 additions and 169 deletions
--- a/css/resume.css
+++ b/css/resume.css
@ -5,7 +5,15 @@
    margin: 5mm;
  }

-    #menu, #credits {
+  #credits, #menu {
    display: none;
  }
+
+  #main {
+    margin: 0;
+  }
+
+  #nav {
+    float: right;
+  }
 }
--- a/html/contact.html
+++ b/html/contact.html
@ -7,63 +7,52 @@
  <body>
    {{template "header.tmpl" .}}
    <div id="content">
-      <!--
-      <div id="nav">
-        <ul>
-          <li><a href="#matrix">Matrix</a></li>
-          <li><a href="#discord">Discord</a></li>
-          <li><a href="#phone">Phone (France)</a></li>
-          <li><a href="#email">Email</a></li>
-          <li><a href="#wa">WhatsApp</a></li>
-        </ul>
-      </div>
-      -->
      <div id="main">

        <table>
          <tr>
            <td>Matrix (Element)</td>
-            <td id="matrix"><a href="//app.element.io/#/user/@ange:gmoker.com" target="_blank" rel="noreferrer noopener">@ange:gmoker.com</a></td>
+            <td id="matrix">{{template "matrix"}}</td>
            <td><button onclick="copyElem('matrix')">Copy</button></td>
          </tr>
          <tr>
            <td>Discord</td>
-            <td id="discord">@elrilio</td>
+            <td id="discord">{{template "discord"}}</td>
            <td><button onclick="copyElem('discord')">Copy</button></td>
          </tr>
          <tr>
            <td>Phone (France)</td>
-            <td id="phone"><a href="tel:+33582951623" target="_blank" rel="noreferrer noopener">+33 5 82 95 16 23</a></td>
+            <td id="phone">{{template "phone"}}</td>
            <td><button onclick="copyElem('phone', / /g)">Copy</button></td>
          </tr>
          <tr>
            <td>Email</td>
-            <td id="email"><a href="mailto:ange@yw5n.com" target="_blank" rel="noreferrer noopener">ange@yw5n.com</a></td>
+            <td id="email">{{template "email"}}</td>
            <td><button onclick="copyElem('email')">Copy</button></td>
          </tr>
          <tr>
            <td>WhatsApp</td>
-            <td id="wa"><a href="//wa.me/6285333559453" target="_blank" rel="noreferrer noopener">+62 853-3355-9453</a></td>
+            <td id="wa">{{template "wa"}}</td>
            <td><button onclick="copyElem('wa', /[ |-]/g)">Copy</button></td>
          </tr>
          <tr>
            <td>LinkedIn</td>
-            <td id="in"><a href="https://www.linkedin.com/in/angedhn" target="_blank" rel="noreferrer noopener">www.linkedin.com/in/angedhn</a></td>
+            <td id="in">{{template "in"}}</td>
            <td><button onclick="copyElem('in')">Copy</button></td>
          </tr>
          <tr>
            <td>PGP</td>
-            <td id="pgp"><a href="/static/pgp.asc" target="_blank" rel="noreferrer noopener">pgp.asc</a></td>
+            <td id="pgp">{{template "pgp"}}</td>
            <td><button onclick="copyFile('pgp')">Copy</button></td>
          </tr>
          <tr>
            <td>SSH</td>
-            <td id="ssh"><a href="/static/ssh" target="_blank" rel="noreferrer noopener">ssh</a></td>
+            <td id="ssh">{{template "ssh"}}</td>
            <td><button onclick="copyFile('ssh')">Copy</button></td>
          </tr>
        </table>
-      </div>

      </div>
+    </div>
  </body>
 </html>
--- a/html/resume.html
+++ b/html/resume.html
@ -8,14 +8,11 @@
    {{template "header.tmpl" .}}
    <div id="content">
      <div id="nav">
-        <!--
-        <ul>
-          <li><a href="#formation">Formation</a></li>
-          <li><a href="#experience">Experience</a></li>
-          <li><a href="#competences">Competences</a></li>
-        </ul>
-        -->
-        <img src="static/2404.webp" alt="Ange DUHAYON" width="128">
+        <img src="static/2404.webp" alt="Ange DUHAYON" width="128"><br>
+        {{template "phone"}}<br>
+        <a href="//yw5n.com">yw5n.com<br>
+        {{template "email"}}<br>
+        {{template "in"}}<br>
      </div>
      <div id="main">

@ -28,19 +25,22 @@
        </ul>

        <h2 id="experience">EXPERIENCE</h2>
-        <h3><b>Freelance</b> - DevOps</h3>
+        <h3><b>Freelance</b> - DevOps Engineer</h3>
        SEPTEMBER 2023 - TODAY
        <ul>
-          <li>Server setup (Debian, Docker/K8S, web server, customer application)</li>
-          <li>CI/CD, real-time monitoring</li>
+          <li>Docker / K8S</li>
+          <li>GitHub Actions</li>
+          <li>Prometheus</li>
+          <li>Python / Go backend</li>
        </ul>
-        <h3><b>Selfhost</b> - DevOps</h3>
+        <h3><b>Selfhost</b> - DevOps Engineer</h3>
        JANUARY 2022 - TODAY
        <ul>
-          <li>Debian, K8S, Gitea CI/CD</li>
+          <li>Bare metal K8S</li>
+          <li>Gitea Actions</li>
          <li>Nextcloud, Matrix.org, Jellyfin, SearXNG</li>
        </ul>
-        <h3><b>EPITECH CodingClub association, Toulouse</b> - Cobra</h3>
+        <h3><b>EPITECH CodingClub association, Toulouse</b> - Trainer</h3>
        JANUARY 2021 - JUNE 2024
        <ul>
          <li>Coding workshops for high school students</li>
@ -48,15 +48,16 @@
        <h3><b>Predicloud, Toulouse</b> - DevOps SRE</h3>
        JUNE 2022 - JULY 2023
        <ul>
-          <li>CI/CD, K8S monitoring</li>
-          <li>Authentication solution (LDAP, SSO, Webhook) + Python backend</li>
-          <li>Mail server (Postfix, Dovecot)</li>
-          <li>Customer communication and troubleshooting</li>
+          <li>GitLab CI</li>
+          <li>Prometheus, Grafana</li>
+          <li>OpenLDAP + Python frontend, Keycloak, K8S webhook</li>
+          <li>Postfix, Dovecot</li>
+          <li>Customer troubleshooting</li>
        </ul>

        <h2 id="competences">COMPETENCES</h2>
        <table>
-          <tr><th>LANGUAGES</th> <th>SOFTWARE</th></tr>
+          <tr><th>LANGUAGES</th><th>SOFTWARE</th></tr>
          <tr><td>C/C++</td>    <td>*nix</td></tr>
          <tr><td>Python</td>   <td>Git</td></tr>
          <tr><td>Bash</td>     <td>Vim</td></tr>
--- a/manifests/bin/deploy.sh
+++ b/manifests/bin/deploy.sh
@ -3,32 +3,35 @@ set -o pipefail

 function kapply() {
    for f in "$@"; do
-        kubectl apply -f \
-            <(envsubst "$(env | xargs printf '$%s ')" < "manifests/$f")
+        kubectl apply -f <(envsubst < "manifests/$f")
    done
-}
+}; export -f kapply

 function kcreatesec() {
-    kubectl create secret generic --save-config --dry-run=client -oyaml "$@" | kubectl apply -f-
-}
+    kubectl create secret generic --dry-run=client -oyaml "$@" | kubectl replace -f-
+}; export -f kcreatesec

 function kcreatecm() {
-    kubectl create configmap --dry-run=client -oyaml "$@" | kubectl apply -f-
-}
+    kubectl create configmap --dry-run=client -oyaml "$@" | kubectl replace -f-
+}; export -f kcreatecm

 function kgseckey() {
    local sec="$1"; shift
    local key="$1"; shift

-    kubectl get secret "$sec" -o jsonpath="{.data.$key}" | base64 -d
-}
+    if ! kubectl get secret "$sec" -ojson | jq -re ".data.\"$key\" // empty" | base64 -d; then
+        return 1
+    fi
+}; export -f kgseckey

 function kgcmkey() {
    local cm="$1";  shift
    local key="$1"; shift

-    kubectl get configmap "$cm" -o jsonpath="{.data.$key}"
-}
+    if ! kubectl get configmap "$cm" -ojson | jq -re ".data.\"$key\" // empty"; then
+        return 1
+    fi
+}; export -f kgcmkey


 kapply common/app.yaml
--- a/manifests/bin/devel.sh
+++ b/manifests/bin/devel.sh
@ -1,4 +1,5 @@
 #!/bin/bash -e
+set -o pipefail

 export NB_REPLICAS=1

--- a/manifests/bin/prod.sh
+++ b/manifests/bin/prod.sh
@ -1,4 +1,5 @@
 #!/bin/bash -e
+set -o pipefail

 export NB_REPLICAS=3

--- a/src/route.go
+++ b/src/route.go
@ -42,8 +42,8 @@ func route(w http.ResponseWriter, r *http.Request) {
            }
            fmt.Println(r.Method, r.URL.Path)
            rt.handler(w, r.WithContext(
-                context.WithValue(r.Context(), URLParam{}, matches[1:])),
-            )
+                context.WithValue(r.Context(), URLParam{}, matches[1:]),
+            ))
            return
        }
    }
--- a/src/tmpl.go
+++ b/src/tmpl.go
@ -12,10 +12,10 @@ var TMPL map[string][]byte
 func generateTmpl() {
    files, _ := filepath.Glob("html/*.html")
    re := regexp.MustCompile("html/(.+).html")
-    names := make([]string, len(files))
+    pages := make([]string, len(files))

    for i, f := range files {
-        names[i] = re.FindStringSubmatch(f)[1]
+        pages[i] = re.FindStringSubmatch(f)[1]
    }
    TMPL = make(map[string][]byte, len(files))
    for i, f := range files {
@ -23,9 +23,9 @@ func generateTmpl() {
        t, _ := template.ParseFiles(f)
        t.ParseGlob("tmpl/*.tmpl")
        t.Execute(b, map[string]any{
-            "name": names[i],
-            "names": names,
+            "page": pages[i],
+            "pages": pages,
        })
-        TMPL[names[i]] = b.Bytes()
+        TMPL[pages[i]] = b.Bytes()
    }
 }
--- a/src/views.go
+++ b/src/views.go
@ -3,7 +3,6 @@ package main
 import (
    "path/filepath"
    "net/http"
-    "fmt"
 )

 func index(w http.ResponseWriter, r *http.Request) {
@ -15,7 +14,6 @@ func static(w http.ResponseWriter, r *http.Request) {
 }

 func css(w http.ResponseWriter, r *http.Request) {
-    fmt.Println(filepath.Join("css", getParam(r, 0)))
    http.ServeFile(w, r, filepath.Join("css", getParam(r, 0)))
 }

--- a/tmpl/head.tmpl
+++ b/tmpl/head.tmpl
@ -1,3 +1,3 @@
 <meta charset="UTF-8">
-<title>Ange DUHAYON</title>
+<title>Ange DUHAYON - {{.page}}</title>
 <link rel="stylesheet" href="style.css"/>
--- a/tmpl/header.tmpl
+++ b/tmpl/header.tmpl
@ -1,12 +1,12 @@
 <div id="header">
  <a id="headerLink" href="/">Ange DUHAYON</a>
-  <span id="headerSubtitle">DevOps Engineer</span>
+  <span id="headerSubtitle">AAAAAAAAAAAAAAAAAAAAAAAAAAAA</span>
  <span id="credits" class="right" style="font-size: .4em;">Website heavily inspired from <a href="//suckless.org/" target="_blank" rel="noreferrer noopener">suckless.org</a></span>
 </div>
 <div id="menu">
-  {{$name := .name}}
-  {{range .names}}
-  <a href="/{{.}}">{{if eq $name .}}<b>{{.}}</b>{{else}}{{.}}{{end}}</a>
+  {{$page := .page}}
+  {{range .pages}}
+  <a href="/{{.}}">{{if eq $page .}}<b>{{.}}</b>{{else}}{{.}}{{end}}</a>
  {{end}}
  <span class="right">
    <a href="//git.gmoker.com/yw5n" target="_blank" rel="noreferrer noopener">source</a>
--- a/tmpl/vars.tmpl
+++ b/tmpl/vars.tmpl
@ -0,0 +1,31 @@
+{{define "matrix"}}
+<a href="//app.element.io/#/user/@ange:gmoker.com" target="_blank" rel="noreferrer noopener">@ange:gmoker.com</a>
+{{end}}
+
+{{define "discord"}}
+@elrilio
+{{end}}
+
+{{define "phone"}}
+<a href="tel:+33582951623" target="_blank" rel="noreferrer noopener">+33 5 82 95 16 23</a>
+{{end}}
+
+{{define "email"}}
+<a href="mailto:ange@yw5n.com" target="_blank" rel="noreferrer noopener">ange@yw5n.com</a>
+{{end}}
+
+{{define "wa"}}
+<a href="//wa.me/6285333559453" target="_blank" rel="noreferrer noopener">+62 853-3355-9453</a>
+{{end}}
+
+{{define "in"}}
+<a href="//www.linkedin.com/in/angedhn" target="_blank" rel="noreferrer noopener">angedhn</a>
+{{end}}
+
+{{define "pgp"}}
+<a href="/static/pgp.asc" target="_blank" rel="noreferrer noopener">pgp.asc</a>
+{{end}}
+
+{{define "ssh"}}
+<a href="/static/ssh" target="_blank" rel="noreferrer noopener">ssh</a>
+{{end}}