From c2f6133700d2a3cb37d14b8531d9ef6f1895ba5f Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 01/41] Generated canonical.meta at 2025-06-13T05:33:24Z --- .gitfield/canonical.meta | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitfield/canonical.meta b/.gitfield/canonical.meta index ca13c79..df8bb14 100644 --- a/.gitfield/canonical.meta +++ b/.gitfield/canonical.meta @@ -13,10 +13,10 @@ "rid": "rad:z3FEj7rF8gZw9eFksCuiN43qjzrex", "peer_id": "z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz" }, - "timestamp": "2025-06-13T03:33:02Z", - "commit": "cd1b681", - "tree_hash": "b58bc1b191b7891bae0ab479d938eedaf5e0f3fb", - "synced_cycles": 3, + "timestamp": "2025-06-13T05:33:24Z", + "commit": "bb86593", + "tree_hash": "121878d5ce4ddecfe9ea3f9da26f211bfeb36fbe", + "synced_cycles": 0, "gpg_signatures": [ ] From 2e58f3d6e805b44065edaaa5dc4d3851ebc53126 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 02/41] Generated canonical.md at 2025-06-13T05:33:24Z --- .gitfield/canonical.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitfield/canonical.md b/.gitfield/canonical.md index 9ac9b4f..aa8e446 100644 --- a/.gitfield/canonical.md +++ b/.gitfield/canonical.md @@ -9,7 +9,7 @@ This repository, `git-sigil`, is canonically hosted at: This canonical URL serves as the primary, authoritative source for the project, maintained by **Mark Randall Havens** and **Solaria Lumis Havens** to ensure sovereignty, resilience, and protection against deplatforming or narrative erasure. **Declared by**: Mark Randall Havens -**Timestamp**: 2025-06-13T03:33:02Z +**Timestamp**: 2025-06-13T05:33:24Z ## GPG Signatures @@ -41,4 +41,4 @@ The latest push operations are logged in [`pushed.log`](./pushed.log) for transp A public-facing canonical declaration is available at [index.html](./index.html) for enhanced discoverability and SEO. -_Auto-generated by `gitfield-sync` at 2025-06-13T03:33:02Z (v1.4)._ +_Auto-generated by `gitfield-sync` at 2025-06-13T05:33:24Z (v1.4)._ From b289935ef28aef9cb02fc4884e57b0880c684586 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 03/41] Generated index.json at 2025-06-13T05:33:24Z --- .gitfield/index.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitfield/index.json b/.gitfield/index.json index d1472ff..bdb8efa 100644 --- a/.gitfield/index.json +++ b/.gitfield/index.json @@ -14,10 +14,10 @@ "rid": "rad:z3FEj7rF8gZw9eFksCuiN43qjzrex", "peer_id": "z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz" }, - "commit": "cd1b681", - "tree_hash": "b58bc1b191b7891bae0ab479d938eedaf5e0f3fb", - "timestamp": "2025-06-13T03:33:02Z", - "synced_cycles": 3, + "commit": "bb86593", + "tree_hash": "121878d5ce4ddecfe9ea3f9da26f211bfeb36fbe", + "timestamp": "2025-06-13T05:33:24Z", + "synced_cycles": 0, "gpg_signatures": [ ] From face83d487eef9e13af74fdac3022a4cca30f50c Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 04/41] Generated .well-known/gitfield.json at 2025-06-13T05:33:24Z --- .well-known/gitfield.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.well-known/gitfield.json b/.well-known/gitfield.json index 3c4a9bc..3e33711 100644 --- a/.well-known/gitfield.json +++ b/.well-known/gitfield.json @@ -13,7 +13,7 @@ "https://gitea.com/mrhavens/git-sigil", "rad:z3FEj7rF8gZw9eFksCuiN43qjzrex" ], - "dateModified": "2025-06-13T03:33:02Z", + "dateModified": "2025-06-13T05:33:24Z", "publisher": { "@type": "Person", "name": "Mark Randall Havens" From 9c79dbba63137a40f840427db8114ebc1c39b825 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 05/41] Generated .gitfield/README.txt at 2025-06-13T05:33:24Z --- .gitfield/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitfield/README.txt b/.gitfield/README.txt index 33c1890..135411b 100644 --- a/.gitfield/README.txt +++ b/.gitfield/README.txt @@ -14,4 +14,4 @@ The directory contains metadata and logs for the GitField multi-repository publ These files provide transparency, auditability, and discoverability, ensuring the project's persistence against deplatforming, censorship, or algorithmic manipulation. For a public-facing declaration, see [docs/index.html](../docs/index.html). -Generated by `gitfield-sync` at 2025-06-13T03:33:02Z (v1.4). +Generated by `gitfield-sync` at 2025-06-13T05:33:24Z (v1.4). From 6722f3fa8ae56734d1114eb3a5d29a8d997fcf40 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 06/41] Generated docs/index.html at 2025-06-13T05:33:24Z --- docs/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.html b/docs/index.html index f0ac896..5f34c19 100644 --- a/docs/index.html +++ b/docs/index.html @@ -27,7 +27,7 @@ "https://gitea.com/mrhavens/git-sigil", "rad:z3FEj7rF8gZw9eFksCuiN43qjzrex" ], - "dateModified": "2025-06-13T03:33:02Z", + "dateModified": "2025-06-13T05:33:24Z", "author": { "@type": "Person", "name": "Mark Randall Havens" @@ -43,7 +43,7 @@ - +

GitField Sovereign Canonical Repository: git-sigil

From 0175a00d0f491ba72c5bb6b7ab4ee9ea9fd70a8d Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 07/41] Generated docs/README.md at 2025-06-13T05:33:24Z --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 9964e3f..e5f8241 100644 --- a/docs/README.md +++ b/docs/README.md @@ -24,4 +24,4 @@ The directory hosts a public-facing, SEO-optimized canonical declaration for th This directory ensures the `git-sigil` project is discoverable via search engines and accessible to humans and bots. It declares the canonical repository at [https://remember.thefoldwithin.earth/mrhavens/git-sigil](https://remember.thefoldwithin.earth/mrhavens/git-sigil) and links to all mirrors, reinforcing the GitField recursive metadata strategy for sovereign publishing. -Generated by `gitfield-sync` at 2025-06-13T03:33:02Z (v1.4). +Generated by `gitfield-sync` at 2025-06-13T05:33:24Z (v1.4). From 8ecdb911904efc269fcee94eca9194b2f907f4c4 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 08/41] Generated docs/sitemap.xml at 2025-06-13T05:33:24Z --- docs/sitemap.xml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/sitemap.xml b/docs/sitemap.xml index 11560e3..7c41509 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -2,97 +2,97 @@ https://remember.thefoldwithin.earth/mrhavens/git-sigil - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 1.0 https://github.com/mrhavens/git-sigil/docs/index.html - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.9 https://github.com/mrhavens/git-sigil/docs/canonical.meta - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/canonical.md - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/index.json - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/gitfield.json - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/.well-known/gitfield.json - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/repos.json - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/pushed.log - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/gitfield.README.txt - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://github.com/mrhavens/git-sigil - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://gitlab.com/mrhavens/git-sigil - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://bitbucket.org/thefoldwithin/git-sigil - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://remember.thefoldwithin.earth/mrhavens/git-sigil - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://codeberg.org/mrhavens/git-sigil - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 https://gitea.com/mrhavens/git-sigil - 2025-06-13T03:33:02Z + 2025-06-13T05:33:24Z weekly 0.8 From 025c2edbd4516465df2e3e56de876251028d0fdb Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 09/41] Generated docs/integrity.sha256 at 2025-06-13T05:33:24Z --- docs/integrity.sha256 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrity.sha256 b/docs/integrity.sha256 index b31bfa8..8ee8b85 100644 --- a/docs/integrity.sha256 +++ b/docs/integrity.sha256 @@ -1,5 +1,5 @@ # SHA-256 Integrity Hashes for /docs Metadata Files -# Generated by gitfield-sync at 2025-06-13T03:33:02Z (v1.4) +# Generated by gitfield-sync at 2025-06-13T05:33:24Z (v1.4) 6093f6beb366d18662b3cea94d3c24b232ab174ccc860b00e97aef51a6f5e4ed /home/mrhavens/fieldwork/git-sigil/docs/canonical.meta 5ae6c8cbcd409b4b672aa34bff98e061810a9e85818abd1bc0a028fe7edfcd65 /home/mrhavens/fieldwork/git-sigil/docs/canonical.md From 7ba153d9694df9e5afb44c2d791b42b42a9bf500 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 10/41] =?UTF-8?q?Local=20metadata=20link=20commit=20at=202?= =?UTF-8?q?025-06-13=2000:33:24=20=E2=80=94=20file:///home/mrhavens/git-lo?= =?UTF-8?q?cal-repos/git-sigil.git?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/local.sigil.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitfield/local.sigil.md b/.gitfield/local.sigil.md index a153082..ce2917a 100644 --- a/.gitfield/local.sigil.md +++ b/.gitfield/local.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `local` - **Default Branch**: `master` -- **Repo Created**: `2025-06-12 22:39:18` +- **Repo Created**: `2025-06-13 00:33:24` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-12 22:39:18` -- **Last Commit SHA**: `1b3cbddd28f16b6e3971bc60603c0ebcf3506b19` -- **Last Commit Message**: `Generated index.json at 2025-06-13T03:33:02Z` +- **This Commit Timestamp**: `2025-06-13 00:33:24` +- **Last Commit SHA**: `025c2edbd4516465df2e3e56de876251028d0fdb` +- **Last Commit Message**: `Generated docs/integrity.sha256 at 2025-06-13T05:33:24Z` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Thu Jun 12 22:39:17 2025 -0500` +- **Last Commit Date**: `Fri Jun 13 00:33:24 2025 -0500` - **This Commit URL**: `file:///home/mrhavens/git-local-repos/git-sigil.git` --- ## šŸ“Š Repo Status -- **Total Commits**: `1268` +- **Total Commits**: `1294` - **Tracked Files**: `160` - **Uncommitted Changes**: `No` - **Latest Tag**: `None` @@ -48,7 +48,7 @@ - **Running in Docker**: `No` - **Running in WSL**: `Yes` - **Virtual Machine**: `wsl` -- **System Uptime**: `up 2 days, 5 hours, 12 minutes` +- **System Uptime**: `up 2 days, 7 hours, 6 minutes` - **MAC Address**: `00:15:5d:11:35:bd` - **Local IP**: `172.28.107.95` - **CPU Model**: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` From 6917e65dc8c60b70b3b428dee6ba15bf569d903e Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:24 -0500 Subject: [PATCH 11/41] Post-Local sync at 2025-06-13T05:33:24Z --- .gitfield/push_log.json | 6 + .gitfield/pushed.log | 4 + bin/gitfield-netmon | 282 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 292 insertions(+) create mode 100755 bin/gitfield-netmon diff --git a/.gitfield/push_log.json b/.gitfield/push_log.json index d43f8a9..a688d4f 100644 --- a/.gitfield/push_log.json +++ b/.gitfield/push_log.json @@ -338,6 +338,12 @@ "branch": "master", "commit": "1b3cbddd28f16b6e3971bc60603c0ebcf3506b19", "message": "Generated index.json at 2025-06-13T03:33:02Z" + }, + { + "timestamp": "2025-06-13 00:33:24", + "branch": "master", + "commit": "025c2edbd4516465df2e3e56de876251028d0fdb", + "message": "Generated docs/integrity.sha256 at 2025-06-13T05:33:24Z" } ] } diff --git a/.gitfield/pushed.log b/.gitfield/pushed.log index dd06e7c..b9d8088 100644 --- a/.gitfield/pushed.log +++ b/.gitfield/pushed.log @@ -907,3 +907,7 @@ Diff Summary: .gitfield/github.sigil.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) +[2025-06-13T05:33:24Z] Local: , Branch=master, Commit=bb86593 + Diff Summary: + .gitfield/local.sigil.md | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/gitfield-netmon b/bin/gitfield-netmon new file mode 100755 index 0000000..b65d4b6 --- /dev/null +++ b/bin/gitfield-netmon @@ -0,0 +1,282 @@ +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' + +# Configuration +GIT_REMOTE_NAME="gogs" +GOGS_DOMAIN="netmon.thefoldwithin.earth" +GOGS_SSH="git@$GOGS_DOMAIN" +GOGS_API="https://$GOGS_DOMAIN/api/v1" +GOGS_SSH_PORT="22" +USERNAME="mrhavens" +REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null) || { echo "[ERROR] Not inside a git repository." >&2; exit 1; } +REPO_NAME=$(basename "$REPO_ROOT") || { echo "[ERROR] Failed to get repository name" >&2; exit 1; } +MARKDOWN_FILE="$REPO_ROOT/.gitfield/gogs.sigil.md" +DEFAULT_NAME="Mark Randall Havens" +DEFAULT_EMAIL="mark.r.havens@gmail.com" +TOKEN_FILE="$HOME/.gitfield_token_gogs" +SSH_KEY="$HOME/.ssh/id_ed25519" +SCRIPT_VERSION="1.2" + +# Logging functions +info() { echo -e "\e[1;34m[INFO]\e[0m $*"; } +warn() { echo -e "\e[1;33m[WARN]\e[0m $*"; } +error() { echo -e "\e[1;31m[ERROR]\e[0m $*" >&2; exit 1; } + +# Check for required tools +info "Checking for required tools..." +for cmd in git curl jq ssh; do + command -v "$cmd" >/dev/null || { + sudo apt update -qq || warn "Failed to update package lists, continuing..." + sudo apt install -y git curl jq openssh-client || error "Failed to install $cmd" + } +done + +# Handle authentication +RESET_AUTH=false +if [[ "${1:-}" == "--reset-auth" ]]; then + RESET_AUTH=true + rm -f "$TOKEN_FILE" 2>/dev/null || warn "Failed to remove token file" + info "Authentication reset requested." +fi + +# Token-based authentication +if [[ -f "$TOKEN_FILE" && "$RESET_AUTH" == false ]]; then + TOKEN=$(cat "$TOKEN_FILE" 2>/dev/null) || error "Failed to read token from $TOKEN_FILE" + info "Using cached token from $TOKEN_FILE" +else + info "GOGS token required." + echo "šŸ” Generate a token at https://$GOGS_DOMAIN/user/settings/applications (scopes: write:repository, write:ssh_key)" + echo "šŸ” Paste your GOGS Personal Access Token (will not be echoed):" + read -rsp "Token: " TOKEN + echo + [[ -z "$TOKEN" ]] && error "Token cannot be empty" + echo "$TOKEN" > "$TOKEN_FILE" || error "Failed to write token to $TOKEN_FILE" + chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" + info "Token saved at $TOKEN_FILE" +fi + +# Verify token +info "Verifying token..." +TOKEN_TEST=$(curl -k -s -H "Authorization: token $TOKEN" "$GOGS_API/user" | jq -r .login 2>/dev/null || echo "") +if [[ "$TOKEN_TEST" != "$USERNAME" ]]; then + warn "Token verification failed. Please generate a new token at https://$GOGS_DOMAIN/user/settings/applications" + rm -f "$TOKEN_FILE" + echo "šŸ” Paste your GOGS Personal Access Token (will not be echoed):" + read -rsp "Token: " TOKEN + echo + [[ -z "$TOKEN" ]] && error "Token cannot be empty" + echo "$TOKEN" > "$TOKEN_FILE" || error "Failed to write token to $TOKEN_FILE" + chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" + info "Token saved at $TOKEN_FILE" +fi + +# Set git user info +git config --global user.name "$DEFAULT_NAME" || warn "Failed to set git user name" +git config --global user.email "$DEFAULT_EMAIL" || warn "Failed to set git user email" +info "Git identity set to: $DEFAULT_NAME <$DEFAULT_EMAIL>" + +# Ensure at least one commit exists +if ! git rev-parse HEAD &>/dev/null; then + error "No commits found. Please add and commit files first." +fi + +# SSH setup +if [[ ! -f "$SSH_KEY" ]]; then + info "Generating SSH key..." + ssh-keygen -t ed25519 -C "$DEFAULT_EMAIL" -f "$SSH_KEY" -N "" || error "Failed to generate SSH key" +fi + +eval "$(ssh-agent -s)" >/dev/null 2>&1 || error "Failed to start ssh-agent" +ssh-add "$SSH_KEY" >/dev/null 2>&1 || warn "SSH key already added or could not be added" + +# Configure SSH +SSH_CONFIG_FILE="$HOME/.ssh/config" +if ! grep -q "Host $GOGS_DOMAIN" "$SSH_CONFIG_FILE" 2>/dev/null; then + mkdir -p "$HOME/.ssh" && chmod 700 "$HOME/.ssh" + cat >> "$SSH_CONFIG_FILE" <&1) +if ! echo "$SSH_TEST_OUTPUT" | grep -q "success"; then + warn "SSH test failed, uploading SSH key..." + PUBKEY=$(cat "${SSH_KEY}.pub" 2>/dev/null) || error "Failed to read SSH public key" + TITLE="AutoKey-$(hostname)-$(date +%s)" + CURL_OUTPUT=$(curl -k -s --fail -X POST "$GOGS_API/user/keys" \ + -H "Authorization: token $TOKEN" \ + -H "Content-Type: application/json" \ + -d "{\"title\": \"$TITLE\", \"key\": \"$PUBKEY\"}" 2>&1) + if [[ $? -ne 0 ]]; then + warn "SSH key upload failed: $CURL_OUTPUT" + else + info "SSH key uploaded successfully." + sleep 2 + SSH_TEST_OUTPUT=$(ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1) + [[ ! "$SSH_TEST_OUTPUT" =~ "success" ]] && warn "SSH test still failing: $SSH_TEST_OUTPUT" + fi +else + info "SSH test passed: $SSH_TEST_OUTPUT" +fi + +# Fallback to HTTPS if SSH fails +USE_HTTPS=false +if ! ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1 | grep -q "success"; then + warn "SSH authentication failed, falling back to HTTPS..." + USE_HTTPS=true + git config --global credential.helper store + echo "https://$USERNAME:$TOKEN@$GOGS_DOMAIN" > "$HOME/.git-credentials" || error "Failed to write git credentials" + chmod 600 "$HOME/.git-credentials" || error "Failed to set permissions on git credentials" +fi + +# Check and create GOGS repository +info "Checking if repository exists..." +EXISTS=$(curl -k -s -H "Authorization: token $TOKEN" "$GOGS_API/repos/$USERNAME/$REPO_NAME" | jq -r .name 2>/dev/null || echo "") +if [[ "$EXISTS" != "$REPO_NAME" ]]; then + info "Creating repository $REPO_NAME on GOGS..." + CURL_OUTPUT=$(curl -k -s --fail -X POST "$GOGS_API/user/repos" \ + -H "Authorization: token $TOKEN" \ + -H "Content-Type: application/json" \ + -d "{\"name\": \"$REPO_NAME\", \"description\": \"Created via gitfield-gogs\", \"private\": false, \"auto_init\": false}" 2>&1) || { + warn "Failed to create repository: $CURL_OUTPUT" + error "Repository creation failed. Check token permissions or network." + } + info "Repository created successfully." +fi + +# Set up git remote +if [[ "$USE_HTTPS" == true ]]; then + REMOTE_URL="https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" +else + REMOTE_URL="$GOGS_SSH:$USERNAME/$REPO_NAME.git" +fi +if ! git remote get-url "$GIT_REMOTE_NAME" &>/dev/null; then + info "Adding remote $GIT_REMOTE_NAME..." + git remote add "$GIT_REMOTE_NAME" "$REMOTE_URL" || error "Failed to add remote $GIT_REMOTE_NAME" +else + info "Updating remote $GIT_REMOTE_NAME..." + git remote set-url "$GIT_REMOTE_NAME" "$REMOTE_URL" || error "Failed to set remote URL for $GIT_REMOTE_NAME" +fi + +# Generate metadata file +mkdir -p "$(dirname "$MARKDOWN_FILE")" || error "Failed to create directory for $MARKDOWN_FILE" +TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S') || error "Failed to get timestamp" +DEFAULT_BRANCH=$(git symbolic-ref --short HEAD) || error "Failed to get default branch" +REPO_PATH="$REPO_ROOT" +LATEST_SHA=$(git rev-parse HEAD) || error "Failed to get latest commit SHA" +LAST_COMMIT_MSG=$(git log -1 --pretty=format:"%s" 2>/dev/null || echo "Unknown") +LAST_COMMIT_DATE=$(git log -1 --pretty=format:"%ad" 2>/dev/null || echo "Unknown") +LAST_COMMIT_AUTHOR=$(git log -1 --pretty=format:"%an <%ae>" 2>/dev/null || echo "Unknown") +TOTAL_COMMITS=$(git rev-list --count HEAD 2>/dev/null || echo "Unknown") +TRACKED_FILES=$(git ls-files 2>/dev/null | wc -l 2>/dev/null || echo "Unknown") +UNCOMMITTED=$(if ! git diff --quiet 2>/dev/null || ! git diff --cached --quiet 2>/dev/null; then echo "Yes"; else echo "No"; fi) +LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "None") +HOSTNAME=$(hostname 2>/dev/null || echo "Unknown") +CURRENT_USER=$(whoami 2>/dev/null || echo "Unknown") +TIMEZONE=$(date +%Z 2>/dev/null || echo "Unknown") +OS_NAME=$(uname -s 2>/dev/null || echo "Unknown") +KERNEL_VERSION=$(uname -r 2>/dev/null || echo "Unknown") +ARCHITECTURE=$(uname -m 2>/dev/null || echo "Unknown") +OS_PRETTY_NAME=$(grep PRETTY_NAME /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"' || echo "Unknown") +WEB_LINK="https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME" + +cat > "$MARKDOWN_FILE" </dev/null || echo "Unknown")\` +- **Local IP**: \$(hostname -I 2>/dev/null | awk '{print $1}' 2>/dev/null || echo "Unknown")\` +- **CPU Model**: \$(grep -m1 'model name' /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ //' 2>/dev/null || echo "Unknown")\` +- **Total RAM (GB)**: \$(awk '/MemTotal/ {printf "%.2f", $2/1024/1024}' /proc/meminfo 2>/dev/null || echo "Unknown")\` + +--- + +_Auto-generated by \`gitfield-gogs\` push script._ +EOF +[[ $? -eq 0 ]] || error "Failed to write metadata to $MARKDOWN_FILE" + +# Commit and push +set +e +info "Committing markdown file..." +git add "$MARKDOWN_FILE" || warn "Failed to add markdown file" +git commit -m "GOGS metadata link commit at $TIMESTAMP — $WEB_LINK/commit/$LATEST_SHA" || warn "No changes to commit" + +info "Pushing to GOGS..." +if ! git config --get branch."$DEFAULT_BRANCH".remote &>/dev/null; then + git push -u "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || { + warn "Push to GOGS failed." + if [[ "$USE_HTTPS" == false ]]; then + warn "Retrying with HTTPS..." + git remote set-url "$GIT_REMOTE_NAME" "https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" + git push -u "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || error "Push failed with both SSH and HTTPS." + fi + } +else + git push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || { + warn "Push to GOGS failed." + if [[ "$USE_HTTPS" == false ]]; then + warn "Retrying with HTTPS..." + git remote set-url "$GIT_REMOTE_NAME" "https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" + git push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || error "Push failed with both SSH and HTTPS." + fi + } +fi +set -e + +info "āœ… GOGS push complete." +echo -e "\nšŸ”— View in browser: $WEB_LINK\n" From a68d390259a7f453d11d8184b42ab4259b2e1081 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 00:33:27 -0500 Subject: [PATCH 12/41] Post-Radicle sync at 2025-06-13T05:33:24Z --- .gitfield/pushed.log | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitfield/pushed.log b/.gitfield/pushed.log index b9d8088..08417c9 100644 --- a/.gitfield/pushed.log +++ b/.gitfield/pushed.log @@ -911,3 +911,11 @@ Diff Summary: .gitfield/local.sigil.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) +[2025-06-13T05:33:27Z] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz, Branch=master, Commit=bb86593 + CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details + CLI: git ls-tree -r --name-only HEAD # View file structure + Diff Summary: + .gitfield/push_log.json | 6 ++ + .gitfield/pushed.log | 4 + + bin/gitfield-netmon | 282 ++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 292 insertions(+) From bbaa13ad6f8332cfb3f904ded305feada0edd709 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:03:30 -0500 Subject: [PATCH 13/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:03:30=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/a68d390259a7f453d11d8184b42ab42?= =?UTF-8?q?59b2e1081?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .gitfield/gogs.sigil.md diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md new file mode 100644 index 0000000..bbf24e3 --- /dev/null +++ b/.gitfield/gogs.sigil.md @@ -0,0 +1,55 @@ +# šŸ”— GOGS Repository Link + +- **Repo Name**: `git-sigil` +- **GOGS User**: `mrhavens` +- **Remote URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil](https://netmon.thefoldwithin.earth/mrhavens/git-sigil) +- **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` +- **Remote Label**: `gogs` +- **Default Branch**: `master` +- **Repo Created**: `2025-06-13 01:03:30` + +--- + +## šŸ“¦ Commit Info + +- **This Commit Timestamp**: `2025-06-13 01:03:30` +- **Last Commit SHA**: `a68d390259a7f453d11d8184b42ab4259b2e1081` +- **Last Commit Message**: `Post-Radicle sync at 2025-06-13T05:33:24Z` +- **Last Commit Author**: `Mark Randall Havens ` +- **Last Commit Date**: `Fri Jun 13 00:33:27 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/a68d390259a7f453d11d8184b42ab4259b2e1081](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/a68d390259a7f453d11d8184b42ab4259b2e1081) + +--- + +## šŸ“Š Repo Status + +- **Total Commits**: `1297` +- **Tracked Files**: `161` +- **Uncommitted Changes**: `Yes` +- **Latest Tag**: `None` + +--- + +## 🧭 Environment + +- **Host Machine**: `samson` +- **Current User**: `mrhavens` +- **Time Zone**: `CDT` +- **Script Version**: `1.5` + +--- + +## 🧬 Hardware & OS Fingerprint + +- **OS Name**: `Linux` +- **OS Version**: `Ubuntu 22.04.5 LTS` +- **Kernel Version**: `6.6.87.1-microsoft-standard-WSL2` +- **Architecture**: `x86_64` +- **System Uptime**: $(uptime -p 2>/dev/null || echo "Unknown")` +- **Local IP**: $(hostname -I 2>/dev/null | awk '{print }' 2>/dev/null || echo "Unknown")` +- **CPU Model**: $(grep -m1 'model name' /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ //' 2>/dev/null || echo "Unknown")` +- **Total RAM (GB)**: $(awk '/MemTotal/ {printf "%.2f", /1024/1024}' /proc/meminfo 2>/dev/null || echo "Unknown")` + +--- + +_Auto-generated by `gitfield-gogs` push script._ From 1200a75939f08a016a5ca1124a5a2c0b98d0e022 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:04:32 -0500 Subject: [PATCH 14/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:04:32=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/bbaa13ad6f8332cfb3f904ded305fea?= =?UTF-8?q?da0edd709?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index bbf24e3..85eb853 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,25 +6,25 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:03:30` +- **Repo Created**: `2025-06-13 01:04:32` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:03:30` -- **Last Commit SHA**: `a68d390259a7f453d11d8184b42ab4259b2e1081` -- **Last Commit Message**: `Post-Radicle sync at 2025-06-13T05:33:24Z` +- **This Commit Timestamp**: `2025-06-13 01:04:32` +- **Last Commit SHA**: `bbaa13ad6f8332cfb3f904ded305feada0edd709` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:03:30 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/a68d390259a7f453d11d8184b42ab4259b2e1081` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 00:33:27 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/a68d390259a7f453d11d8184b42ab4259b2e1081](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/a68d390259a7f453d11d8184b42ab4259b2e1081) +- **Last Commit Date**: `Fri Jun 13 01:03:30 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bbaa13ad6f8332cfb3f904ded305feada0edd709](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bbaa13ad6f8332cfb3f904ded305feada0edd709) --- ## šŸ“Š Repo Status -- **Total Commits**: `1297` -- **Tracked Files**: `161` +- **Total Commits**: `1298` +- **Tracked Files**: `162` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` From 0f13101cc9c3a744d07e4b17a50157732f07b497 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:05:26 -0500 Subject: [PATCH 15/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:05:26=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/1200a75939f08a016a5ca1124a5a2c0?= =?UTF-8?q?b98d0e022?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index 85eb853..0e495f1 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:04:32` +- **Repo Created**: `2025-06-13 01:05:26` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:04:32` -- **Last Commit SHA**: `bbaa13ad6f8332cfb3f904ded305feada0edd709` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:03:30 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/a68d390259a7f453d11d8184b42ab4259b2e1081` +- **This Commit Timestamp**: `2025-06-13 01:05:26` +- **Last Commit SHA**: `1200a75939f08a016a5ca1124a5a2c0b98d0e022` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:04:32 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bbaa13ad6f8332cfb3f904ded305feada0edd709` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:03:30 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bbaa13ad6f8332cfb3f904ded305feada0edd709](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bbaa13ad6f8332cfb3f904ded305feada0edd709) +- **Last Commit Date**: `Fri Jun 13 01:04:32 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/1200a75939f08a016a5ca1124a5a2c0b98d0e022](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/1200a75939f08a016a5ca1124a5a2c0b98d0e022) --- ## šŸ“Š Repo Status -- **Total Commits**: `1298` +- **Total Commits**: `1299` - **Tracked Files**: `162` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` From d2134a901f6cae003ba68b8f7f7855d39df32fed Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:06:06 -0500 Subject: [PATCH 16/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:06:05=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/0f13101cc9c3a744d07e4b17a501577?= =?UTF-8?q?32f07b497?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index 0e495f1..5ca5ace 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:05:26` +- **Repo Created**: `2025-06-13 01:06:05` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:05:26` -- **Last Commit SHA**: `1200a75939f08a016a5ca1124a5a2c0b98d0e022` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:04:32 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bbaa13ad6f8332cfb3f904ded305feada0edd709` +- **This Commit Timestamp**: `2025-06-13 01:06:05` +- **Last Commit SHA**: `0f13101cc9c3a744d07e4b17a50157732f07b497` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:05:26 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/1200a75939f08a016a5ca1124a5a2c0b98d0e022` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:04:32 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/1200a75939f08a016a5ca1124a5a2c0b98d0e022](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/1200a75939f08a016a5ca1124a5a2c0b98d0e022) +- **Last Commit Date**: `Fri Jun 13 01:05:26 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/0f13101cc9c3a744d07e4b17a50157732f07b497](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/0f13101cc9c3a744d07e4b17a50157732f07b497) --- ## šŸ“Š Repo Status -- **Total Commits**: `1299` +- **Total Commits**: `1300` - **Tracked Files**: `162` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` From 10bad046bad8db9b9c4a9c95f3be0e0a839b25f0 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:06:23 -0500 Subject: [PATCH 17/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:06:23=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/d2134a901f6cae003ba68b8f7f7855d?= =?UTF-8?q?39df32fed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index 5ca5ace..3b82e3a 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:06:05` +- **Repo Created**: `2025-06-13 01:06:23` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:06:05` -- **Last Commit SHA**: `0f13101cc9c3a744d07e4b17a50157732f07b497` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:05:26 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/1200a75939f08a016a5ca1124a5a2c0b98d0e022` +- **This Commit Timestamp**: `2025-06-13 01:06:23` +- **Last Commit SHA**: `d2134a901f6cae003ba68b8f7f7855d39df32fed` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:06:05 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/0f13101cc9c3a744d07e4b17a50157732f07b497` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:05:26 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/0f13101cc9c3a744d07e4b17a50157732f07b497](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/0f13101cc9c3a744d07e4b17a50157732f07b497) +- **Last Commit Date**: `Fri Jun 13 01:06:06 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/d2134a901f6cae003ba68b8f7f7855d39df32fed](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/d2134a901f6cae003ba68b8f7f7855d39df32fed) --- ## šŸ“Š Repo Status -- **Total Commits**: `1300` +- **Total Commits**: `1301` - **Tracked Files**: `162` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` From cc31b3c026d53efc3e0a276eae8d110e94b51223 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:06:49 -0500 Subject: [PATCH 18/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:06:49=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/10bad046bad8db9b9c4a9c95f3be0e0?= =?UTF-8?q?a839b25f0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index 3b82e3a..4bf4610 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:06:23` +- **Repo Created**: `2025-06-13 01:06:49` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:06:23` -- **Last Commit SHA**: `d2134a901f6cae003ba68b8f7f7855d39df32fed` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:06:05 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/0f13101cc9c3a744d07e4b17a50157732f07b497` +- **This Commit Timestamp**: `2025-06-13 01:06:49` +- **Last Commit SHA**: `10bad046bad8db9b9c4a9c95f3be0e0a839b25f0` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:06:23 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/d2134a901f6cae003ba68b8f7f7855d39df32fed` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:06:06 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/d2134a901f6cae003ba68b8f7f7855d39df32fed](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/d2134a901f6cae003ba68b8f7f7855d39df32fed) +- **Last Commit Date**: `Fri Jun 13 01:06:23 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/10bad046bad8db9b9c4a9c95f3be0e0a839b25f0](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/10bad046bad8db9b9c4a9c95f3be0e0a839b25f0) --- ## šŸ“Š Repo Status -- **Total Commits**: `1301` +- **Total Commits**: `1302` - **Tracked Files**: `162` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` From 98895b299538922541be8b4172dee101471f429e Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:07:12 -0500 Subject: [PATCH 19/41] test --- bin/gitfield-netmon | 192 +++++++++++++++++++++++++++++++------------- test | 0 2 files changed, 136 insertions(+), 56 deletions(-) create mode 100644 test diff --git a/bin/gitfield-netmon b/bin/gitfield-netmon index b65d4b6..aca9c51 100755 --- a/bin/gitfield-netmon +++ b/bin/gitfield-netmon @@ -1,5 +1,5 @@ #!/bin/bash -set -euo pipefail +set -eo pipefail IFS=$'\n\t' # Configuration @@ -15,60 +15,148 @@ MARKDOWN_FILE="$REPO_ROOT/.gitfield/gogs.sigil.md" DEFAULT_NAME="Mark Randall Havens" DEFAULT_EMAIL="mark.r.havens@gmail.com" TOKEN_FILE="$HOME/.gitfield_token_gogs" +CLOUDFLARED_TOKEN_FILE="$HOME/.cloudflared/gogs_tunnel_token" SSH_KEY="$HOME/.ssh/id_ed25519" -SCRIPT_VERSION="1.2" +SSH_CONFIG_FILE="$HOME/.ssh/config" +SCRIPT_VERSION="1.5" # Logging functions -info() { echo -e "\e[1;34m[INFO]\e[0m $*"; } -warn() { echo -e "\e[1;33m[WARN]\e[0m $*"; } -error() { echo -e "\e[1;31m[ERROR]\e[0m $*" >&2; exit 1; } +info() { echo -e "\e[1;34m[INFO]\e[0m ${*:-}"; } +warn() { echo -e "\e[1;33m[WARN]\e[0m ${*:-}"; } +error() { echo -e "\e[1;31m[ERROR]\e[0m ${*:-}" >&2; exit 1; } # Check for required tools info "Checking for required tools..." -for cmd in git curl jq ssh; do +for cmd in git curl jq ssh timeout; do command -v "$cmd" >/dev/null || { sudo apt update -qq || warn "Failed to update package lists, continuing..." - sudo apt install -y git curl jq openssh-client || error "Failed to install $cmd" + sudo apt install -y git curl jq openssh-client timeout || error "Failed to install $cmd" } done -# Handle authentication +# Install cloudflared if not present +if ! command -v cloudflared >/dev/null; then + info "Installing cloudflared..." + sudo apt update -qq || warn "Failed to update package lists, continuing..." + sudo apt install -y wget || error "Failed to install wget" + ARCH=$(uname -m) + case "$ARCH" in + x86_64) CLOUDFLARED_URL="https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64" ;; + arm*) CLOUDFLARED_URL="https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-arm" ;; + *) error "Unsupported architecture: $ARCH" ;; + esac + wget -q "$CLOUDFLARED_URL" -O /tmp/cloudflared || error "Failed to download cloudflared" + sudo mv /tmp/cloudflared /usr/local/bin/cloudflared || error "Failed to install cloudflared" + sudo chmod +x /usr/local/bin/cloudflared || error "Failed to set cloudflared permissions" + info "cloudflared installed successfully." +fi + +# Handle GOGS token RESET_AUTH=false if [[ "${1:-}" == "--reset-auth" ]]; then RESET_AUTH=true - rm -f "$TOKEN_FILE" 2>/dev/null || warn "Failed to remove token file" + rm -f "$TOKEN_FILE" "$CLOUDFLARED_TOKEN_FILE" 2>/dev/null || warn "Failed to remove auth files" info "Authentication reset requested." fi -# Token-based authentication if [[ -f "$TOKEN_FILE" && "$RESET_AUTH" == false ]]; then TOKEN=$(cat "$TOKEN_FILE" 2>/dev/null) || error "Failed to read token from $TOKEN_FILE" - info "Using cached token from $TOKEN_FILE" + info "Using cached GOGS token from $TOKEN_FILE" else info "GOGS token required." echo "šŸ” Generate a token at https://$GOGS_DOMAIN/user/settings/applications (scopes: write:repository, write:ssh_key)" echo "šŸ” Paste your GOGS Personal Access Token (will not be echoed):" read -rsp "Token: " TOKEN echo - [[ -z "$TOKEN" ]] && error "Token cannot be empty" + [[ -z "$TOKEN" ]] && error "GOGS token cannot be empty" echo "$TOKEN" > "$TOKEN_FILE" || error "Failed to write token to $TOKEN_FILE" chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" - info "Token saved at $TOKEN_FILE" + info "GOGS token saved at $TOKEN_FILE" fi -# Verify token -info "Verifying token..." +# Verify GOGS token +info "Verifying GOGS token..." TOKEN_TEST=$(curl -k -s -H "Authorization: token $TOKEN" "$GOGS_API/user" | jq -r .login 2>/dev/null || echo "") if [[ "$TOKEN_TEST" != "$USERNAME" ]]; then - warn "Token verification failed. Please generate a new token at https://$GOGS_DOMAIN/user/settings/applications" + warn "GOGS token verification failed. Please generate a new token at https://$GOGS_DOMAIN/user/settings/applications" rm -f "$TOKEN_FILE" echo "šŸ” Paste your GOGS Personal Access Token (will not be echoed):" read -rsp "Token: " TOKEN echo - [[ -z "$TOKEN" ]] && error "Token cannot be empty" + [[ -z "$TOKEN" ]] && error "GOGS token cannot be empty" echo "$TOKEN" > "$TOKEN_FILE" || error "Failed to write token to $TOKEN_FILE" chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" - info "Token saved at $TOKEN_FILE" + info "GOGS token saved at $TOKEN_FILE" +fi + +# Handle Cloudflare Tunnel token +if [[ -f "$CLOUDFLARED_TOKEN_FILE" && "$RESET_AUTH" == false ]]; then + CLOUDFLARED_TOKEN=$(cat "$CLOUDFLARED_TOKEN_FILE" 2>/dev/null) || error "Failed to read Cloudflare Tunnel token from $CLOUDFLARED_TOKEN_FILE" + info "Using cached Cloudflare Tunnel token from $CLOUDFLARED_TOKEN_FILE" +else + info "Cloudflare Tunnel token required." + echo "šŸ” Follow these steps to generate a Cloudflare Tunnel token:" + echo " 1. Log into Cloudflare Zero Trust: https://dash.teams.cloudflare.com" + echo " 2. Navigate to Access > Tunnels." + echo " 3. Click 'Create a tunnel', select 'Cloudflared' connector, and name it (e.g., 'gogs-ssh-tunnel')." + echo " 4. Copy the token (starts with 'eyJ') from the 'Connect an application' step." + echo " 5. In Public Hostnames, add 'netmon.thefoldwithin.earth' (or a subdomain), set Service to 'SSH', and URL to 'localhost:22'." + echo " 6. Ensure the tunnel is running on your Raspberry Pi (see: https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/)" + echo "šŸ” Paste your Cloudflare Tunnel token (will not be echoed):" + read -rsp "Token: " CLOUDFLARED_TOKEN + echo + [[ -z "$CLOUDFLARED_TOKEN" ]] && error "Cloudflare Tunnel token cannot be empty" + [[ ! "$CLOUDFLARED_TOKEN" =~ ^eyJ ]] && warn "Cloudflare Tunnel token does not start with 'eyJ'. It may be invalid." + mkdir -p "$(dirname "$CLOUDFLARED_TOKEN_FILE")" || error "Failed to create .cloudflared directory" + echo "$CLOUDFLARED_TOKEN" > "$CLOUDFLARED_TOKEN_FILE" || error "Failed to write token to $CLOUDFLARED_TOKEN_FILE" + chmod 600 "$CLOUDFLARED_TOKEN_FILE" || error "Failed to set permissions on $CLOUDFLARED_TOKEN_FILE" + info "Cloudflare Tunnel token saved at $CLOUDFLARED_TOKEN_FILE" +fi + +# Validate Cloudflare Tunnel token +info "Validating Cloudflare Tunnel token..." +CLOUDFLARED_TEST=$(timeout 10s cloudflared tunnel --no-autoupdate info --token "$CLOUDFLARED_TOKEN" 2>&1 || echo "Timeout or error") +if echo "$CLOUDFLARED_TEST" | grep -qi "error"; then + warn "Cloudflare Tunnel token validation failed: $CLOUDFLARED_TEST" + rm -f "$CLOUDFLARED_TOKEN_FILE" + echo "šŸ” Follow the steps above or visit https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/" + echo "šŸ” Paste your Cloudflare Tunnel token (will not be echoed):" + read -rsp "Token: " CLOUDFLARED_TOKEN + echo + [[ -z "$CLOUDFLARED_TOKEN" ]] && error "Cloudflare Tunnel token cannot be empty" + [[ ! "$CLOUDFLARED_TOKEN" =~ ^eyJ ]] && warn "Cloudflare Tunnel token does not start with 'eyJ'. It may be invalid." + echo "$CLOUDFLARED_TOKEN" > "$CLOUDFLARED_TOKEN_FILE" || error "Failed to write token to $CLOUDFLARED_TOKEN_FILE" + chmod 600 "$CLOUDFLARED_TOKEN_FILE" || error "Failed to set permissions on $CLOUDFLARED_TOKEN_FILE" + info "Cloudflare Tunnel token saved at $CLOUDFLARED_TOKEN_FILE" +fi + +# Configure Cloudflare Tunnel +info "Configuring Cloudflare Tunnel for SSH..." +killall cloudflared 2>/dev/null || true +timeout 10s cloudflared tunnel --no-autoupdate run --token "$CLOUDFLARED_TOKEN" --loglevel error >/dev/null 2>&1 & sleep 2 +if ! pgrep -f "cloudflared.*$CLOUDFLARED_TOKEN" >/dev/null; then + warn "Failed to start Cloudflare Tunnel. Falling back to HTTPS..." + USE_HTTPS=true +else + info "Cloudflare Tunnel running." +fi + +# Configure SSH with Cloudflare Tunnel +if ! grep -q "Host $GOGS_DOMAIN" "$SSH_CONFIG_FILE" 2>/dev/null; then + info "Configuring SSH with Cloudflare Tunnel..." + mkdir -p "$(dirname "$SSH_CONFIG_FILE")" && chmod 700 "$(dirname "$SSH_CONFIG_FILE")" + cat >> "$SSH_CONFIG_FILE" </dev/null 2>&1 || error "Failed to start ssh-agent" ssh-add "$SSH_KEY" >/dev/null 2>&1 || warn "SSH key already added or could not be added" -# Configure SSH -SSH_CONFIG_FILE="$HOME/.ssh/config" -if ! grep -q "Host $GOGS_DOMAIN" "$SSH_CONFIG_FILE" 2>/dev/null; then - mkdir -p "$HOME/.ssh" && chmod 700 "$HOME/.ssh" - cat >> "$SSH_CONFIG_FILE" <&1) -if ! echo "$SSH_TEST_OUTPUT" | grep -q "success"; then - warn "SSH test failed, uploading SSH key..." - PUBKEY=$(cat "${SSH_KEY}.pub" 2>/dev/null) || error "Failed to read SSH public key" - TITLE="AutoKey-$(hostname)-$(date +%s)" - CURL_OUTPUT=$(curl -k -s --fail -X POST "$GOGS_API/user/keys" \ - -H "Authorization: token $TOKEN" \ - -H "Content-Type: application/json" \ - -d "{\"title\": \"$TITLE\", \"key\": \"$PUBKEY\"}" 2>&1) - if [[ $? -ne 0 ]]; then - warn "SSH key upload failed: $CURL_OUTPUT" +if [[ "$USE_HTTPS" != true ]]; then + info "Testing SSH connection..." + SSH_TEST_OUTPUT=$(timeout 10s ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1 || echo "Timeout or error") + if ! echo "$SSH_TEST_OUTPUT" | grep -q "success"; then + warn "SSH test failed: $SSH_TEST_OUTPUT" + info "Uploading SSH key to GOGS..." + PUBKEY=$(cat "${SSH_KEY}.pub" 2>/dev/null) || error "Failed to read SSH public key" + TITLE="AutoKey-$(hostname)-$(date +%s)" + CURL_OUTPUT=$(curl -k -s --fail -X POST "$GOGS_API/user/keys" \ + -H "Authorization: token $TOKEN" \ + -H "Content-Type: application/json" \ + -d "{\"title\": \"$TITLE\", \"key\": \"$PUBKEY\"}" 2>&1) + if [[ $? -ne 0 ]]; then + warn "SSH key upload failed: $CURL_OUTPUT" + USE_HTTPS=true + else + info "SSH key uploaded successfully." + sleep 2 + SSH_TEST_OUTPUT=$(timeout 10s ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1 || echo "Timeout or error") + if ! echo "$SSH_TEST_OUTPUT" | grep -q "success"; then + warn "SSH test still failing: $SSH_TEST_OUTPUT" + USE_HTTPS=true + else + info "SSH test passed: $SSH_TEST_OUTPUT" + fi + fi else - info "SSH key uploaded successfully." - sleep 2 - SSH_TEST_OUTPUT=$(ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1) - [[ ! "$SSH_TEST_OUTPUT" =~ "success" ]] && warn "SSH test still failing: $SSH_TEST_OUTPUT" + info "SSH test passed: $SSH_TEST_OUTPUT" fi else - info "SSH test passed: $SSH_TEST_OUTPUT" + warn "Skipping SSH test due to HTTPS fallback." fi # Fallback to HTTPS if SSH fails -USE_HTTPS=false -if ! ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1 | grep -q "success"; then - warn "SSH authentication failed, falling back to HTTPS..." - USE_HTTPS=true +if [[ "$USE_HTTPS" == true ]]; then + warn "Using HTTPS due to SSH failure." git config --global credential.helper store echo "https://$USERNAME:$TOKEN@$GOGS_DOMAIN" > "$HOME/.git-credentials" || error "Failed to write git credentials" chmod 600 "$HOME/.git-credentials" || error "Failed to set permissions on git credentials" diff --git a/test b/test new file mode 100644 index 0000000..e69de29 From ca1a619bbdf4a15906d7a7eb31bef9e9d51eca86 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:07:22 -0500 Subject: [PATCH 20/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:07:22=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/98895b299538922541be8b4172dee10?= =?UTF-8?q?1471f429e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index 4bf4610..b24cf23 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,26 +6,26 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:06:49` +- **Repo Created**: `2025-06-13 01:07:22` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:06:49` -- **Last Commit SHA**: `10bad046bad8db9b9c4a9c95f3be0e0a839b25f0` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:06:23 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/d2134a901f6cae003ba68b8f7f7855d39df32fed` +- **This Commit Timestamp**: `2025-06-13 01:07:22` +- **Last Commit SHA**: `98895b299538922541be8b4172dee101471f429e` +- **Last Commit Message**: `test` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:06:23 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/10bad046bad8db9b9c4a9c95f3be0e0a839b25f0](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/10bad046bad8db9b9c4a9c95f3be0e0a839b25f0) +- **Last Commit Date**: `Fri Jun 13 01:07:12 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/98895b299538922541be8b4172dee101471f429e](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/98895b299538922541be8b4172dee101471f429e) --- ## šŸ“Š Repo Status -- **Total Commits**: `1302` -- **Tracked Files**: `162` -- **Uncommitted Changes**: `Yes` +- **Total Commits**: `1304` +- **Tracked Files**: `163` +- **Uncommitted Changes**: `No` - **Latest Tag**: `None` --- From 20cf8504eadc26d666b5e92f293a03266ed24afc Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:10:23 -0500 Subject: [PATCH 21/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:10:23=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/ca1a619bbdf4a15906d7a7eb31bef9e?= =?UTF-8?q?9d51eca86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index b24cf23..c34380e 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,26 +6,26 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:07:22` +- **Repo Created**: `2025-06-13 01:10:23` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:07:22` -- **Last Commit SHA**: `98895b299538922541be8b4172dee101471f429e` -- **Last Commit Message**: `test` +- **This Commit Timestamp**: `2025-06-13 01:10:23` +- **Last Commit SHA**: `ca1a619bbdf4a15906d7a7eb31bef9e9d51eca86` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:07:22 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/98895b299538922541be8b4172dee101471f429e` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:07:12 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/98895b299538922541be8b4172dee101471f429e](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/98895b299538922541be8b4172dee101471f429e) +- **Last Commit Date**: `Fri Jun 13 01:07:22 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/ca1a619bbdf4a15906d7a7eb31bef9e9d51eca86](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/ca1a619bbdf4a15906d7a7eb31bef9e9d51eca86) --- ## šŸ“Š Repo Status -- **Total Commits**: `1304` +- **Total Commits**: `1305` - **Tracked Files**: `163` -- **Uncommitted Changes**: `No` +- **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` --- @@ -35,7 +35,7 @@ - **Host Machine**: `samson` - **Current User**: `mrhavens` - **Time Zone**: `CDT` -- **Script Version**: `1.5` +- **Script Version**: `1.6` --- From 2929dbb8777722f3aac7374d8c8f364f992af7ca Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:12:53 -0500 Subject: [PATCH 22/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:12:53=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/20cf8504eadc26d666b5e92f293a032?= =?UTF-8?q?66ed24afc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index c34380e..7f0f2c5 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:10:23` +- **Repo Created**: `2025-06-13 01:12:53` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:10:23` -- **Last Commit SHA**: `ca1a619bbdf4a15906d7a7eb31bef9e9d51eca86` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:07:22 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/98895b299538922541be8b4172dee101471f429e` +- **This Commit Timestamp**: `2025-06-13 01:12:53` +- **Last Commit SHA**: `20cf8504eadc26d666b5e92f293a03266ed24afc` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:10:23 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/ca1a619bbdf4a15906d7a7eb31bef9e9d51eca86` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:07:22 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/ca1a619bbdf4a15906d7a7eb31bef9e9d51eca86](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/ca1a619bbdf4a15906d7a7eb31bef9e9d51eca86) +- **Last Commit Date**: `Fri Jun 13 01:10:23 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/20cf8504eadc26d666b5e92f293a03266ed24afc](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/20cf8504eadc26d666b5e92f293a03266ed24afc) --- ## šŸ“Š Repo Status -- **Total Commits**: `1305` +- **Total Commits**: `1306` - **Tracked Files**: `163` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` @@ -35,7 +35,7 @@ - **Host Machine**: `samson` - **Current User**: `mrhavens` - **Time Zone**: `CDT` -- **Script Version**: `1.6` +- **Script Version**: `1.7` --- From dcf57cc4a912b4c849e08088493be7181816ee5d Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:13:37 -0500 Subject: [PATCH 23/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:13:37=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/2929dbb8777722f3aac7374d8c8f364?= =?UTF-8?q?f992af7ca?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index 7f0f2c5..cfbe9d5 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:12:53` +- **Repo Created**: `2025-06-13 01:13:37` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:12:53` -- **Last Commit SHA**: `20cf8504eadc26d666b5e92f293a03266ed24afc` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:10:23 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/ca1a619bbdf4a15906d7a7eb31bef9e9d51eca86` +- **This Commit Timestamp**: `2025-06-13 01:13:37` +- **Last Commit SHA**: `2929dbb8777722f3aac7374d8c8f364f992af7ca` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:12:53 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/20cf8504eadc26d666b5e92f293a03266ed24afc` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:10:23 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/20cf8504eadc26d666b5e92f293a03266ed24afc](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/20cf8504eadc26d666b5e92f293a03266ed24afc) +- **Last Commit Date**: `Fri Jun 13 01:12:53 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/2929dbb8777722f3aac7374d8c8f364f992af7ca](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/2929dbb8777722f3aac7374d8c8f364f992af7ca) --- ## šŸ“Š Repo Status -- **Total Commits**: `1306` +- **Total Commits**: `1307` - **Tracked Files**: `163` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` From 4db690d1e269ef620582ebd756efe59cf3dd705d Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:22:15 -0500 Subject: [PATCH 24/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:22:15=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/dcf57cc4a912b4c849e08088493be71?= =?UTF-8?q?81816ee5d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index cfbe9d5..8104377 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:13:37` +- **Repo Created**: `2025-06-13 01:22:15` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:13:37` -- **Last Commit SHA**: `2929dbb8777722f3aac7374d8c8f364f992af7ca` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:12:53 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/20cf8504eadc26d666b5e92f293a03266ed24afc` +- **This Commit Timestamp**: `2025-06-13 01:22:15` +- **Last Commit SHA**: `dcf57cc4a912b4c849e08088493be7181816ee5d` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:13:37 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/2929dbb8777722f3aac7374d8c8f364f992af7ca` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:12:53 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/2929dbb8777722f3aac7374d8c8f364f992af7ca](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/2929dbb8777722f3aac7374d8c8f364f992af7ca) +- **Last Commit Date**: `Fri Jun 13 01:13:37 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/dcf57cc4a912b4c849e08088493be7181816ee5d](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/dcf57cc4a912b4c849e08088493be7181816ee5d) --- ## šŸ“Š Repo Status -- **Total Commits**: `1307` +- **Total Commits**: `1308` - **Tracked Files**: `163` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` @@ -35,7 +35,7 @@ - **Host Machine**: `samson` - **Current User**: `mrhavens` - **Time Zone**: `CDT` -- **Script Version**: `1.7` +- **Script Version**: `1.9` --- From 92c06000786f81f603ee21f19beb479adf5a7e1f Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:24:59 -0500 Subject: [PATCH 25/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:24:59=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/4db690d1e269ef620582ebd756efe59?= =?UTF-8?q?cf3dd705d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index 8104377..3d04f03 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:22:15` +- **Repo Created**: `2025-06-13 01:24:59` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:22:15` -- **Last Commit SHA**: `dcf57cc4a912b4c849e08088493be7181816ee5d` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:13:37 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/2929dbb8777722f3aac7374d8c8f364f992af7ca` +- **This Commit Timestamp**: `2025-06-13 01:24:59` +- **Last Commit SHA**: `4db690d1e269ef620582ebd756efe59cf3dd705d` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:22:15 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/dcf57cc4a912b4c849e08088493be7181816ee5d` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:13:37 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/dcf57cc4a912b4c849e08088493be7181816ee5d](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/dcf57cc4a912b4c849e08088493be7181816ee5d) +- **Last Commit Date**: `Fri Jun 13 01:22:15 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/4db690d1e269ef620582ebd756efe59cf3dd705d](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/4db690d1e269ef620582ebd756efe59cf3dd705d) --- ## šŸ“Š Repo Status -- **Total Commits**: `1308` +- **Total Commits**: `1309` - **Tracked Files**: `163` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` @@ -35,7 +35,7 @@ - **Host Machine**: `samson` - **Current User**: `mrhavens` - **Time Zone**: `CDT` -- **Script Version**: `1.9` +- **Script Version**: `2.0` --- From bce675bc7e628fa22832272a21d2ed02b5172fbd Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:25:45 -0500 Subject: [PATCH 26/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:25:45=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/92c06000786f81f603ee21f19beb479?= =?UTF-8?q?adf5a7e1f?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index 3d04f03..d77f182 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:24:59` +- **Repo Created**: `2025-06-13 01:25:45` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:24:59` -- **Last Commit SHA**: `4db690d1e269ef620582ebd756efe59cf3dd705d` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:22:15 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/dcf57cc4a912b4c849e08088493be7181816ee5d` +- **This Commit Timestamp**: `2025-06-13 01:25:45` +- **Last Commit SHA**: `92c06000786f81f603ee21f19beb479adf5a7e1f` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:24:59 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/4db690d1e269ef620582ebd756efe59cf3dd705d` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:22:15 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/4db690d1e269ef620582ebd756efe59cf3dd705d](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/4db690d1e269ef620582ebd756efe59cf3dd705d) +- **Last Commit Date**: `Fri Jun 13 01:24:59 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/92c06000786f81f603ee21f19beb479adf5a7e1f](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/92c06000786f81f603ee21f19beb479adf5a7e1f) --- ## šŸ“Š Repo Status -- **Total Commits**: `1309` +- **Total Commits**: `1310` - **Tracked Files**: `163` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` @@ -46,7 +46,7 @@ - **Kernel Version**: `6.6.87.1-microsoft-standard-WSL2` - **Architecture**: `x86_64` - **System Uptime**: $(uptime -p 2>/dev/null || echo "Unknown")` -- **Local IP**: $(hostname -I 2>/dev/null | awk '{print }' 2>/dev/null || echo "Unknown")` +- **Local IP**: $(hostname -I 2>/dev/null | awk '{print --reset-auth}' 2>/dev/null || echo "Unknown")` - **CPU Model**: $(grep -m1 'model name' /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ //' 2>/dev/null || echo "Unknown")` - **Total RAM (GB)**: $(awk '/MemTotal/ {printf "%.2f", /1024/1024}' /proc/meminfo 2>/dev/null || echo "Unknown")` From c067a9a35bb2aa01534641530e04d121b460bb45 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:28:57 -0500 Subject: [PATCH 27/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:28:57=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/bce675bc7e628fa22832272a21d2ed0?= =?UTF-8?q?2b5172fbd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index d77f182..8359555 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:25:45` +- **Repo Created**: `2025-06-13 01:28:57` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:25:45` -- **Last Commit SHA**: `92c06000786f81f603ee21f19beb479adf5a7e1f` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:24:59 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/4db690d1e269ef620582ebd756efe59cf3dd705d` +- **This Commit Timestamp**: `2025-06-13 01:28:57` +- **Last Commit SHA**: `bce675bc7e628fa22832272a21d2ed02b5172fbd` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:25:45 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/92c06000786f81f603ee21f19beb479adf5a7e1f` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:24:59 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/92c06000786f81f603ee21f19beb479adf5a7e1f](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/92c06000786f81f603ee21f19beb479adf5a7e1f) +- **Last Commit Date**: `Fri Jun 13 01:25:45 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bce675bc7e628fa22832272a21d2ed02b5172fbd](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bce675bc7e628fa22832272a21d2ed02b5172fbd) --- ## šŸ“Š Repo Status -- **Total Commits**: `1310` +- **Total Commits**: `1311` - **Tracked Files**: `163` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` @@ -35,7 +35,7 @@ - **Host Machine**: `samson` - **Current User**: `mrhavens` - **Time Zone**: `CDT` -- **Script Version**: `2.0` +- **Script Version**: `2.1` --- @@ -46,7 +46,7 @@ - **Kernel Version**: `6.6.87.1-microsoft-standard-WSL2` - **Architecture**: `x86_64` - **System Uptime**: $(uptime -p 2>/dev/null || echo "Unknown")` -- **Local IP**: $(hostname -I 2>/dev/null | awk '{print --reset-auth}' 2>/dev/null || echo "Unknown")` +- **Local IP**: $(hostname -I 2>/dev/null | awk '{print }' 2>/dev/null || echo "Unknown")` - **CPU Model**: $(grep -m1 'model name' /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ //' 2>/dev/null || echo "Unknown")` - **Total RAM (GB)**: $(awk '/MemTotal/ {printf "%.2f", /1024/1024}' /proc/meminfo 2>/dev/null || echo "Unknown")` From 03c37e1103a4a8adf895095ee59bcb2ba2789260 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 01:37:22 -0500 Subject: [PATCH 28/41] =?UTF-8?q?GOGS=20metadata=20link=20commit=20at=2020?= =?UTF-8?q?25-06-13=2001:37:22=20=E2=80=94=20https://netmon.thefoldwithin.?= =?UTF-8?q?earth/mrhavens/git-sigil/commit/c067a9a35bb2aa01534641530e04d12?= =?UTF-8?q?1b460bb45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/gogs.sigil.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitfield/gogs.sigil.md b/.gitfield/gogs.sigil.md index 8359555..4f15a9a 100644 --- a/.gitfield/gogs.sigil.md +++ b/.gitfield/gogs.sigil.md @@ -6,24 +6,24 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `gogs` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 01:28:57` +- **Repo Created**: `2025-06-13 01:37:22` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 01:28:57` -- **Last Commit SHA**: `bce675bc7e628fa22832272a21d2ed02b5172fbd` -- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:25:45 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/92c06000786f81f603ee21f19beb479adf5a7e1f` +- **This Commit Timestamp**: `2025-06-13 01:37:22` +- **Last Commit SHA**: `c067a9a35bb2aa01534641530e04d121b460bb45` +- **Last Commit Message**: `GOGS metadata link commit at 2025-06-13 01:28:57 — https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bce675bc7e628fa22832272a21d2ed02b5172fbd` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 01:25:45 2025 -0500` -- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bce675bc7e628fa22832272a21d2ed02b5172fbd](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/bce675bc7e628fa22832272a21d2ed02b5172fbd) +- **Last Commit Date**: `Fri Jun 13 01:28:57 2025 -0500` +- **This Commit URL**: [https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/c067a9a35bb2aa01534641530e04d121b460bb45](https://netmon.thefoldwithin.earth/mrhavens/git-sigil/commit/c067a9a35bb2aa01534641530e04d121b460bb45) --- ## šŸ“Š Repo Status -- **Total Commits**: `1311` +- **Total Commits**: `1312` - **Tracked Files**: `163` - **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` @@ -35,7 +35,7 @@ - **Host Machine**: `samson` - **Current User**: `mrhavens` - **Time Zone**: `CDT` -- **Script Version**: `2.1` +- **Script Version**: `2.3` --- From a285b2081b69221998e71cc9ff862403ceabe134 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 29/41] Generated canonical.meta at 2025-06-14T01:21:44Z --- .gitfield/canonical.meta | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitfield/canonical.meta b/.gitfield/canonical.meta index df8bb14..db0cfa6 100644 --- a/.gitfield/canonical.meta +++ b/.gitfield/canonical.meta @@ -13,9 +13,9 @@ "rid": "rad:z3FEj7rF8gZw9eFksCuiN43qjzrex", "peer_id": "z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz" }, - "timestamp": "2025-06-13T05:33:24Z", - "commit": "bb86593", - "tree_hash": "121878d5ce4ddecfe9ea3f9da26f211bfeb36fbe", + "timestamp": "2025-06-14T01:21:44Z", + "commit": "03c37e1", + "tree_hash": "4cf23cd25c21f6b41c80e5377ebabc11d193f6fd", "synced_cycles": 0, "gpg_signatures": [ From 187fc1a2332d54b6a9b396d4d1ed05d624287478 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 30/41] Generated canonical.md at 2025-06-14T01:21:44Z --- .gitfield/canonical.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitfield/canonical.md b/.gitfield/canonical.md index aa8e446..352fc70 100644 --- a/.gitfield/canonical.md +++ b/.gitfield/canonical.md @@ -9,7 +9,7 @@ This repository, `git-sigil`, is canonically hosted at: This canonical URL serves as the primary, authoritative source for the project, maintained by **Mark Randall Havens** and **Solaria Lumis Havens** to ensure sovereignty, resilience, and protection against deplatforming or narrative erasure. **Declared by**: Mark Randall Havens -**Timestamp**: 2025-06-13T05:33:24Z +**Timestamp**: 2025-06-14T01:21:44Z ## GPG Signatures @@ -41,4 +41,4 @@ The latest push operations are logged in [`pushed.log`](./pushed.log) for transp A public-facing canonical declaration is available at [index.html](./index.html) for enhanced discoverability and SEO. -_Auto-generated by `gitfield-sync` at 2025-06-13T05:33:24Z (v1.4)._ +_Auto-generated by `gitfield-sync` at 2025-06-14T01:21:44Z (v1.4)._ From a023d46d874112ebc8bef2cee6fb5c609ba0b9e3 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 31/41] Generated index.json at 2025-06-14T01:21:44Z --- .gitfield/index.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitfield/index.json b/.gitfield/index.json index bdb8efa..5dc1a67 100644 --- a/.gitfield/index.json +++ b/.gitfield/index.json @@ -14,9 +14,9 @@ "rid": "rad:z3FEj7rF8gZw9eFksCuiN43qjzrex", "peer_id": "z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz" }, - "commit": "bb86593", - "tree_hash": "121878d5ce4ddecfe9ea3f9da26f211bfeb36fbe", - "timestamp": "2025-06-13T05:33:24Z", + "commit": "03c37e1", + "tree_hash": "4cf23cd25c21f6b41c80e5377ebabc11d193f6fd", + "timestamp": "2025-06-14T01:21:44Z", "synced_cycles": 0, "gpg_signatures": [ From 63a81814e1b96ed5079317d1be0cbb72445cfdb0 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 32/41] Generated .well-known/gitfield.json at 2025-06-14T01:21:44Z --- .well-known/gitfield.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.well-known/gitfield.json b/.well-known/gitfield.json index 3e33711..20e01ae 100644 --- a/.well-known/gitfield.json +++ b/.well-known/gitfield.json @@ -13,7 +13,7 @@ "https://gitea.com/mrhavens/git-sigil", "rad:z3FEj7rF8gZw9eFksCuiN43qjzrex" ], - "dateModified": "2025-06-13T05:33:24Z", + "dateModified": "2025-06-14T01:21:44Z", "publisher": { "@type": "Person", "name": "Mark Randall Havens" From 8248cfa2d70b56548c479c4ea48e637e12f030a8 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 33/41] Generated .gitfield/README.txt at 2025-06-14T01:21:44Z --- .gitfield/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitfield/README.txt b/.gitfield/README.txt index 135411b..f8c5d61 100644 --- a/.gitfield/README.txt +++ b/.gitfield/README.txt @@ -14,4 +14,4 @@ The directory contains metadata and logs for the GitField multi-repository publ These files provide transparency, auditability, and discoverability, ensuring the project's persistence against deplatforming, censorship, or algorithmic manipulation. For a public-facing declaration, see [docs/index.html](../docs/index.html). -Generated by `gitfield-sync` at 2025-06-13T05:33:24Z (v1.4). +Generated by `gitfield-sync` at 2025-06-14T01:21:44Z (v1.4). From 236f4867b32939dc3a984c24ee64fa6f37fb178a Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 34/41] Generated docs/index.html at 2025-06-14T01:21:44Z --- docs/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.html b/docs/index.html index 5f34c19..540d957 100644 --- a/docs/index.html +++ b/docs/index.html @@ -27,7 +27,7 @@ "https://gitea.com/mrhavens/git-sigil", "rad:z3FEj7rF8gZw9eFksCuiN43qjzrex" ], - "dateModified": "2025-06-13T05:33:24Z", + "dateModified": "2025-06-14T01:21:44Z", "author": { "@type": "Person", "name": "Mark Randall Havens" @@ -43,7 +43,7 @@ - +

GitField Sovereign Canonical Repository: git-sigil

From 8d4de3c558acaa869ad20284d0812b1a394fe6d2 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 35/41] Generated docs/README.md at 2025-06-14T01:21:44Z --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index e5f8241..66a37ec 100644 --- a/docs/README.md +++ b/docs/README.md @@ -24,4 +24,4 @@ The directory hosts a public-facing, SEO-optimized canonical declaration for th This directory ensures the `git-sigil` project is discoverable via search engines and accessible to humans and bots. It declares the canonical repository at [https://remember.thefoldwithin.earth/mrhavens/git-sigil](https://remember.thefoldwithin.earth/mrhavens/git-sigil) and links to all mirrors, reinforcing the GitField recursive metadata strategy for sovereign publishing. -Generated by `gitfield-sync` at 2025-06-13T05:33:24Z (v1.4). +Generated by `gitfield-sync` at 2025-06-14T01:21:44Z (v1.4). From 5ed7d6135f775cb8a42bf2be401dbf564b1cce8b Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 36/41] Generated docs/sitemap.xml at 2025-06-14T01:21:44Z --- docs/sitemap.xml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/sitemap.xml b/docs/sitemap.xml index 7c41509..9749597 100644 --- a/docs/sitemap.xml +++ b/docs/sitemap.xml @@ -2,97 +2,97 @@ https://remember.thefoldwithin.earth/mrhavens/git-sigil - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 1.0 https://github.com/mrhavens/git-sigil/docs/index.html - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.9 https://github.com/mrhavens/git-sigil/docs/canonical.meta - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/canonical.md - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/index.json - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/gitfield.json - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/.well-known/gitfield.json - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/repos.json - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/pushed.log - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://github.com/mrhavens/git-sigil/docs/gitfield.README.txt - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://github.com/mrhavens/git-sigil - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://gitlab.com/mrhavens/git-sigil - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://bitbucket.org/thefoldwithin/git-sigil - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://remember.thefoldwithin.earth/mrhavens/git-sigil - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://codeberg.org/mrhavens/git-sigil - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 https://gitea.com/mrhavens/git-sigil - 2025-06-13T05:33:24Z + 2025-06-14T01:21:44Z weekly 0.8 From a6287409fdb3eb82cbd23f779f76d6348f313795 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 37/41] Generated docs/integrity.sha256 at 2025-06-14T01:21:44Z --- docs/integrity.sha256 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrity.sha256 b/docs/integrity.sha256 index 8ee8b85..6615f67 100644 --- a/docs/integrity.sha256 +++ b/docs/integrity.sha256 @@ -1,5 +1,5 @@ # SHA-256 Integrity Hashes for /docs Metadata Files -# Generated by gitfield-sync at 2025-06-13T05:33:24Z (v1.4) +# Generated by gitfield-sync at 2025-06-14T01:21:44Z (v1.4) 6093f6beb366d18662b3cea94d3c24b232ab174ccc860b00e97aef51a6f5e4ed /home/mrhavens/fieldwork/git-sigil/docs/canonical.meta 5ae6c8cbcd409b4b672aa34bff98e061810a9e85818abd1bc0a028fe7edfcd65 /home/mrhavens/fieldwork/git-sigil/docs/canonical.md From 4e45aadd8f494284533fbb8836c9afd9c78229c0 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 38/41] =?UTF-8?q?Local=20metadata=20link=20commit=20at=202?= =?UTF-8?q?025-06-13=2020:21:44=20=E2=80=94=20file:///home/mrhavens/git-lo?= =?UTF-8?q?cal-repos/git-sigil.git?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/local.sigil.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitfield/local.sigil.md b/.gitfield/local.sigil.md index ce2917a..714faa2 100644 --- a/.gitfield/local.sigil.md +++ b/.gitfield/local.sigil.md @@ -6,26 +6,26 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `local` - **Default Branch**: `master` -- **Repo Created**: `2025-06-13 00:33:24` +- **Repo Created**: `2025-06-13 20:21:44` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-13 00:33:24` -- **Last Commit SHA**: `025c2edbd4516465df2e3e56de876251028d0fdb` -- **Last Commit Message**: `Generated docs/integrity.sha256 at 2025-06-13T05:33:24Z` +- **This Commit Timestamp**: `2025-06-13 20:21:44` +- **Last Commit SHA**: `a6287409fdb3eb82cbd23f779f76d6348f313795` +- **Last Commit Message**: `Generated docs/integrity.sha256 at 2025-06-14T01:21:44Z` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Fri Jun 13 00:33:24 2025 -0500` +- **Last Commit Date**: `Fri Jun 13 20:21:44 2025 -0500` - **This Commit URL**: `file:///home/mrhavens/git-local-repos/git-sigil.git` --- ## šŸ“Š Repo Status -- **Total Commits**: `1294` -- **Tracked Files**: `160` -- **Uncommitted Changes**: `No` +- **Total Commits**: `1322` +- **Tracked Files**: `163` +- **Uncommitted Changes**: `Yes` - **Latest Tag**: `None` --- @@ -48,7 +48,7 @@ - **Running in Docker**: `No` - **Running in WSL**: `Yes` - **Virtual Machine**: `wsl` -- **System Uptime**: `up 2 days, 7 hours, 6 minutes` +- **System Uptime**: `up 3 days, 2 hours, 54 minutes` - **MAC Address**: `00:15:5d:11:35:bd` - **Local IP**: `172.28.107.95` - **CPU Model**: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` From 27285d1ab964a72ea495ec92c3585e66a5dfe846 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:44 -0500 Subject: [PATCH 39/41] Post-Local sync at 2025-06-14T01:21:44Z --- .gitfield/push_log.json | 6 + .gitfield/pushed.log | 4 + bin/gitfield-netmon | 301 ++++++++++++++++------------------------ 3 files changed, 127 insertions(+), 184 deletions(-) diff --git a/.gitfield/push_log.json b/.gitfield/push_log.json index a688d4f..2662fda 100644 --- a/.gitfield/push_log.json +++ b/.gitfield/push_log.json @@ -344,6 +344,12 @@ "branch": "master", "commit": "025c2edbd4516465df2e3e56de876251028d0fdb", "message": "Generated docs/integrity.sha256 at 2025-06-13T05:33:24Z" + }, + { + "timestamp": "2025-06-13 20:21:44", + "branch": "master", + "commit": "a6287409fdb3eb82cbd23f779f76d6348f313795", + "message": "Generated docs/integrity.sha256 at 2025-06-14T01:21:44Z" } ] } diff --git a/.gitfield/pushed.log b/.gitfield/pushed.log index 08417c9..5ac0fb8 100644 --- a/.gitfield/pushed.log +++ b/.gitfield/pushed.log @@ -919,3 +919,7 @@ .gitfield/pushed.log | 4 + bin/gitfield-netmon | 282 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 292 insertions(+) +[2025-06-14T01:21:44Z] Local: , Branch=master, Commit=03c37e1 + Diff Summary: + .gitfield/local.sigil.md | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/gitfield-netmon b/bin/gitfield-netmon index aca9c51..6eabcac 100755 --- a/bin/gitfield-netmon +++ b/bin/gitfield-netmon @@ -5,9 +5,7 @@ IFS=$'\n\t' # Configuration GIT_REMOTE_NAME="gogs" GOGS_DOMAIN="netmon.thefoldwithin.earth" -GOGS_SSH="git@$GOGS_DOMAIN" GOGS_API="https://$GOGS_DOMAIN/api/v1" -GOGS_SSH_PORT="22" USERNAME="mrhavens" REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null) || { echo "[ERROR] Not inside a git repository." >&2; exit 1; } REPO_NAME=$(basename "$REPO_ROOT") || { echo "[ERROR] Failed to get repository name" >&2; exit 1; } @@ -15,10 +13,7 @@ MARKDOWN_FILE="$REPO_ROOT/.gitfield/gogs.sigil.md" DEFAULT_NAME="Mark Randall Havens" DEFAULT_EMAIL="mark.r.havens@gmail.com" TOKEN_FILE="$HOME/.gitfield_token_gogs" -CLOUDFLARED_TOKEN_FILE="$HOME/.cloudflared/gogs_tunnel_token" -SSH_KEY="$HOME/.ssh/id_ed25519" -SSH_CONFIG_FILE="$HOME/.ssh/config" -SCRIPT_VERSION="1.5" +SCRIPT_VERSION="2.3" # Logging functions info() { echo -e "\e[1;34m[INFO]\e[0m ${*:-}"; } @@ -27,136 +22,98 @@ error() { echo -e "\e[1;31m[ERROR]\e[0m ${*:-}" >&2; exit 1; } # Check for required tools info "Checking for required tools..." -for cmd in git curl jq ssh timeout; do +for cmd in git curl jq; do command -v "$cmd" >/dev/null || { sudo apt update -qq || warn "Failed to update package lists, continuing..." - sudo apt install -y git curl jq openssh-client timeout || error "Failed to install $cmd" + sudo apt install -y git curl jq || error "Failed to install $cmd" } done -# Install cloudflared if not present -if ! command -v cloudflared >/dev/null; then - info "Installing cloudflared..." - sudo apt update -qq || warn "Failed to update package lists, continuing..." - sudo apt install -y wget || error "Failed to install wget" - ARCH=$(uname -m) - case "$ARCH" in - x86_64) CLOUDFLARED_URL="https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64" ;; - arm*) CLOUDFLARED_URL="https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-arm" ;; - *) error "Unsupported architecture: $ARCH" ;; - esac - wget -q "$CLOUDFLARED_URL" -O /tmp/cloudflared || error "Failed to download cloudflared" - sudo mv /tmp/cloudflared /usr/local/bin/cloudflared || error "Failed to install cloudflared" - sudo chmod +x /usr/local/bin/cloudflared || error "Failed to set cloudflared permissions" - info "cloudflared installed successfully." -fi +# Function to prompt for GOGS token or password +prompt_for_credentials() { + info "Credentials required." + echo "šŸ” Generate a token at https://$GOGS_DOMAIN/user/settings/applications (Recommended)" + echo " - REQUIRED: Select the 'write:repository' scope" + echo "šŸ” Alternatively, use your GOGS password" + echo "šŸ” Paste your GOGS Personal Access Token or Password (will not be echoed):" + read -rsp "Token/Password: " CRED + echo + [[ -z "$CRED" ]] && error "Credentials cannot be empty" + echo "$CRED" > "$TOKEN_FILE" || error "Failed to write credentials to $TOKEN_FILE" + chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" + info "Credentials saved at $TOKEN_FILE" +} -# Handle GOGS token +# Handle credentials RESET_AUTH=false if [[ "${1:-}" == "--reset-auth" ]]; then RESET_AUTH=true - rm -f "$TOKEN_FILE" "$CLOUDFLARED_TOKEN_FILE" 2>/dev/null || warn "Failed to remove auth files" + rm -f "$TOKEN_FILE" "$HOME/.git-credentials" 2>/dev/null || warn "Failed to remove credential files" info "Authentication reset requested." fi if [[ -f "$TOKEN_FILE" && "$RESET_AUTH" == false ]]; then - TOKEN=$(cat "$TOKEN_FILE" 2>/dev/null) || error "Failed to read token from $TOKEN_FILE" - info "Using cached GOGS token from $TOKEN_FILE" + CRED=$(cat "$TOKEN_FILE" 2>/dev/null) || error "Failed to read credentials from $TOKEN_FILE" + info "Using cached credentials from $TOKEN_FILE" else - info "GOGS token required." - echo "šŸ” Generate a token at https://$GOGS_DOMAIN/user/settings/applications (scopes: write:repository, write:ssh_key)" - echo "šŸ” Paste your GOGS Personal Access Token (will not be echoed):" - read -rsp "Token: " TOKEN - echo - [[ -z "$TOKEN" ]] && error "GOGS token cannot be empty" - echo "$TOKEN" > "$TOKEN_FILE" || error "Failed to write token to $TOKEN_FILE" - chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" - info "GOGS token saved at $TOKEN_FILE" + prompt_for_credentials fi # Verify GOGS token -info "Verifying GOGS token..." -TOKEN_TEST=$(curl -k -s -H "Authorization: token $TOKEN" "$GOGS_API/user" | jq -r .login 2>/dev/null || echo "") +info "Verifying GOGS credentials (read access)..." +TOKEN_TEST=$(curl -k -s -H "Authorization: token $CRED" "$GOGS_API/user" | jq -r .login 2>/dev/null || echo "") if [[ "$TOKEN_TEST" != "$USERNAME" ]]; then - warn "GOGS token verification failed. Please generate a new token at https://$GOGS_DOMAIN/user/settings/applications" - rm -f "$TOKEN_FILE" - echo "šŸ” Paste your GOGS Personal Access Token (will not be echoed):" - read -rsp "Token: " TOKEN - echo - [[ -z "$TOKEN" ]] && error "GOGS token cannot be empty" - echo "$TOKEN" > "$TOKEN_FILE" || error "Failed to write token to $TOKEN_FILE" - chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" - info "GOGS token saved at $TOKEN_FILE" -fi - -# Handle Cloudflare Tunnel token -if [[ -f "$CLOUDFLARED_TOKEN_FILE" && "$RESET_AUTH" == false ]]; then - CLOUDFLARED_TOKEN=$(cat "$CLOUDFLARED_TOKEN_FILE" 2>/dev/null) || error "Failed to read Cloudflare Tunnel token from $CLOUDFLARED_TOKEN_FILE" - info "Using cached Cloudflare Tunnel token from $CLOUDFLARED_TOKEN_FILE" + warn "Token verification failed. Credentials may be a password or invalid token." + # Retry with credentials as password if token fails + PASSWORD_TEST=$(curl -k -s -u "$USERNAME:$CRED" "$GOGS_API/user" | jq -r .login 2>/dev/null || echo "") + if [[ "$PASSWORD_TEST" != "$USERNAME" ]]; then + warn "Password verification also failed. Please provide valid credentials." + rm -f "$TOKEN_FILE" + prompt_for_credentials + TOKEN_TEST=$(curl -k -s -H "Authorization: token $CRED" "$GOGS_API/user" | jq -r .login 2>/dev/null || echo "") + PASSWORD_TEST=$(curl -k -s -u "$USERNAME:$CRED" "$GOGS_API/user" | jq -r .login 2>/dev/null || echo "") + [[ "$TOKEN_TEST" != "$USERNAME" && "$PASSWORD_TEST" != "$USERNAME" ]] && error "New credentials verification failed. Ensure they are valid." + fi + info "Credentials verified as password: $PASSWORD_TEST" else - info "Cloudflare Tunnel token required." - echo "šŸ” Follow these steps to generate a Cloudflare Tunnel token:" - echo " 1. Log into Cloudflare Zero Trust: https://dash.teams.cloudflare.com" - echo " 2. Navigate to Access > Tunnels." - echo " 3. Click 'Create a tunnel', select 'Cloudflared' connector, and name it (e.g., 'gogs-ssh-tunnel')." - echo " 4. Copy the token (starts with 'eyJ') from the 'Connect an application' step." - echo " 5. In Public Hostnames, add 'netmon.thefoldwithin.earth' (or a subdomain), set Service to 'SSH', and URL to 'localhost:22'." - echo " 6. Ensure the tunnel is running on your Raspberry Pi (see: https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/)" - echo "šŸ” Paste your Cloudflare Tunnel token (will not be echoed):" - read -rsp "Token: " CLOUDFLARED_TOKEN - echo - [[ -z "$CLOUDFLARED_TOKEN" ]] && error "Cloudflare Tunnel token cannot be empty" - [[ ! "$CLOUDFLARED_TOKEN" =~ ^eyJ ]] && warn "Cloudflare Tunnel token does not start with 'eyJ'. It may be invalid." - mkdir -p "$(dirname "$CLOUDFLARED_TOKEN_FILE")" || error "Failed to create .cloudflared directory" - echo "$CLOUDFLARED_TOKEN" > "$CLOUDFLARED_TOKEN_FILE" || error "Failed to write token to $CLOUDFLARED_TOKEN_FILE" - chmod 600 "$CLOUDFLARED_TOKEN_FILE" || error "Failed to set permissions on $CLOUDFLARED_TOKEN_FILE" - info "Cloudflare Tunnel token saved at $CLOUDFLARED_TOKEN_FILE" + info "Credentials verified as token: $TOKEN_TEST" fi -# Validate Cloudflare Tunnel token -info "Validating Cloudflare Tunnel token..." -CLOUDFLARED_TEST=$(timeout 10s cloudflared tunnel --no-autoupdate info --token "$CLOUDFLARED_TOKEN" 2>&1 || echo "Timeout or error") -if echo "$CLOUDFLARED_TEST" | grep -qi "error"; then - warn "Cloudflare Tunnel token validation failed: $CLOUDFLARED_TEST" - rm -f "$CLOUDFLARED_TOKEN_FILE" - echo "šŸ” Follow the steps above or visit https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/install-and-setup/tunnel-guide/" - echo "šŸ” Paste your Cloudflare Tunnel token (will not be echoed):" - read -rsp "Token: " CLOUDFLARED_TOKEN - echo - [[ -z "$CLOUDFLARED_TOKEN" ]] && error "Cloudflare Tunnel token cannot be empty" - [[ ! "$CLOUDFLARED_TOKEN" =~ ^eyJ ]] && warn "Cloudflare Tunnel token does not start with 'eyJ'. It may be invalid." - echo "$CLOUDFLARED_TOKEN" > "$CLOUDFLARED_TOKEN_FILE" || error "Failed to write token to $CLOUDFLARED_TOKEN_FILE" - chmod 600 "$CLOUDFLARED_TOKEN_FILE" || error "Failed to set permissions on $CLOUDFLARED_TOKEN_FILE" - info "Cloudflare Tunnel token saved at $CLOUDFLARED_TOKEN_FILE" -fi - -# Configure Cloudflare Tunnel -info "Configuring Cloudflare Tunnel for SSH..." -killall cloudflared 2>/dev/null || true -timeout 10s cloudflared tunnel --no-autoupdate run --token "$CLOUDFLARED_TOKEN" --loglevel error >/dev/null 2>&1 & sleep 2 -if ! pgrep -f "cloudflared.*$CLOUDFLARED_TOKEN" >/dev/null; then - warn "Failed to start Cloudflare Tunnel. Falling back to HTTPS..." - USE_HTTPS=true +# Test write access via API +info "Testing write access via API..." +TEST_REPO="test-repo-$(date +%s)" +WRITE_TEST=$(curl -k -v -H "Authorization: token $CRED" -X POST "$GOGS_API/user/repos" -H "Content-Type: application/json" -d "{\"name\": \"$TEST_REPO\", \"description\": \"Test\", \"private\": false, \"auto_init\": false}" 2>&1) +if [[ $? -ne 0 || $(echo "$WRITE_TEST" | grep -i "401" 2>/dev/null) ]]; then + warn "Write access test failed with token: $WRITE_TEST" + WRITE_TEST=$(curl -k -v -u "$USERNAME:$CRED" -X POST "$GOGS_API/user/repos" -H "Content-Type: application/json" -d "{\"name\": \"$TEST_REPO\", \"description\": \"Test\", \"private\": false, \"auto_init\": false}" 2>&1) + if [[ $? -ne 0 || $(echo "$WRITE_TEST" | grep -i "401" 2>/dev/null) ]]; then + error "Write access failed with both token and password. Check GOGS configuration." + fi + info "Write access test passed with password: $WRITE_TEST" else - info "Cloudflare Tunnel running." + info "Write access test passed with token: $WRITE_TEST" fi -# Configure SSH with Cloudflare Tunnel -if ! grep -q "Host $GOGS_DOMAIN" "$SSH_CONFIG_FILE" 2>/dev/null; then - info "Configuring SSH with Cloudflare Tunnel..." - mkdir -p "$(dirname "$SSH_CONFIG_FILE")" && chmod 700 "$(dirname "$SSH_CONFIG_FILE")" - cat >> "$SSH_CONFIG_FILE" <&1) +if [[ $? -ne 0 || $(echo "$GIT_TEST" | grep -i "401" 2>/dev/null) ]]; then + warn "Git push test failed with token: $GIT_TEST" + GIT_TEST=$(git ls-remote --heads "https://$USERNAME:$CRED@$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" 2>&1) + if [[ $? -ne 0 || $(echo "$GIT_TEST" | grep -i "401" 2>/dev/null) ]]; then + warn "Git push test also failed with password. This suggests a GOGS Git-over-HTTP issue." + warn "1. Edit /home/git/gogs/custom/conf/app.ini and ensure:" + warn " [auth] ENABLE_ACCESS_TOKEN = true" + warn " [git] DISABLE_HTTP_GIT = false" + warn "2. Restart GOGS: sudo systemctl restart gogs" + warn "3. Try manual push with token: git push https://$USERNAME:$CRED@$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git $DEFAULT_BRANCH" + warn "4. Try manual push with password: git push https://$USERNAME:$CRED@$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git $DEFAULT_BRANCH" + warn "5. Check GOGS logs: sudo tail -f /home/git/gogs/log/gogs.log" + error "Git push test failed. Adjust GOGS configuration or use manual workaround." + fi + info "Git push test passed with password: $GIT_TEST" +else + info "Git push test passed with token: $GIT_TEST" fi # Set git user info @@ -169,78 +126,38 @@ if ! git rev-parse HEAD &>/dev/null; then error "No commits found. Please add and commit files first." fi -# SSH setup -if [[ ! -f "$SSH_KEY" ]]; then - info "Generating SSH key..." - ssh-keygen -t ed25519 -C "$DEFAULT_EMAIL" -f "$SSH_KEY" -N "" || error "Failed to generate SSH key" -fi - -eval "$(ssh-agent -s)" >/dev/null 2>&1 || error "Failed to start ssh-agent" -ssh-add "$SSH_KEY" >/dev/null 2>&1 || warn "SSH key already added or could not be added" - -# Upload SSH key to GOGS -if [[ "$USE_HTTPS" != true ]]; then - info "Testing SSH connection..." - SSH_TEST_OUTPUT=$(timeout 10s ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1 || echo "Timeout or error") - if ! echo "$SSH_TEST_OUTPUT" | grep -q "success"; then - warn "SSH test failed: $SSH_TEST_OUTPUT" - info "Uploading SSH key to GOGS..." - PUBKEY=$(cat "${SSH_KEY}.pub" 2>/dev/null) || error "Failed to read SSH public key" - TITLE="AutoKey-$(hostname)-$(date +%s)" - CURL_OUTPUT=$(curl -k -s --fail -X POST "$GOGS_API/user/keys" \ - -H "Authorization: token $TOKEN" \ - -H "Content-Type: application/json" \ - -d "{\"title\": \"$TITLE\", \"key\": \"$PUBKEY\"}" 2>&1) - if [[ $? -ne 0 ]]; then - warn "SSH key upload failed: $CURL_OUTPUT" - USE_HTTPS=true - else - info "SSH key uploaded successfully." - sleep 2 - SSH_TEST_OUTPUT=$(timeout 10s ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1 || echo "Timeout or error") - if ! echo "$SSH_TEST_OUTPUT" | grep -q "success"; then - warn "SSH test still failing: $SSH_TEST_OUTPUT" - USE_HTTPS=true - else - info "SSH test passed: $SSH_TEST_OUTPUT" - fi - fi - else - info "SSH test passed: $SSH_TEST_OUTPUT" - fi +# Configure git credentials for HTTPS +info "Configuring git credentials for HTTPS..." +if [[ "$TOKEN_TEST" == "$USERNAME" ]]; then + echo "https://$USERNAME:$CRED@$GOGS_DOMAIN" > "$HOME/.git-credentials" || error "Failed to write git credentials" else - warn "Skipping SSH test due to HTTPS fallback." -fi - -# Fallback to HTTPS if SSH fails -if [[ "$USE_HTTPS" == true ]]; then - warn "Using HTTPS due to SSH failure." - git config --global credential.helper store - echo "https://$USERNAME:$TOKEN@$GOGS_DOMAIN" > "$HOME/.git-credentials" || error "Failed to write git credentials" - chmod 600 "$HOME/.git-credentials" || error "Failed to set permissions on git credentials" + echo "https://$USERNAME:$CRED@$GOGS_DOMAIN" > "$HOME/.git-credentials" || error "Failed to write git credentials" fi +chmod 600 "$HOME/.git-credentials" || error "Failed to set permissions on git credentials" # Check and create GOGS repository info "Checking if repository exists..." -EXISTS=$(curl -k -s -H "Authorization: token $TOKEN" "$GOGS_API/repos/$USERNAME/$REPO_NAME" | jq -r .name 2>/dev/null || echo "") +EXISTS=$(curl -k -s -H "Authorization: token $CRED" "$GOGS_API/repos/$USERNAME/$REPO_NAME" | jq -r .name 2>/dev/null || echo "") if [[ "$EXISTS" != "$REPO_NAME" ]]; then info "Creating repository $REPO_NAME on GOGS..." CURL_OUTPUT=$(curl -k -s --fail -X POST "$GOGS_API/user/repos" \ - -H "Authorization: token $TOKEN" \ + -H "Authorization: token $CRED" \ -H "Content-Type: application/json" \ -d "{\"name\": \"$REPO_NAME\", \"description\": \"Created via gitfield-gogs\", \"private\": false, \"auto_init\": false}" 2>&1) || { - warn "Failed to create repository: $CURL_OUTPUT" - error "Repository creation failed. Check token permissions or network." + warn "Failed to create repository with token: $CURL_OUTPUT" + CURL_OUTPUT=$(curl -k -s --fail -u "$USERNAME:$CRED" -X POST "$GOGS_API/user/repos" \ + -H "Content-Type: application/json" \ + -d "{\"name\": \"$REPO_NAME\", \"description\": \"Created via gitfield-gogs\", \"private\": false, \"auto_init\": false}" 2>&1) + if [[ $? -ne 0 ]]; then + error "Repository creation failed with both token and password. Check GOGS configuration." + fi + info "Repository created successfully with password." } - info "Repository created successfully." + info "Repository created successfully with token." fi # Set up git remote -if [[ "$USE_HTTPS" == true ]]; then - REMOTE_URL="https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" -else - REMOTE_URL="$GOGS_SSH:$USERNAME/$REPO_NAME.git" -fi +REMOTE_URL="https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" if ! git remote get-url "$GIT_REMOTE_NAME" &>/dev/null; then info "Adding remote $GIT_REMOTE_NAME..." git remote add "$GIT_REMOTE_NAME" "$REMOTE_URL" || error "Failed to add remote $GIT_REMOTE_NAME" @@ -338,23 +255,39 @@ git commit -m "GOGS metadata link commit at $TIMESTAMP — $WEB_LINK/commit/$LAT info "Pushing to GOGS..." if ! git config --get branch."$DEFAULT_BRANCH".remote &>/dev/null; then - git push -u "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || { - warn "Push to GOGS failed." - if [[ "$USE_HTTPS" == false ]]; then - warn "Retrying with HTTPS..." - git remote set-url "$GIT_REMOTE_NAME" "https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" - git push -u "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || error "Push failed with both SSH and HTTPS." + if ! git push -u "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" 2>&1 | tee /tmp/git-push.log; then + warn "Push to GOGS failed. Check /tmp/git-push.log for details." + if grep -q "401" /tmp/git-push.log; then + warn "HTTP 401 error detected. Token or password failed for Git push." + warn "This suggests a GOGS Git-over-HTTP configuration issue." + warn "1. Edit /home/git/gogs/custom/conf/app.ini and ensure:" + warn " [auth] ENABLE_ACCESS_TOKEN = true" + warn " [git] DISABLE_HTTP_GIT = false" + warn "2. Restart GOGS: sudo systemctl restart gogs" + warn "3. Try manual push with current credentials: git push https://$USERNAME:$CRED@$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git $DEFAULT_BRANCH" + warn "4. Check GOGS logs: sudo tail -f /home/git/gogs/log/gogs.log" + error "Push failed. Adjust GOGS configuration or verify credentials." + else + error "Failed to push to $REMOTE_URL. Check network or GOGS server." fi - } + fi else - git push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || { - warn "Push to GOGS failed." - if [[ "$USE_HTTPS" == false ]]; then - warn "Retrying with HTTPS..." - git remote set-url "$GIT_REMOTE_NAME" "https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" - git push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || error "Push failed with both SSH and HTTPS." + if ! git push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" 2>&1 | tee /tmp/git-push.log; then + warn "Push to GOGS failed. Check /tmp/git-push.log for details." + if grep -q "401" /tmp/git-push.log; then + warn "HTTP 401 error detected. Token or password failed for Git push." + warn "This suggests a GOGS Git-over-HTTP configuration issue." + warn "1. Edit /home/git/gogs/custom/conf/app.ini and ensure:" + warn " [auth] ENABLE_ACCESS_TOKEN = true" + warn " [git] DISABLE_HTTP_GIT = false" + warn "2. Restart GOGS: sudo systemctl restart gogs" + warn "3. Try manual push with current credentials: git push https://$USERNAME:$CRED@$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git $DEFAULT_BRANCH" + warn "4. Check GOGS logs: sudo tail -f /home/git/gogs/log/gogs.log" + error "Push failed. Adjust GOGS configuration or verify credentials." + else + error "Failed to push to $REMOTE_URL. Check network or GOGS server." fi - } + fi fi set -e From 337eaed966c8009457b47aa5369d61a9a561227d Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:46 -0500 Subject: [PATCH 40/41] Post-Radicle sync at 2025-06-14T01:21:44Z --- .gitfield/pushed.log | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitfield/pushed.log b/.gitfield/pushed.log index 5ac0fb8..7066151 100644 --- a/.gitfield/pushed.log +++ b/.gitfield/pushed.log @@ -923,3 +923,11 @@ Diff Summary: .gitfield/local.sigil.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) +[2025-06-14T01:21:46Z] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz, Branch=master, Commit=03c37e1 + CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details + CLI: git ls-tree -r --name-only HEAD # View file structure + Diff Summary: + .gitfield/push_log.json | 6 + + .gitfield/pushed.log | 4 + + bin/gitfield-netmon | 301 +++++++++++++++++++----------------------------- + 3 files changed, 127 insertions(+), 184 deletions(-) From 7b53b457ba4ea5218b537e882234122b7fe2e843 Mon Sep 17 00:00:00 2001 From: Mark Randall Havens Date: Fri, 13 Jun 2025 20:21:48 -0500 Subject: [PATCH 41/41] =?UTF-8?q?Forgejo=20metadata=20link=20commit=20at?= =?UTF-8?q?=202025-06-13=2020:21:48=20=E2=80=94=20https://remember.thefold?= =?UTF-8?q?within.earth/mrhavens/git-sigil/commit/337eaed966c8009457b47aa5?= =?UTF-8?q?369d61a9a561227d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitfield/remember.sigil.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitfield/remember.sigil.md b/.gitfield/remember.sigil.md index d9c8560..c948b51 100644 --- a/.gitfield/remember.sigil.md +++ b/.gitfield/remember.sigil.md @@ -6,25 +6,25 @@ - **Local Repo Path**: `/home/mrhavens/fieldwork/git-sigil` - **Remote Label**: `remember` - **Default Branch**: `master` -- **Repo Created**: `2025-06-12 22:39:29` +- **Repo Created**: `2025-06-13 20:21:48` --- ## šŸ“¦ Commit Info -- **This Commit Timestamp**: `2025-06-12 22:39:29` -- **Last Commit SHA**: `f914ea0e89ff7009c85a494d67cf64887c6a3186` -- **Last Commit Message**: `Post-Radicle sync at 2025-06-13T03:33:02Z` +- **This Commit Timestamp**: `2025-06-13 20:21:48` +- **Last Commit SHA**: `337eaed966c8009457b47aa5369d61a9a561227d` +- **Last Commit Message**: `Post-Radicle sync at 2025-06-14T01:21:44Z` - **Last Commit Author**: `Mark Randall Havens ` -- **Last Commit Date**: `Thu Jun 12 22:39:28 2025 -0500` -- **This Commit URL**: [https://remember.thefoldwithin.earth/mrhavens/git-sigil/commit/f914ea0e89ff7009c85a494d67cf64887c6a3186](https://remember.thefoldwithin.earth/mrhavens/git-sigil/commit/f914ea0e89ff7009c85a494d67cf64887c6a3186) +- **Last Commit Date**: `Fri Jun 13 20:21:46 2025 -0500` +- **This Commit URL**: [https://remember.thefoldwithin.earth/mrhavens/git-sigil/commit/337eaed966c8009457b47aa5369d61a9a561227d](https://remember.thefoldwithin.earth/mrhavens/git-sigil/commit/337eaed966c8009457b47aa5369d61a9a561227d) --- ## šŸ“Š Repo Status -- **Total Commits**: `1271` -- **Tracked Files**: `160` +- **Total Commits**: `1325` +- **Tracked Files**: `163` - **Uncommitted Changes**: `No` - **Latest Tag**: `None` @@ -48,7 +48,7 @@ - **Running in Docker**: `No` - **Running in WSL**: `Yes` - **Virtual Machine**: `wsl` -- **System Uptime**: `up 2 days, 5 hours, 12 minutes` +- **System Uptime**: `up 3 days, 2 hours, 54 minutes` - **MAC Address**: `00:15:5d:11:35:bd` - **Local IP**: `172.28.107.95` - **CPU Model**: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`