THE PRIVATE KEEEEEEEYYY

- Update .vars to properly export deployment configuration variables
- Modify deploy.sh to conditionally source .vars only in interactive mode
- Remove include directive from makefile to prevent automatic variable loading
- Enhance deployment script reliability by ensuring proper environment setup

.gitea/workflows/deploy.yaml

@@ -0,0 +1,41 @@
+---
+name: Deploy website on production server when committing on main
+concurrency:
+  group: deploy-website
+  cancel-in-progress: false
+
+on:
+  push:
+    tags:        
+      - '*'
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          export HUGO_VERSION=$(curl --silent -I https://github.com/gohugoio/hugo/releases/latest | grep location | sed 's|.*tag/||' | tr -d '\r')
+          export HUGO_VERSION_SHORT=$(echo ${HUGO_VERSION} | sed 's/v//')
+          wget https://github.com/gohugoio/hugo/releases/download/${HUGO_VERSION}/hugo_${HUGO_VERSION_SHORT}_linux-amd64.deb
+          dpkg -i hugo_*.deb
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - run: |
+          mkdir -p ~/.ssh/
+          echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+          make
+          make deploy
+        env:
+          SSH_USERNAME: ${{ vars.SSH_USERNAME }}
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SSH_KNOWN_HOSTS: ${{ vars.SSH_KNOWN_HOSTS }}
+          DEPLOYMENT_HOST: ${{ vars.DEPLOYMENT_HOST }}
+          DEPLOYMENT_PATH: ${{ vars.DEPLOYMENT_PATH }}
+          APP_VERSION: ${{ env.GITEA_REF_NAME }}

.vars

@@ -0,0 +1,4 @@
+#/usr/bin/env bash
+
+export DEPLOYMENT_HOST=docker.infra.bjphoster.cloud
+export DEPLOYMENT_PATH=/opt/pedini.dev

content/version.md

@@ -0,0 +1,9 @@
++++
+date = "2024-08-21T20:58:34+02:00"
+title = "Version Information"
+url = "/version"
++++
+
+Version: VAR_VERSION
+Commit ID: [VAR_COMMIT_ID](VAR_COMMIT_URL)
+Theme Commit ID: [VAR_THEME_COMMIT](VAR_THEME_URL)

deploy.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+set -e
+
+###
+# FLOW
+###
+#
+# if the username variable is set, append the at sign to it
+# if either the deployment host or deployment path variables are not set, return an error
+# tarball the built website and scp it to the deployment host
+# ssh to the remote host, cd to the deployment path, and get the data path from .env file
+# then remove everything in the data path, untar the tarball and reload the server
+# finally remove the tarball, both from the remote host and locally (cleanup)
+
+if [ -t 0 ]; then # Interactive: prompt user
+  source .vars
+fi
+
+# Check if the username variable is set
+if [ ! -z "${SSH_USERNAME}" ]; then
+    SSH_USERNAME="${SSH_USERNAME}@"
+fi
+
+# Check if either the deployment host or deployment path variables are not set
+if [ -z "${DEPLOYMENT_HOST}" ] || [ -z "${DEPLOYMENT_PATH}" ]; then
+    echo "required variable DEPLOYMENT_HOST is not set"
+    exit 1
+fi
+
+# Compress the built website and scp it to the remote host
+tar -czf httpdocs.tgz -C public .
+scp httpdocs.tgz ${SSH_USERNAME}${DEPLOYMENT_HOST}:/tmp/httpdocs.tgz
+
+# SSH to the remote host, cd to the deployment path, and deploy the website (delete and overwrite everything)
+ssh ${SSH_USERNAME}${DEPLOYMENT_HOST} "DEPLOYMENT_PATH=$DEPLOYMENT_PATH bash" << 'EOF'
+  cd ${DEPLOYMENT_PATH}
+  DATAPATH=$(cat .env | grep "NGINX_DATA" | sed "s/NGINX_DATA=//g")
+  rm -rf ${DATAPATH}/{*,.*}
+  tar xf /tmp/httpdocs.tgz -C ${DATAPATH}
+  rm -f /tmp/httpdocs.tgz
+EOF
+rm -f httpdocs.tgz

hugo.yaml

@@ -4,24 +4,58 @@ languageCode: "en-us"
 title: "Bryan Joshua Pedini"
 theme: "hugo-coder"
 
+markup:
+  goldmark:
+    renderer:
+      hardWraps: true
+
 params:
   author: "Bryan Joshua Pedini"
-  info: "FullStack developer, Networking/Docker specialist, DevOps enthusiast, k8s newbie, disco lover"
+  info: "FullStack Developer - Integration Manager - Cloud/PBX/Network/Docker Specialist - DevOps Enthusiast - Kubernetes/Ceph Apprentice"
   description: "Bryan's personal website / blog"
   keywords: "blog,personal,developer,networking,docker,devops,k8s,kubernetes"
   gravatar: "bryan@pedini.dev"
   since: 2019
-  commit: "https://git.bjphoster.com/source/pedini.dev/tree/"
+  commit: "https://git.bjphoster.com/source/pedini.dev/"
+  colorScheme: "dark"
+
+  csp:
+    childsrc:
+      - self
+    fontsrc:
+      - self
+    formaction:
+      - self
+    framesrc:
+      - self
+    imgsrc:
+      - self
+    objectsrc:
+      - self
+    stylesrc:
+      - self
+    scriptsrc:
+      - self
+    connectsrc:
+      - self
 
   social:
     - name: "Git"
       icon: "fa-brands fa-git fa-2x"
       weight: 1
-      url: "https://git.bjphoster.com"
+      url: "https://45r.it/bjphoster-git"
     - name: "Instagram"
       icon: "fa-brands fa-instagram fa-2x"
       weight: 2
-      url: "https://instagram.com/bryanp_og/"
+      url: "https://45r.it/pedini-ig"
+    - name: "Telegram"
+      icon: "fa-brands fa-telegram fa-2x"
+      weight: 3
+      url: "https://45r.it/pedini-tg"
+    - name: "LinkedIn"
+      icon: "fa-brands fa-linkedin fa-2x"
+      weight: 4
+      url: "https://45r.it/pedini-li"
 
 menu:
   main:
@@ -34,6 +68,9 @@ menu:
     - name: "Contacts"
       weight: 3
       url: "contacts/"
+    - name: "Version"
+      weight: 4
+      url: "version/"
 
 taxonomies:
   category: "categories"

makefile

@@ -3,10 +3,13 @@
 default: build
 
 prep:
-	git submodule update --init --recursive
+	git submodule foreach --recursive bash -c "git checkout \$$(git remote show origin | grep HEAD | sed 's/.*\: //'); git pull"
 
 build: prep
-	hugo
+	/usr/bin/env bash version.sh
+
+deploy:
+	/usr/bin/env bash deploy.sh
 
 run: prep
 	hugo server

version.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+set -e
+
+# Check if version is already provided
+if [ -z "${APP_VERSION}" ]; then
+  if [ -t 0 ]; then # Interactive: prompt user
+    # Get version from user
+    read -p "Version [latest]: " VERSIONINPUT
+    # If version was not provided, use the latest commit short hash as version
+    if [ -z ${VERSIONINPUT} ]; then
+      APP_VERSION="latest"
+    else
+      APP_VERSION=${VERSIONINPUT}
+    fi
+  else # Non-interactive (CI): default to "latest"
+    APP_VERSION="latest"
+  fi
+fi
+
+# Get project commit id and URL
+COMMIT_ID=$(git log HEAD --oneline | awk '{print $1}' | head -n1)
+COMMIT_URL="$(git remote get-url origin | sed 's/\.git$//g;s/:/\//;s/git@/https:\/\//')/commit/${COMMIT_ID}"
+
+# Get the theme used and its commit id and URL
+THEME=$(cat hugo.yaml | grep "theme:" | awk '{print $2}' | sed 's/"//g')
+pushd themes/${THEME} &>/dev/null
+THEME_COMMIT=$(git log HEAD --oneline | awk '{print $1}' | head -n1)
+THEME_URL="$(git remote get-url origin | sed 's/\.git$//g')/commit/${THEME_COMMIT}"
+popd &>/dev/null
+
+# Create version tag (if provided)
+if [ ! -z ${VERSIONINPUT} ]; then
+  git tag ${APP_VERSION}
+fi
+
+# Build the website
+hugo
+
+# Put the correct version information in the website
+sed -i "s|VAR_VERSION|${APP_VERSION}|" public/version/index.html
+sed -i "s|VAR_COMMIT_ID|${COMMIT_ID}|" public/version/index.html
+sed -i "s|VAR_COMMIT_URL|${COMMIT_URL}|" public/version/index.html
+sed -i "s|VAR_THEME_URL|${THEME_URL}|" public/version/index.html
+sed -i "s|VAR_THEME_COMMIT|${THEME_COMMIT}|" public/version/index.html