Compare commits
66
Commits
12e43ef580
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
40c58e8d9b | ||
|
|
00ba36191f | ||
|
|
2a18854894 | ||
|
|
c157c599ea | ||
|
|
810069d1fe | ||
|
|
e2a530045d | ||
|
|
9e69de9fd8 | ||
|
|
808187bef2 | ||
|
|
ae74124319 | ||
|
|
eefcee2ce3 | ||
|
|
d9cf96e594 | ||
|
|
b809a14e2b | ||
|
|
a0878cf30e | ||
|
|
f28aca8484 | ||
|
|
84495ae064 | ||
|
|
e8d04b8373 | ||
|
|
a4b9e5a040 | ||
|
|
9fc7c371c5 | ||
|
|
1ef8f861c1 | ||
|
|
3c5678f8a8 | ||
|
|
319c8fa922 | ||
|
|
b84843ca3d | ||
|
|
4b0b681302 | ||
|
|
2c6f20fbc3 | ||
|
|
b88828f92e | ||
|
|
09780d9598 | ||
|
|
c24ed01e0a | ||
|
|
7e1728a037 | ||
|
|
30ef38b143 | ||
|
|
f927bc191c | ||
|
|
f402556380 | ||
|
|
25b6e0575a | ||
|
|
e133b01b00 | ||
|
|
b7145e1323 | ||
|
|
87867b9f30 | ||
|
|
8a7833e8f5 | ||
|
|
4426668518 | ||
|
|
eacf71d676 | ||
|
|
b05814980f | ||
|
|
eb67d6361e | ||
|
|
8062b9d208 | ||
|
|
aa01def998 | ||
|
|
f23fe01f3c | ||
|
|
1ad79d40d8 | ||
|
|
7d4f1668a6 | ||
|
|
498231c160 | ||
|
|
898e3003a2 | ||
|
|
0d425c0ed1 | ||
|
|
cd6f85f903 | ||
|
|
0bef6a1907 | ||
|
|
83ca9b61b8 | ||
|
|
e9bcafb64b | ||
|
|
2480790384 | ||
|
|
22d3759756 | ||
|
|
9a6555f1c3 | ||
|
|
d71dc7a86b | ||
|
|
da5d05404f | ||
|
|
3322229b97 | ||
|
|
1ccf4d3d72 | ||
|
|
a433830d1d | ||
|
|
36dae5fdf7 | ||
|
|
ba646f28f1 | ||
|
|
d0f304ef95 | ||
|
|
311627d9c8 | ||
|
|
6d8f616bf0 | ||
|
|
4fb2156fa9 |
@@ -0,0 +1,18 @@
|
|||||||
|
# Send only files required by the Hugo build and SWS runtime stages.
|
||||||
|
*
|
||||||
|
|
||||||
|
!Dockerfile
|
||||||
|
!go.mod
|
||||||
|
!go.sum
|
||||||
|
!sws.toml
|
||||||
|
|
||||||
|
!assets/
|
||||||
|
!assets/**
|
||||||
|
!config/
|
||||||
|
!config/**
|
||||||
|
!content/
|
||||||
|
!content/**
|
||||||
|
!layouts/
|
||||||
|
!layouts/**
|
||||||
|
!static/
|
||||||
|
!static/**
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
name: Build Hugo
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ "main" ]
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: tea.ahmza.com
|
||||||
|
IMAGE_NAME: ${{ gitea.repository }}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
attestations: write
|
||||||
|
id-token: write
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout Repo
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Login to Gitea Container Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ${{ env.REGISTRY }}
|
||||||
|
username: ${{ gitea.repository_owner }}
|
||||||
|
password: ${{ secrets.GITEATOKEN }}
|
||||||
|
|
||||||
|
# QEMU deliberately omitted.
|
||||||
|
#
|
||||||
|
# Hugo runs on BUILDPLATFORM in the Dockerfile, so the static site is
|
||||||
|
# built natively on the runner. The final amd64/arm64 stages only copy
|
||||||
|
# the resulting static files into the target-platform SWS image.
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Build and push
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
platforms: linux/arm64, linux/amd64
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:latest
|
||||||
|
${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:${{ gitea.event.head_commit.id }}
|
||||||
|
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:buildcache
|
||||||
|
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:buildcache,mode=max
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: build
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Pre-flight - verify VPN prerequisites
|
||||||
|
# NetBird brings up a WireGuard interface, which needs a TUN device and
|
||||||
|
# NET_ADMIN inside the job container. Without them, `netbird up` hangs
|
||||||
|
# ~50s and dies with a cryptic "DeadlineExceeded". Check up front so the
|
||||||
|
# failure is obvious and points at the fix (runner config.yaml).
|
||||||
|
run: |
|
||||||
|
echo "::group::NetBird prerequisites"
|
||||||
|
if [ -e /dev/net/tun ]; then
|
||||||
|
echo "OK: /dev/net/tun present"
|
||||||
|
else
|
||||||
|
echo "::error title=Missing TUN device::/dev/net/tun not found. Add --device=/dev/net/tun to the runner's config.yaml container.options."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if command -v capsh >/dev/null 2>&1; then
|
||||||
|
capsh --print | grep -q 'cap_net_admin' \
|
||||||
|
&& echo "OK: NET_ADMIN present" \
|
||||||
|
|| echo "::warning title=NET_ADMIN missing::netbird up will likely time out (DeadlineExceeded) configuring wt0. Add --cap-add=NET_ADMIN to the runner's config.yaml container.options."
|
||||||
|
else
|
||||||
|
echo "note: capsh unavailable, skipping NET_ADMIN check"
|
||||||
|
fi
|
||||||
|
echo "::endgroup::"
|
||||||
|
|
||||||
|
- name: Netbird Connect
|
||||||
|
id: netbird
|
||||||
|
timeout-minutes: 3
|
||||||
|
uses: Alemiz112/netbird-connect@v1
|
||||||
|
with:
|
||||||
|
setup-key: ${{ secrets.NETBIRD_SETUP_KEY }}
|
||||||
|
hostname: 'gitea-actions-blog'
|
||||||
|
management-url: ${{ secrets.NETBIRD_URL }}
|
||||||
|
|
||||||
|
- name: NetBird status
|
||||||
|
# Surface the actual peer/route state in the log and hard-assert that
|
||||||
|
# the management connection is up before attempting any deploys.
|
||||||
|
run: |
|
||||||
|
echo "::group::netbird status"
|
||||||
|
sudo netbird status --detail || true
|
||||||
|
echo "::endgroup::"
|
||||||
|
sudo netbird status | grep -q 'Management: Connected' \
|
||||||
|
&& echo "NetBird management connected." \
|
||||||
|
|| { echo "::error title=NetBird not connected::Management not connected after netbird up."; exit 1; }
|
||||||
|
|
||||||
|
- name: Deploy image to talos-prod
|
||||||
|
uses: actions-hub/kubectl@v1.36.2
|
||||||
|
env:
|
||||||
|
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
|
||||||
|
with:
|
||||||
|
args: >-
|
||||||
|
-n blog-ahmza-com
|
||||||
|
set image deployment/blog
|
||||||
|
blog=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:${{ gitea.event.head_commit.id }}
|
||||||
|
|
||||||
|
- name: Wait for rollout
|
||||||
|
uses: actions-hub/kubectl@v1.36.2
|
||||||
|
env:
|
||||||
|
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
|
||||||
|
with:
|
||||||
|
args: >-
|
||||||
|
-n blog-ahmza-com
|
||||||
|
rollout status deployment/blog
|
||||||
|
--timeout=5m
|
||||||
|
|
||||||
|
- name: Show deployed pods
|
||||||
|
uses: actions-hub/kubectl@v1.36.2
|
||||||
|
env:
|
||||||
|
KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
|
||||||
|
with:
|
||||||
|
args: >-
|
||||||
|
-n blog-ahmza-com
|
||||||
|
get pods -o wide
|
||||||
|
|
||||||
|
- name: NetBird diagnostics & disconnect
|
||||||
|
# Runs even on failure: captures final state for debugging and tears the
|
||||||
|
# peer down so stale 'gitea-actions-blog' peers don't pile up.
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
echo "::group::final netbird status"
|
||||||
|
sudo netbird status --detail || echo "netbird unavailable"
|
||||||
|
echo "::endgroup::"
|
||||||
|
sudo netbird down || true
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
name: Build Hugo
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ "main" ]
|
|
||||||
|
|
||||||
env:
|
|
||||||
REGISTRY: ghcr.io
|
|
||||||
IMAGE_NAME: ${{ github.repository }}
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
packages: write
|
|
||||||
attestations: write
|
|
||||||
id-token: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout Repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: ${{ env.REGISTRY }}
|
|
||||||
username: ${{ github.repository_owner }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v3
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Build and push
|
|
||||||
uses: docker/build-push-action@v6
|
|
||||||
with:
|
|
||||||
platforms: linux/arm64
|
|
||||||
push: true
|
|
||||||
build-args: |
|
|
||||||
BUILDKIT_CONTEXT_KEEP_GIT_DIR=true
|
|
||||||
tags: |
|
|
||||||
ghcr.io/${{ github.repository_owner }}/blog-ahmza-com:latest
|
|
||||||
ghcr.io/${{ github.repository_owner }}/blog-ahmza-com:${{ github.event.head_commit.id }}
|
|
||||||
deployment:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: build
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Netbird Connect
|
|
||||||
uses: Alemiz112/netbird-connect@v1
|
|
||||||
with:
|
|
||||||
setup-key: ${{ secrets.NETBIRD_SETUP_KEY }}
|
|
||||||
hostname: 'blog-gh-actions'
|
|
||||||
management-url: ${{ secrets.NETBIRD_URL }}
|
|
||||||
|
|
||||||
- name: Deploy to Cluster
|
|
||||||
uses: appleboy/ssh-action@v1.2.2
|
|
||||||
with:
|
|
||||||
host: ${{ secrets.SSH_HOST }}
|
|
||||||
username: ${{ secrets.SSH_USER }}
|
|
||||||
key: ${{ secrets.SSH_KEY }}
|
|
||||||
port: ${{ secrets.SSH_PORT }}
|
|
||||||
script: 'kubectl rollout restart deployment blog -n blog-ahmza-com'
|
|
||||||
@@ -5,5 +5,4 @@ styles/
|
|||||||
node_modules
|
node_modules
|
||||||
public/
|
public/
|
||||||
resources/
|
resources/
|
||||||
go.sum
|
|
||||||
themes/
|
themes/
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
# Caddyfile for the blog behind Cloudflare.
|
||||||
|
#
|
||||||
|
# Topology: Cloudflare (terminates TLS) -> Caddy (HTTP :80) -> SWS (blog:80)
|
||||||
|
#
|
||||||
|
# Cloudflare handles the public HTTPS cert, so Caddy serves plain HTTP on :80
|
||||||
|
# and does NOT need the Cloudflare DNS-01 / automatic-HTTPS setup. Set the
|
||||||
|
# Cloudflare SSL/TLS mode to "Full" so CF->origin is encrypted at the network
|
||||||
|
# layer (e.g. over your tunnel/Netbird), even though this listener is HTTP.
|
||||||
|
#
|
||||||
|
# Copy this file to /etc/caddy/Caddyfile on the caddy_cf host and reload:
|
||||||
|
# docker exec caddy_cf caddy reload --config /etc/caddy/Caddyfile
|
||||||
|
# or restart the container.
|
||||||
|
{
|
||||||
|
# Trust only Cloudflare's edge IPs so real visitor IPs (Cf-Connecting-Ip /
|
||||||
|
# X-Forwarded-For) are honoured only when the request actually comes from
|
||||||
|
# Cloudflare. This prevents header spoofing from any other source.
|
||||||
|
#
|
||||||
|
# The `cloudflare` IP source (WeidiDeng/caddy-cloudflare-ip, baked into the
|
||||||
|
# caddy-cf image) auto-fetches the ranges from cloudflare.com/ips-v4 and
|
||||||
|
# /ips-v6 and refreshes them periodically, so there's no static list to
|
||||||
|
# keep in sync.
|
||||||
|
servers {
|
||||||
|
trusted_proxies cloudflare {
|
||||||
|
interval 12h
|
||||||
|
timeout 15s
|
||||||
|
}
|
||||||
|
# Read the real visitor IP from these headers (only honoured for
|
||||||
|
# requests from trusted_proxies above). Cf-Connecting-Ip is
|
||||||
|
# Cloudflare's single authoritative end-user IP; X-Forwarded-For is
|
||||||
|
# the fallback if a request ever arrives without the CF header.
|
||||||
|
client_ip_headers Cf-Connecting-Ip X-Forwarded-For
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Bind to the hostname on the HTTP port only. Because the address has an
|
||||||
|
# explicit ":80" scheme/port, Caddy will NOT try to provision a TLS cert.
|
||||||
|
http://blog.ahmza.com {
|
||||||
|
# THE responder: proxy every request to the blog (SWS) container.
|
||||||
|
# This is what was missing before (requests fell through to a NOP -> blank page).
|
||||||
|
reverse_proxy blog:80
|
||||||
|
|
||||||
|
# Compression happens here (SWS has it disabled on purpose).
|
||||||
|
encode zstd gzip
|
||||||
|
|
||||||
|
# Security headers (single source of truth; SWS has security-headers off).
|
||||||
|
header {
|
||||||
|
Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
|
||||||
|
X-Content-Type-Options "nosniff"
|
||||||
|
X-Frame-Options "SAMEORIGIN"
|
||||||
|
Referrer-Policy "strict-origin-when-cross-origin"
|
||||||
|
# Drop Caddy's default Server header.
|
||||||
|
-Server
|
||||||
|
}
|
||||||
|
|
||||||
|
log {
|
||||||
|
output stdout
|
||||||
|
format console
|
||||||
|
}
|
||||||
|
}
|
||||||
+20
-6
@@ -1,10 +1,24 @@
|
|||||||
FROM ghcr.io/hugomods/hugo:0.128.2 AS build
|
# syntax=docker/dockerfile:1
|
||||||
|
# Pin the build stage to the native build platform so Hugo runs once (never
|
||||||
|
# under QEMU emulation). Hugo output is static HTML — identical across arches —
|
||||||
|
# so there's no reason to run it per target arch. The runtime stage below stays
|
||||||
|
# on TARGETPLATFORM, so multi-arch (amd64 + arm64) runtime images are preserved.
|
||||||
|
FROM --platform=$BUILDPLATFORM ghcr.io/hugomods/hugo:0.165.0 AS build
|
||||||
WORKDIR /tmp/hugo
|
WORKDIR /tmp/hugo
|
||||||
COPY . .
|
|
||||||
|
COPY go.mod go.sum ./
|
||||||
|
COPY config ./config
|
||||||
|
RUN hugo mod graph
|
||||||
|
|
||||||
|
COPY assets ./assets
|
||||||
|
COPY content ./content
|
||||||
|
COPY layouts ./layouts
|
||||||
|
COPY static ./static
|
||||||
RUN hugo --gc --minify
|
RUN hugo --gc --minify
|
||||||
|
|
||||||
FROM nginx:alpine-slim
|
FROM ghcr.io/static-web-server/static-web-server:2
|
||||||
WORKDIR /usr/share/nginx/html
|
COPY sws.toml /etc/sws.toml
|
||||||
COPY nginx.conf /etc/nginx/nginx.conf
|
COPY --from=build /tmp/hugo/public /public
|
||||||
COPY --from=build /tmp/hugo/public .
|
ENV SERVER_CONFIG_FILE=/etc/sws.toml
|
||||||
EXPOSE 80/tcp
|
EXPOSE 80/tcp
|
||||||
|
CMD ["--config-file", "/etc/sws.toml"]
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
This repository contains the source code for my personal blog hosted at [blog.ahmza.com](https://blog.ahmza.com).
|
This repository contains the source code for my personal blog hosted at [blog.ahmza.com](https://blog.ahmza.com).
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
Using GitLab provides several advantages:
|
Using Gitea provides several advantages:
|
||||||
- **Highly Customizable CI/CD Pipelines**: Automated processes for building and deploying the blog.
|
- **Highly Customizable CI/CD Pipelines**: Automated processes for building and deploying the blog via Gitea Actions.
|
||||||
- **GitLab Container Image Repository**: Efficient management and storage of container images.
|
- **Gitea Container Image Repository**: Efficient management and storage of container images.
|
||||||
- **Custom GitLab Runners**: Flexibility in managing the CI/CD environment.
|
- **Custom Gitea Runners**: Flexibility in managing the CI/CD environment.
|
||||||
|
|
||||||
The CI/CD pipeline is configured to build the blog for both amd64 and arm64
|
The CI/CD pipeline is configured to build the blog for both amd64 and arm64
|
||||||
architectures, allowing me to host the site on my [Pi cluster](https://blog.ahmza.com/posts/pi-docker-swarm/)
|
architectures, allowing me to host the site on my [Pi cluster](https://blog.ahmza.com/posts/pi-docker-swarm/)
|
||||||
@@ -33,7 +33,7 @@ sacrificing performance.
|
|||||||
|
|
||||||
## Implementation
|
## Implementation
|
||||||
- **Hugo**: Converts Markdown files into static HTML/CSS/JS files.
|
- **Hugo**: Converts Markdown files into static HTML/CSS/JS files.
|
||||||
- **GitLab CI/CD**: Automates the build process and creates Docker images.
|
- **Gitea Actions**: Automates the build process and creates Docker images.
|
||||||
- **Kubernetes Cluster**: Serves the static files to users.
|
- **Kubernetes Cluster**: Serves the static files to users.
|
||||||
|
|
||||||
## To-Do List
|
## To-Do List
|
||||||
@@ -47,7 +47,8 @@ sacrificing performance.
|
|||||||
## Notes
|
## Notes
|
||||||
|
|
||||||
### Cloning the Repository
|
### Cloning the Repository
|
||||||
To clone this repository along with its submodules, use the following command:
|
The Blowfish theme is managed as a Hugo module, so no submodules are required.
|
||||||
|
Clone the repository with:
|
||||||
```bash
|
```bash
|
||||||
git clone git@gitlab.com:ahmza/blog.git
|
git clone ssh://git@tea.ahmza.com/ahmza/blog-ahmza-com.git
|
||||||
```
|
```
|
||||||
|
|||||||
+3
-3
@@ -1,9 +1,9 @@
|
|||||||
---
|
---
|
||||||
title: { { replace .TranslationBaseName "-" " " | title } }
|
title: {{ replace .TranslationBaseName "-" " " | title }}
|
||||||
description: ""
|
description: ""
|
||||||
tags: [""]
|
tags: []
|
||||||
author: "ahmza"
|
author: "ahmza"
|
||||||
date: { { .Date } }
|
date: {{ .Date }}
|
||||||
draft: true
|
draft: true
|
||||||
weight:
|
weight:
|
||||||
featureimage:
|
featureimage:
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 782 KiB After Width: | Height: | Size: 441 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 73 KiB |
@@ -0,0 +1,6 @@
|
|||||||
|
services:
|
||||||
|
blog:
|
||||||
|
image: tea.ahmza.com/ahmza/blog-ahmza-com:latest
|
||||||
|
ports:
|
||||||
|
- 80:80
|
||||||
|
restart: unless-stopped
|
||||||
@@ -14,6 +14,11 @@ pagination.pagerSize = 10
|
|||||||
buildDrafts = false
|
buildDrafts = false
|
||||||
buildFuture = false
|
buildFuture = false
|
||||||
|
|
||||||
|
# Keep source-art and editor backup files out of the built site. Without this,
|
||||||
|
# files inside page bundles (e.g. feature.aseprite) are copied into public/ as
|
||||||
|
# page resources and served publicly.
|
||||||
|
ignoreFiles = ['\.aseprite$', '\.bak$']
|
||||||
|
|
||||||
enableEmoji = true
|
enableEmoji = true
|
||||||
|
|
||||||
# googleAnalytics = "G-XXXXXXXXX"
|
# googleAnalytics = "G-XXXXXXXXX"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
languageCode = "en"
|
locale = "en"
|
||||||
languageName = "English"
|
label = "English"
|
||||||
weight = 1
|
weight = 1
|
||||||
title = "ahmza's ramblings"
|
title = "ahmza's ramblings"
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
[[imports]]
|
[[imports]]
|
||||||
disable = false
|
disable = false
|
||||||
path = "github.com/nunocoracao/blowfish/v2"
|
path = "github.com/nunocoracao/blowfish/v3"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
title: Arrstack
|
title: Arrstack
|
||||||
description:
|
description:
|
||||||
tags: [""]
|
tags: []
|
||||||
author: "ahmza"
|
author: "ahmza"
|
||||||
date: 2025-05-09T23:44:27+01:00
|
date: 2025-05-09T23:44:27+01:00
|
||||||
draft: true
|
draft: true
|
||||||
@@ -4,7 +4,7 @@ description: In the modern age we are overwhelmed with stimuli. Learn to cut out
|
|||||||
tags:
|
tags:
|
||||||
- lifestyle
|
- lifestyle
|
||||||
- minimalism
|
- minimalism
|
||||||
- prodcutivity
|
- productivity
|
||||||
author: ahmza
|
author: ahmza
|
||||||
date: 2024-01-02
|
date: 2024-01-02
|
||||||
draft: false
|
draft: false
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 78 KiB |
@@ -1,113 +0,0 @@
|
|||||||
---
|
|
||||||
title: Hardening Linux - An Update to Securing SSH
|
|
||||||
description: "A Guide to Making Linux a Little more secure"
|
|
||||||
tags: ["Linux", "Ubuntu"]
|
|
||||||
author: "ahmza"
|
|
||||||
date: 2025-06-05T15:34:10+01:00
|
|
||||||
draft: true
|
|
||||||
weight:
|
|
||||||
featureimage:
|
|
||||||
lastmod:
|
|
||||||
---
|
|
||||||
|
|
||||||
---
|
|
||||||
{{< alert icon="fire" >}}
|
|
||||||
> - This Guide assumes a Linux -> Linux SSH Session
|
|
||||||
> - Please take care with production systems
|
|
||||||
> - I take no responsibility for misconfigured systems and lockouts
|
|
||||||
> - Try in a VM first and thank me later :)
|
|
||||||
> - My Commands will be for Ubuntu Server 24.04
|
|
||||||
{{< /alert >}}
|
|
||||||
---
|
|
||||||
|
|
||||||
## Introduction
|
|
||||||
This guide will go over the basic steps of hardening a Linux machine with a
|
|
||||||
focus on remote access. The reason this is important is because when we begin to
|
|
||||||
expose services to the internet and make them publicly accessible then that means
|
|
||||||
anyone can probe around.
|
|
||||||
|
|
||||||
There are better ways around this especially if you are the only user, or If
|
|
||||||
your users dont mind taking an extra step before being able to access your
|
|
||||||
resources. If you have not heard of _Overlay Networks_ before they're similar to
|
|
||||||
VPNs however do not need any open ports as they use NAT Punching AKA Hole
|
|
||||||
Punching.
|
|
||||||
|
|
||||||
Check out my post on [Tailscale](/posts/no-more-port-forwarding/)
|
|
||||||
|
|
||||||
regardless, it's always a good idea to implement good security practice so
|
|
||||||
follow along and get your remote systems secure !!
|
|
||||||
|
|
||||||
## Initial Steps
|
|
||||||
|
|
||||||
Before we get into the meat and potatos of this guide, it would be a good idea
|
|
||||||
to go over the following steps, especially if you are configuring a new install.
|
|
||||||
|
|
||||||
### Software Updates
|
|
||||||
Software updates are key for security as they will often include security
|
|
||||||
patches. Depending on your flavour of Linux this command will vary.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo apt update && sudo apt upgrade
|
|
||||||
```
|
|
||||||
{{< alert "bell" >}}
|
|
||||||
If you do not expect to be logging into this remote machine very often it may be
|
|
||||||
a good idea to [setup automatic updates](/posts/setting-up-automatic-updates)
|
|
||||||
however if you want more control then using [Ansible to update Remote Machines](/posts/ansible-to-manage-remote-servers)
|
|
||||||
would be a better option.
|
|
||||||
{{< /alert >}}
|
|
||||||
|
|
||||||
### User Accounts
|
|
||||||
It's not a good idea to continue to use a root account after install, it's much
|
|
||||||
more secure to setup another user account with sudo access. The reason is the
|
|
||||||
root account has complete control over the system, where a user account is more
|
|
||||||
restricted by default. As well as this logging is more granular with different
|
|
||||||
user accounts.
|
|
||||||
|
|
||||||
The following command will allow you to create a new user, it will also ask you
|
|
||||||
some questions about user information however the only required fields are the
|
|
||||||
username and password if you want one.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
adduser username
|
|
||||||
```
|
|
||||||
|
|
||||||
now we can add our newly created user to the sudo group to give admin permissions
|
|
||||||
|
|
||||||
``` bash
|
|
||||||
usermod -aG sudo username
|
|
||||||
```
|
|
||||||
|
|
||||||
{{< alert "bell" >}}
|
|
||||||
Remember to replace username with your desired username
|
|
||||||
{{< /alert >}}
|
|
||||||
|
|
||||||
you can now logout of root and log back in as your user. Further action on the
|
|
||||||
server should now be executed from this user account.
|
|
||||||
|
|
||||||
## Creating SSH Keys
|
|
||||||
Now that you have your own user account, we can create an SSH key for it. An SSH
|
|
||||||
Key is a Public and Private key pair which allow client and server to
|
|
||||||
authenticate using Public Key cryptography. Public Key cryptography is much
|
|
||||||
harder to crack compared to a password, as well as this we no longer need to
|
|
||||||
send passwords across networks which can be at risk of interception.
|
|
||||||
|
|
||||||
SSH can also be more convenient once you set up ssh-agent which will be covered
|
|
||||||
later in the guide, with password authentication you need to enter a password
|
|
||||||
everytime, however with ssh-agent you can enter your ssh-key password once and
|
|
||||||
it remains unlocked for the remainder of the session.
|
|
||||||
|
|
||||||
{{< alert "fire" >}}
|
|
||||||
**IMPORTANT:** **NEVER** share your private ssh key ... it's private for a reason.
|
|
||||||
{{< /alert >}}
|
|
||||||
|
|
||||||
By running the following command you will create an ssh-key !!
|
|
||||||
```bash
|
|
||||||
ssh-keygen -t ed25519 -C NameYourKey
|
|
||||||
```
|
|
||||||
- `-t` - specifies the type of cryptographic algorithm we will use
|
|
||||||
- `-C` - notice it's capital, A name for your ssh keys. I usually give them the
|
|
||||||
hostname of the local machine
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Conclusion
|
|
||||||
@@ -0,0 +1,551 @@
|
|||||||
|
---
|
||||||
|
title: Hardening Linux - An Update to Securing SSH
|
||||||
|
description: "A Guide to Making Linux a Little more secure"
|
||||||
|
tags: ["Linux", "Ubuntu"]
|
||||||
|
author: "ahmza"
|
||||||
|
date: 2025-06-05T15:34:10+01:00
|
||||||
|
draft: true
|
||||||
|
weight:
|
||||||
|
featureimage:
|
||||||
|
lastmod:
|
||||||
|
---
|
||||||
|
|
||||||
|
Update to [Securing SSH](/posts/securing-ssh/)
|
||||||
|
|
||||||
|
{{< alert icon="fire" >}}
|
||||||
|
|
||||||
|
> - This Guide assumes a Linux -> Linux SSH Session
|
||||||
|
> - Please take care with production systems
|
||||||
|
> - I take no responsibility for misconfigured systems and lockouts
|
||||||
|
> - Try in a VM first and thank me later :)
|
||||||
|
> - My Commands will be for Debian 13 Trixie
|
||||||
|
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
## Introduction
|
||||||
|
|
||||||
|
This guide will go over the basic steps of hardening a Linux machine with a
|
||||||
|
focus on remote access. The reason this is important is because when we begin to
|
||||||
|
expose services to the internet and make them publicly accessible then that means
|
||||||
|
anyone can probe around.
|
||||||
|
|
||||||
|
If you have not heard of _Overlay Networks_ before they're similar to
|
||||||
|
VPNs however do not need any open ports as they use NAT Punching.
|
||||||
|
|
||||||
|
Check out my post on [Netbird](/posts/no-more-port-forwarding/#netbird) an alternative to [Tailscale](/posts/no-more-port-forwarding/#tailscale)
|
||||||
|
|
||||||
|
Follow along and get your remote systems secure !!
|
||||||
|
|
||||||
|
## Initial Steps
|
||||||
|
|
||||||
|
Before we get into the meat and potatoes of this guide, it would be a good idea
|
||||||
|
to go over the following steps, especially if you are configuring a new install.
|
||||||
|
|
||||||
|
### Software Updates
|
||||||
|
|
||||||
|
Software updates are key for security as they will often include security
|
||||||
|
patches. Depending on your flavour of Linux this command will vary.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo apt update && sudo apt upgrade
|
||||||
|
```
|
||||||
|
|
||||||
|
{{< alert "bell" >}}
|
||||||
|
If you do not expect to be logging into this remote machine very often
|
||||||
|
then using [Ansible to update Remote Machines](/posts/ansible-to-manage-remote-servers)
|
||||||
|
is a great alternative to the manual approach
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
### User Accounts
|
||||||
|
|
||||||
|
It's not a good idea to continue using the root account after install, reason being
|
||||||
|
the root account has complete control over the system, whereas a user account is more
|
||||||
|
restricted by default. Logging is more granular with different user accounts,
|
||||||
|
especially with more than one user.
|
||||||
|
|
||||||
|
The following command will allow you to create a new user, it will also ask you
|
||||||
|
some questions about user information however the only required fields are the
|
||||||
|
username and password.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
adduser username
|
||||||
|
```
|
||||||
|
|
||||||
|
now we can add our newly created user to the sudo group to give admin permissions
|
||||||
|
|
||||||
|
```bash
|
||||||
|
usermod -aG sudo username
|
||||||
|
```
|
||||||
|
|
||||||
|
{{< alert "bell" >}}
|
||||||
|
Remember to replace username with your desired username
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
you can now logout of root and log back in as your user. Further action on the
|
||||||
|
server should now be executed from this user account.
|
||||||
|
|
||||||
|
## Creating SSH Keys
|
||||||
|
|
||||||
|
Now that you have your own user account, we can create an SSH key for it. An SSH
|
||||||
|
Key is a Public and Private key pair which allow client and server to
|
||||||
|
authenticate using Public Key cryptography. Public Key cryptography is much
|
||||||
|
harder to crack compared to a password, also we no longer send passwords across
|
||||||
|
networks which can be at risk of interception.
|
||||||
|
|
||||||
|
SSH can also be more convenient once you set up ssh-agent which will be covered
|
||||||
|
later in the guide, with password authentication you need to enter a password
|
||||||
|
everytime, however with ssh-agent you can enter your ssh-key password once and
|
||||||
|
it remains unlocked for the remainder of the session.
|
||||||
|
|
||||||
|
{{< alert "fire" >}}
|
||||||
|
**IMPORTANT:** **NEVER** share your private ssh key ... it's private for a reason.
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
By running the following command you will create an ssh-key !!
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ssh-keygen -t ed25519 -C NameYourKey
|
||||||
|
```
|
||||||
|
|
||||||
|
- `-t` - specifies the type of cryptographic algorithm we will use
|
||||||
|
- `-C` - notice it's capital, A name for your ssh keys. I usually give them the
|
||||||
|
hostname of the local machine
|
||||||
|
|
||||||
|
{{< alert "bell" >}}
|
||||||
|
If you would like a deep dive into why I pick this algorithm, click the drop down, else skip ahead :D
|
||||||
|
{{< /alert >}}
|
||||||
|
{{< details >}}
|
||||||
|
The `-t` flag specifies the type of encryption to use. The reasons I have gone with `ed25519`:
|
||||||
|
|
||||||
|
- `ed25519` is faster and generation, signing and verification operations
|
||||||
|
- Believed to be more resistant to certain attacks
|
||||||
|
- shorter key length at equivalent security levels
|
||||||
|
|
||||||
|
The following output is a speed test of different encryption algorithms
|
||||||
|
|
||||||
|
```bash
|
||||||
|
~ ❯ openssl speed rsa1024 rsa2048 rsa4096 ecdsap256 ed25519
|
||||||
|
Doing 1024 bits private rsa's for 10s: 73191 1024 bits private RSA's in 9.99s
|
||||||
|
Doing 1024 bits public rsa's for 10s: 1161066 1024 bits public RSA's in 9.99s
|
||||||
|
Doing 2048 bits private rsa's for 10s: 11346 2048 bits private RSA's in 9.99s
|
||||||
|
Doing 2048 bits public rsa's for 10s: 389696 2048 bits public RSA's in 9.99s
|
||||||
|
Doing 4096 bits private rsa's for 10s: 1643 4096 bits private RSA's in 10.00s
|
||||||
|
Doing 4096 bits public rsa's for 10s: 112285 4096 bits public RSA's in 9.99s
|
||||||
|
Doing 256 bits sign ecdsa's for 10s: 294504 256 bits ECDSA signs in 9.85s
|
||||||
|
Doing 256 bits verify ecdsa's for 10s: 101912 256 bits ECDSA verify in 9.99s
|
||||||
|
Doing 253 bits sign Ed25519's for 10s: 147102 253 bits Ed25519 signs in 9.99s
|
||||||
|
Doing 253 bits verify Ed25519's for 10s: 53317 253 bits Ed25519 verify in 10.00s
|
||||||
|
version: 3.0.13
|
||||||
|
...
|
||||||
|
|
||||||
|
...
|
||||||
|
sign verify sign/s verify/s
|
||||||
|
rsa 1024 bits 0.000136s 0.000009s 7326.4 116222.8
|
||||||
|
rsa 2048 bits 0.000880s 0.000026s 1135.7 39008.6
|
||||||
|
rsa 4096 bits 0.006086s 0.000089s 164.3 11239.7
|
||||||
|
sign verify sign/s verify/s
|
||||||
|
256 bits ecdsa (nistp256) 0.0000s 0.0001s 29898.9 10201.4
|
||||||
|
sign verify sign/s verify/s
|
||||||
|
253 bits EdDSA (Ed25519) 0.0001s 0.0002s 14724.9 5331.7
|
||||||
|
```
|
||||||
|
|
||||||
|
in my testing it seems as though ecdsa is actually a touch faster than ed25519 but my
|
||||||
|
testing is in no way scientific or thorough enough Ill leave that to the Pros.
|
||||||
|
|
||||||
|
`RSA 4096` is considered to be quite secure however the speed difference compared to
|
||||||
|
the more modern algorithms is considerably longer. Each algorithm has its strengths
|
||||||
|
and weaknesses, so research which works best for you.
|
||||||
|
|
||||||
|
In a homelab environment how noticeable this would actually be im not sure. We are
|
||||||
|
talking tiny fracions of a second.
|
||||||
|
|
||||||
|
for more insight: [https://serverfault.com/questions/1081266/ssh-keys-ed25519-vs-rsa-performance-demystified](https://serverfault.com/questions/1081266/ssh-keys-ed25519-vs-rsa-performance-demystified)
|
||||||
|
{{< /details >}}
|
||||||
|
|
||||||
|
When creating the SSH key you will be presented with a two questions.
|
||||||
|
|
||||||
|
- Location of the key
|
||||||
|
- Password
|
||||||
|
|
||||||
|
The default location of the key `$HOME/.ssh/id_ed25519` is fine for me.
|
||||||
|
|
||||||
|
I would strongly advise setting a good password for you SSH keys.
|
||||||
|
|
||||||
|
Now we can start copying these keys to remote hosts. The following command
|
||||||
|
will copy the public key to the remote host.
|
||||||
|
|
||||||
|
```
|
||||||
|
ssh-copy-id user@remote-host
|
||||||
|
```
|
||||||
|
|
||||||
|
{{< alert "bell" >}}
|
||||||
|
Change `user` and `remote-host` to your own values
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
If that succeeded then we should be anble to connect to the remote host using our ssh key
|
||||||
|
|
||||||
|
Hoping that you set a password for your ssh key, when attempting to connect the password prompt
|
||||||
|
will look slightly different. Instead of asking for the remote users password its asking for your
|
||||||
|
SSH keys password.
|
||||||
|
|
||||||
|
And just like that your system is a lot more secure.
|
||||||
|
|
||||||
|
## SSH key distribution
|
||||||
|
|
||||||
|
One pain point with SSH keys is when you have multiple ssh keys and multiple remote servers.
|
||||||
|
Having to distribute these keys can be time consuming, and honestly a waste of time.
|
||||||
|
|
||||||
|
One method thats easy to get up and running with minimal effort is using Github. We can add our
|
||||||
|
public SSH keys to github and run a command on our servers to pull those public keys.
|
||||||
|
|
||||||
|
{{< alert "bell" >}}
|
||||||
|
There are more advanced ways to get around this such as [SSH Certificate Authorities](posts/ssh-certificate-authority)
|
||||||
|
but thats out of the scope for this post.
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
To add an SSH key to github go to [github.com](https://github.com) and navigate to the SSH and GPG keys page
|
||||||
|
|
||||||
|
`Profile Icon > Settings > SSH and GPG keys > New SSH key`
|
||||||
|
|
||||||
|
[quicklink](https://github.com/settings/ssh/new)
|
||||||
|
|
||||||
|
- Title: Give a descriptive name for the key
|
||||||
|
- Key Type: Authentication key
|
||||||
|
- Key: Paste in the public key
|
||||||
|
|
||||||
|
to get your public key
|
||||||
|
|
||||||
|
```
|
||||||
|
cat $HOME/.ssh/id_ed25519.pub
|
||||||
|
```
|
||||||
|
|
||||||
|
Finally click `Add SSH Key`
|
||||||
|
|
||||||
|
### Importing the keys
|
||||||
|
|
||||||
|
When we are on the remote host we can run the following command to import our public ssh keys from github
|
||||||
|
Make sure the username is YOUR username.
|
||||||
|
|
||||||
|
```
|
||||||
|
ssh-import-id-gh username
|
||||||
|
```
|
||||||
|
|
||||||
|
## SSH Agent
|
||||||
|
|
||||||
|
Now we can setup the ssh agent to enable us to keep ssh-keys "logged-in" per session reducing the amount
|
||||||
|
we need to enter our password each time we want to spawn a new ssh session.
|
||||||
|
|
||||||
|
I make use of a bash script which is called in my `.zshrc` or `.bashrc`. So each time I spawn a new session
|
||||||
|
(Usually computer restart) it will spawn the ssh-agent and I can unlock my key for later use.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
##### START Fix for ssh-agent #####
|
||||||
|
# Orig Ref: http://mah.everybody.org/docs/ssh
|
||||||
|
# Ref: https://web.archive.org/web/20220513101246/http://mah.everybody.org/docs/ssh
|
||||||
|
-
|
||||||
|
SSH_ENV="$HOME/.ssh/environment"
|
||||||
|
-
|
||||||
|
function start_agent {
|
||||||
|
echo "Initialising new SSH agent..."
|
||||||
|
/usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
|
||||||
|
echo succeeded
|
||||||
|
chmod 600 "${SSH_ENV}"
|
||||||
|
. "${SSH_ENV}" > /dev/null
|
||||||
|
/usr/bin/ssh-add;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
# Source SSH settings, if applicable
|
||||||
|
if [ -f "${SSH_ENV}" ]; then
|
||||||
|
. "${SSH_ENV}" > /dev/null
|
||||||
|
#ps ${SSH_AGENT_PID} doesn't work under cywgin
|
||||||
|
ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
|
||||||
|
start_agent;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
start_agent;
|
||||||
|
fi
|
||||||
|
##### END Fix for ssh-agent #####
|
||||||
|
```
|
||||||
|
|
||||||
|
The next time your .rc file is sourced you will be asked for your ssh key password.
|
||||||
|
|
||||||
|
## Modify SSH Config
|
||||||
|
|
||||||
|
{{< alert "bell" >}}
|
||||||
|
Im using `vim`, if you are unfamilliar with vim you may find it easier to use `nano`
|
||||||
|
instead. If you want to try vim just remember you start in command mode, to insert
|
||||||
|
text you can press `i` to enter insert mode. When ready to save and quit press `esc`
|
||||||
|
to go back to command mode and type `:wq` the colon allows you to write commands,
|
||||||
|
`w` represents write and `q` represents quit.
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo vim /etc/ssh/sshd_config
|
||||||
|
```
|
||||||
|
|
||||||
|
Some options are already in the file, some just need uncommenting and some you will
|
||||||
|
need to add yourself.
|
||||||
|
|
||||||
|
```
|
||||||
|
Protocol 2
|
||||||
|
Port 2222
|
||||||
|
PermitRootLogin no
|
||||||
|
MaxAuthTries 5
|
||||||
|
PasswordAuthentication no
|
||||||
|
PermitEmptyPasswords no
|
||||||
|
AllowUsers username username2
|
||||||
|
ClientAliveInterval 180
|
||||||
|
ClientAliveCountMax 1
|
||||||
|
```
|
||||||
|
|
||||||
|
- Protocol 2 - is the latest and most secure ssh protocol version
|
||||||
|
- Port 2222 - change the default port from 22 to 2222
|
||||||
|
- Stops port scanners on the internet hunting for default open ports
|
||||||
|
- PermitRootLogin no - Prevents the root user being able to login via ssh
|
||||||
|
- MaxAuthTries 5 - The number of allowed authentication attempts per connection, i.e if an attacker is trying to brute force a server after 3 failed attempts - or half of the set value - these failed attempts will be logged (useful to know for fail2ban) and then after 4 get locked out.
|
||||||
|
- PasswordAuthentication no - Disable password authentication since we use SSH keys now !!
|
||||||
|
- PermitEmptyPasswords no - may be redundant since we set no password authentication …
|
||||||
|
- AllowUsers - only allow certain users to use SSH
|
||||||
|
- ClientAliveInterval 180 - SSH daemon will send a packet to the client every 180s
|
||||||
|
- ClientAliveCountMax 1 - when the ClientAliveInterval packet is sent if the client does not respond the session is closed. If this value is 2 for example the SSH daemon will have a fault tolerance of 2 meaning that the client has to miss 2 packets each 180s apart before the session closes.
|
||||||
|
|
||||||
|
With the current ClientAliveInterval and ClientAliveCountMax you have 3 minutes of "downtime" before the
|
||||||
|
session is dropped. Downtime could be the internet connection dropped or you closed your laptop lid and
|
||||||
|
the machine goes to sleep. Essentially any state where the client machine cannot respond to the remote
|
||||||
|
servers "ping" every 3 minutes.
|
||||||
|
|
||||||
|
If 3 minutes is too little time for you, you may increase the interval or increase the ClientAliveCountMax
|
||||||
|
value.
|
||||||
|
|
||||||
|
## Fail2Ban
|
||||||
|
|
||||||
|
Fail2Ban is an IPS (Intrusion Protection System) which monitors ssh logs looking for failed login attempts
|
||||||
|
If multiple failed login attempts are detected then the source IP address is blocked in the firewall.
|
||||||
|
|
||||||
|
### Install Fail2Ban
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo apt install fail2ban
|
||||||
|
```
|
||||||
|
|
||||||
|
### Fail2Ban Configuration
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo vim /etc/fail2ban/jail.local
|
||||||
|
```
|
||||||
|
|
||||||
|
I use the following configuration
|
||||||
|
|
||||||
|
```fail2ban
|
||||||
|
[DEFAULT]
|
||||||
|
bantime = 8h
|
||||||
|
ignoreip = 127.0.0.1/8 xxx.xxx.xxx.xxx/xx
|
||||||
|
ignoreself = true
|
||||||
|
[sshd]
|
||||||
|
enabled = true
|
||||||
|
port = 2222
|
||||||
|
filter = sshd
|
||||||
|
logpath = /var/log/auth.log
|
||||||
|
maxretry = 2
|
||||||
|
```
|
||||||
|
|
||||||
|
- bantime - how long to block network connections for
|
||||||
|
- ignoreip - IP addresses / ranges that are ignored by fail2ban useful if you have static IPs set on your local machines or want to ignore your whole local network.
|
||||||
|
- ignoreself - dont ban itself xD
|
||||||
|
- sshd
|
||||||
|
- enabled - enables log monitoring for ssh
|
||||||
|
- port - the port we are using for ssh
|
||||||
|
- logpath - where your ssh logs are
|
||||||
|
- maxretry - how many retries before a connection is blocked
|
||||||
|
|
||||||
|
{{< alert "bell" >}}
|
||||||
|
maxretry in fail2ban is set to 2 because in our sshd_config file we set MaxAuthTries
|
||||||
|
to 5. So SSH will start to log after 3 failed attempts. When we hit 5 failed
|
||||||
|
attempt fail2Ban sees 2 failed attempts so it will block network connections.
|
||||||
|
So at 5 failed attempts **TOTAL** fail2ban blocks connections
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
these settings can be a bit aggressive in some situations so feel free to make them
|
||||||
|
a bit more relaxed however with our SSH keys setup properly we should not be
|
||||||
|
getting failed login attempts so this is _in my opinion_ already quite relaxed.
|
||||||
|
|
||||||
|
## Firewall
|
||||||
|
|
||||||
|
One thing I would like to mention here before we continue is that our network
|
||||||
|
security should not only be hardened on the edge. Each layer of our network
|
||||||
|
should be secured. The reason for this practice is that if an attacker does
|
||||||
|
manage to break through your edge then you can still isolate them and protect
|
||||||
|
resources from within the network. So even though we may have an edge firewall
|
||||||
|
we should consider setting up a firewall on each of our servers.
|
||||||
|
|
||||||
|
On Ubuntu server `ufw` is installed by default, thats what Ill be going over here.
|
||||||
|
You can install `ufw` on other distributions however they usually have default
|
||||||
|
firewall implementations like `iptables`
|
||||||
|
|
||||||
|
By Default the firewall on ubuntu servers is disabled. To check this:
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo ufw status
|
||||||
|
```
|
||||||
|
|
||||||
|
{{< alert "bell" >}}
|
||||||
|
While its inactive we dont need to worry about locking ourselves out however
|
||||||
|
be aware that once your firewall is active any incoming traffic will be dropped
|
||||||
|
if we do not create accept rules for them.
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
We are going to create 2 catch all rules.
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo ufw default allow outgoing
|
||||||
|
sudo ufw default deny incoming
|
||||||
|
```
|
||||||
|
|
||||||
|
- Allow all traffic going out of the server
|
||||||
|
- Deny all traffic coming into the server
|
||||||
|
|
||||||
|
Create a rule to allow our SSH traffic, make sure you set the port number you use to ssh
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo ufw allow 2222
|
||||||
|
```
|
||||||
|
|
||||||
|
If you need any other incoming ports open, do that here.
|
||||||
|
|
||||||
|
We can now enable the firewall.
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo ufw enable
|
||||||
|
```
|
||||||
|
|
||||||
|
check the status
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo ufw status
|
||||||
|
```
|
||||||
|
|
||||||
|
## SSH Config
|
||||||
|
|
||||||
|
When we start using unconventional settings such as port 2222 it can be useful
|
||||||
|
to setup an ssh config file on our client machines.
|
||||||
|
|
||||||
|
My config files looks something like
|
||||||
|
This makes any host on my local network use the username and 2222.
|
||||||
|
I also have an alias for my VPS server.
|
||||||
|
|
||||||
|
```
|
||||||
|
Host 10.10.100.*
|
||||||
|
User username
|
||||||
|
Port 2222
|
||||||
|
|
||||||
|
Host vps-deb13-2c8g
|
||||||
|
HostName ipaddress-specific-server
|
||||||
|
User username
|
||||||
|
Port 2222
|
||||||
|
```
|
||||||
|
|
||||||
|
## 2 Factor Authentication - Optional
|
||||||
|
|
||||||
|
We can use 2 factor authentication on our servers much like you would with
|
||||||
|
something like github. By enabling the TOTP pam module when we login to the
|
||||||
|
server it will ask for a Time Based TOTP code.
|
||||||
|
|
||||||
|
These keys are time based and so it's vital that the time on the server and
|
||||||
|
client are correct.
|
||||||
|
|
||||||
|
The module I found is developed by Google and is open source
|
||||||
|
[google/google-authenticator-libpam](https://github.com/google/google-authenticator-libpam)
|
||||||
|
|
||||||
|
Install the module
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo apt install libpam-google-authenticator
|
||||||
|
```
|
||||||
|
|
||||||
|
Edit the config
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo vim /etc/pam.d/sshd
|
||||||
|
```
|
||||||
|
|
||||||
|
Comment out the following line
|
||||||
|
|
||||||
|
```
|
||||||
|
# @include common-auth
|
||||||
|
```
|
||||||
|
|
||||||
|
If we do not uncomment this then even though we are using SSH keys we will be
|
||||||
|
asked to use our user password to authenticate too.
|
||||||
|
|
||||||
|
Add the following line to the bottom of the file
|
||||||
|
|
||||||
|
```
|
||||||
|
auth required pam_google_authenticator.so
|
||||||
|
```
|
||||||
|
|
||||||
|
{{< alert "bell" >}}
|
||||||
|
If you have multiple users then it may be worth adding the nullok option as
|
||||||
|
this will prevent users who have not setup TOTP from being locked out.
|
||||||
|
|
||||||
|
```
|
||||||
|
auth required pam_google_authenticator.so nullok
|
||||||
|
```
|
||||||
|
|
||||||
|
{{< /alert >}}
|
||||||
|
|
||||||
|
Edit the ssh config
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo vim /etc/ssh/sshd_config
|
||||||
|
```
|
||||||
|
|
||||||
|
Edit / Add the following
|
||||||
|
|
||||||
|
```
|
||||||
|
KbdInteractiveAuthentication yes
|
||||||
|
AuthenticationMethods publickey,keyboard-interactive
|
||||||
|
```
|
||||||
|
|
||||||
|
We are now ready to generte the TOTP codes for the user, run the following
|
||||||
|
|
||||||
|
```
|
||||||
|
google-authenticator
|
||||||
|
```
|
||||||
|
|
||||||
|
- `Do you want authentication tokens to be time-based (y/n)` - y
|
||||||
|
- Scan the Code into your Authenticator app or if you have a password manager use that :D
|
||||||
|
- You will be asked to enter a TOTP from the authenticator app
|
||||||
|
- You will be given recovery codes, save them somewhere
|
||||||
|
- `Do you want me to update your "/home/user/.google-authenticator" file ? (y/n)` - y
|
||||||
|
- The following questions are your choice however I answered
|
||||||
|
- `Do you want Disallow multiple uses of the same authentication token … (y/n)` - y
|
||||||
|
- `… In order to compensate for possible time-skew … (y/n)` - n (if you do experience problems you may change this option)
|
||||||
|
- `… 3 Login attempts every 30s … (y/n)` - y
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## Restart
|
||||||
|
|
||||||
|
Now is the moment of truth, restarting the sshd service and fail2ban
|
||||||
|
|
||||||
|
```
|
||||||
|
sudo service ssh restart
|
||||||
|
sudo systemctl restart sshd.service
|
||||||
|
sudo systemctl restart fail2ban
|
||||||
|
```
|
||||||
|
|
||||||
|
Once you are comfortable you have everything setup I would suggest a full system
|
||||||
|
restart as updates were performed earlier too.
|
||||||
|
|
||||||
|
## Conclusion
|
||||||
|
|
||||||
|
This is a great start to improving security on your remote servers. But it's
|
||||||
|
only the start. There are still many things you could change / implement to
|
||||||
|
further increase security.
|
||||||
|
|
||||||
|
There are also network considerations like VLANs and ensuring solid firewall
|
||||||
|
rules.
|
||||||
|
|
||||||
|
As mentioned earlier in the post you could implement overlay networks such as
|
||||||
|
Netbird or Tailscale when working over the internet instead of exposing all
|
||||||
|
the ports.
|
||||||
Executable → Regular
Executable → Regular
@@ -185,8 +185,8 @@ cd .server-data
|
|||||||
2. **Download a Minecraft server jar file:**
|
2. **Download a Minecraft server jar file:**
|
||||||
|
|
||||||
- [Vanilla Minecraft Server](https://www.minecraft.net/en-us/download/server)
|
- [Vanilla Minecraft Server](https://www.minecraft.net/en-us/download/server)
|
||||||
- Right-click the green link that says minecraft_server.<version>.jar and copy the link address.
|
- Right-click the green link that says `minecraft_server.<version>.jar` and copy the link address.
|
||||||
- Download with: curl -o server.jar <link you copied here>
|
- Download with: `curl -o server.jar <link you copied here>`
|
||||||
- [Fabric Mod loader server](https://fabricmc.net/use/server/)
|
- [Fabric Mod loader server](https://fabricmc.net/use/server/)
|
||||||
- Select the Minecraft version, Fabric Loader Version, and the Installer Version of your choice. I tend to go with the latest.
|
- Select the Minecraft version, Fabric Loader Version, and the Installer Version of your choice. I tend to go with the latest.
|
||||||
- Download with: Copy the curl command under CLI download
|
- Download with: Copy the curl command under CLI download
|
||||||
|
|||||||
@@ -1,243 +0,0 @@
|
|||||||
---
|
|
||||||
title: Minecraft Server on Docker ⛏ 🐳
|
|
||||||
date: 2022-05-24
|
|
||||||
lastmod: 2024-07-20
|
|
||||||
author: "ahmza"
|
|
||||||
draft: false
|
|
||||||
weight:
|
|
||||||
|
|
||||||
tags: ["games", "docker"]
|
|
||||||
description: "Ever wanted to build a Minecraft server in docker !! Start here"
|
|
||||||
---
|
|
||||||
|
|
||||||
## **Introduction**
|
|
||||||
|
|
||||||
Minecraft is a great game that becomes even more enjoyable when played with
|
|
||||||
friends. One of the best ways to do this is by setting up a dedicated server.
|
|
||||||
This guide will help you do just that!
|
|
||||||
|
|
||||||
Setting up and running a Minecraft server does not require a lot of resources,
|
|
||||||
but based on my experience, allocating more resources significantly enhances
|
|
||||||
performance. Especially when you start to add mods and increase player count.
|
|
||||||
|
|
||||||
## **Prerequisites**
|
|
||||||
|
|
||||||
- Docker
|
|
||||||
- Docker Compose
|
|
||||||
|
|
||||||
See [Pi Cluster](/posts/pi-docker-swarm/)
|
|
||||||
for more information about my docker setup.
|
|
||||||
|
|
||||||
## **Requirements**
|
|
||||||
_Requirements Gathered from [here](https://minecraft.fandom.com/wiki/Server/Requirements/Dedicated#Unix_.28Linux.2C_BSD.2C_macOS.29)_
|
|
||||||
|
|
||||||
### **Minimum (1-5 Players)**
|
|
||||||
|
|
||||||
- Intel Pentium 4 or AMD Athlon based CPU
|
|
||||||
- 512 MB RAM
|
|
||||||
- 2 GB Storage space
|
|
||||||
|
|
||||||
### **Recommended (10-15 Players)**
|
|
||||||
|
|
||||||
- Intel Core or AMD K8 based CPU
|
|
||||||
- 3 GB RAM
|
|
||||||
- 16 GB Storage Space
|
|
||||||
|
|
||||||
### **Optimal (20+ Players)**
|
|
||||||
|
|
||||||
- Intel i5/i7 or AMD Ryzen 5/7 Based CPU
|
|
||||||
- 6 GB RAM
|
|
||||||
- 35 GB Storage Space
|
|
||||||
|
|
||||||
**My opinion**:
|
|
||||||
|
|
||||||
I personally went with the **optimal** settings as I wanted to run mods as well
|
|
||||||
as have the capacity for ~10 players. This gives the server breathing room.
|
|
||||||
|
|
||||||
However if you will be runing no mods or a few light weight mods and only a few
|
|
||||||
players then there really is no need to go higher than 3-4 GB.
|
|
||||||
|
|
||||||
## **Building the Container**
|
|
||||||
|
|
||||||
Lets get started on building the Minecraft server
|
|
||||||
|
|
||||||
1. **Create a directory for the Minecraft server files**:
|
|
||||||
```bash
|
|
||||||
# Make the folder
|
|
||||||
mkdir minecraft-server
|
|
||||||
# Enter the folder
|
|
||||||
cd minecraft-server
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Create an environment file for the Docker Container**:
|
|
||||||
- The _.env_ file allows us to specify variables used in the build process.
|
|
||||||
```bash
|
|
||||||
# Create a .env file
|
|
||||||
touch .env
|
|
||||||
# Open in a text editor
|
|
||||||
vim .env
|
|
||||||
# Enter the following variables
|
|
||||||
CONTAINER_NAME=minecraft-server
|
|
||||||
SERVER_MEM=4096 #change this to your desired value (in MB)
|
|
||||||
SERVER_JAR=<downloaded-server-file>.jar # Minecraft server jar file. Change this later
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Create the _docker-compose.yml_ file**:
|
|
||||||
```bash
|
|
||||||
# Create the file
|
|
||||||
touch docker-compose.yml`
|
|
||||||
# Open in a text editor
|
|
||||||
vim docker-compose.yml
|
|
||||||
```
|
|
||||||
- _docker-compose.yml_ is the spec of our Minecraft server.
|
|
||||||
- Build a docker image using context . and pass some ARGS.
|
|
||||||
- Attach volume .server-data, where Minecraft's files will be stored.
|
|
||||||
- Open network ports to access to the Docker container
|
|
||||||
- Give the docker container a name
|
|
||||||
- The container will always restart unless we tell it to stop.
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
services:
|
|
||||||
minecraft-server:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
args:
|
|
||||||
SERVER_MEM: ${SERVER_MEM}
|
|
||||||
SERVER_JAR: ${SERVER_JAR}
|
|
||||||
volumes:
|
|
||||||
- .server-data:/server
|
|
||||||
ports:
|
|
||||||
- 25565:25565 # Game
|
|
||||||
- 25575:25575 # RCON
|
|
||||||
container_name: ${CONTAINER_NAME}
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
server-data:
|
|
||||||
```
|
|
||||||
|
|
||||||
4. **Create the _Dockerfile_ file**:
|
|
||||||
|
|
||||||
- requested in docker-compose.yml build stage as context .
|
|
||||||
- The _Dockerfile_ is the spec for software running inside the container
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Create the file
|
|
||||||
touch Dockerfile
|
|
||||||
# Open the file in a text editor
|
|
||||||
vim Dockerfile
|
|
||||||
```
|
|
||||||
- We use the [eclipse-temurin:21](https://hub.docker.com/_/eclipse-temurin) image to provide the java JRE
|
|
||||||
- Use the required java version for the version of Minecraft you are running
|
|
||||||
- Collect the ARGs from the .env file
|
|
||||||
- Set the environment variables
|
|
||||||
- Set the working directory to /server which on our local system is .server-data
|
|
||||||
- Run the minecraft server jar with the ENV variables
|
|
||||||
|
|
||||||
```Dockerfile
|
|
||||||
FROM eclipse-temurin:21
|
|
||||||
|
|
||||||
ARG SERVER_MEM
|
|
||||||
ARG SERVER_JAR
|
|
||||||
|
|
||||||
ENV SERVER_MEM=${SERVER_MEM}
|
|
||||||
ENV SERVER_JAR=${SERVER_JAR}
|
|
||||||
|
|
||||||
WORKDIR /server
|
|
||||||
|
|
||||||
CMD echo "Minecraft Server is starting\n" && java -Xms128M -Xmx${SERVER_MEM}M -jar ${SERVER_JAR} nogui
|
|
||||||
```
|
|
||||||
|
|
||||||
## **Setup the Server files**
|
|
||||||
|
|
||||||
We’re almost there, just a few steps to go.
|
|
||||||
|
|
||||||
When you try to start the container, you might encounter the following error:
|
|
||||||
```bash
|
|
||||||
Minecraft Server is starting
|
|
||||||
|
|
||||||
Error: Unable to access jarfile server.jar
|
|
||||||
```
|
|
||||||
This happens because we haven't downloaded the server jar file yet. Let's do
|
|
||||||
that now
|
|
||||||
|
|
||||||
1. **Create a folder in the minecraft-server folder called .server-data**:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
mkdir .server-data
|
|
||||||
cd .server-data
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Download a Minecraft server jar file**:
|
|
||||||
- [Vanilla Minecraft Server](https://www.minecraft.net/en-us/download/server)
|
|
||||||
- Right click the green link that says minecraft_server.<version>.jar and copy the link address
|
|
||||||
- Download with: `curl -o server.jar <link you copied here>`
|
|
||||||
- [Fabric Mod loader server](https://fabricmc.net/use/server/)
|
|
||||||
- Select the Minecraft version, Fabric Loader Version and the Installer Version of your choice. I tend to go with the latest.
|
|
||||||
- Download with: `Copy the curl command under CLI download`
|
|
||||||
|
|
||||||
3. **Go back to the root minecraft-server folder**
|
|
||||||
|
|
||||||
```bash
|
|
||||||
cd ..
|
|
||||||
```
|
|
||||||
|
|
||||||
4. **Edit SERVER_JAR in .env with the name of the .jar you just downloaded**:
|
|
||||||
```bash
|
|
||||||
# Open in a text editor
|
|
||||||
vim .env
|
|
||||||
# Enter the following variables
|
|
||||||
CONTAINER_NAME=minecraft-server
|
|
||||||
SERVER_MEM=4096
|
|
||||||
SERVER_JAR=<downloaded-server-file>.jar # Change this to the name of the .jar you downloaded
|
|
||||||
```
|
|
||||||
|
|
||||||
5. **Run the container to generate necessary files like 'eula.txt'**:
|
|
||||||
```bash
|
|
||||||
docker compose up
|
|
||||||
```
|
|
||||||
you will see something like this:
|
|
||||||
```bash
|
|
||||||
minecraft-server | Starting net.minecraft.server.Main
|
|
||||||
minecraft-server | [18:05:50] [ServerMain/INFO]: You need to agree to the EULA in order to run the server. Go to eula.txt for more info.
|
|
||||||
minecraft-server exited with code 0
|
|
||||||
```
|
|
||||||
|
|
||||||
6. **Accept the EULA**:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# edit eula.txt in a text editor
|
|
||||||
vim .server-data/eula.txt
|
|
||||||
# change `eula=false` to `eula=true`
|
|
||||||
eula=true
|
|
||||||
```
|
|
||||||
|
|
||||||
7. **Make any additional changes you want**:
|
|
||||||
- Notable files:
|
|
||||||
- **server.properties** - Configure server name, game mode, world type etc…
|
|
||||||
- **ops.json** - server operators (can be set in-game)
|
|
||||||
- **whitelist.json** - players allowed to join the server (can be set in-game)
|
|
||||||
|
|
||||||
## Run the Minecraft Server
|
|
||||||
|
|
||||||
1. **Run the container in detached mode**:
|
|
||||||
```bash
|
|
||||||
# The -d flag allows the container to run in detached mode, i.e., in the background
|
|
||||||
docker compose up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# monitor the logs as the server starts. Use CTRL+C to exit
|
|
||||||
docker logs minecraft-server --follow
|
|
||||||
# If you see the following lines, your server is up and running:
|
|
||||||
[18:17:01] [Server thread/INFO]: Time elapsed: 25529 ms
|
|
||||||
[18:17:01] [Server thread/INFO]: Done (34.571s)! For help, type "help"
|
|
||||||
```
|
|
||||||
|
|
||||||
## **Conclusion**
|
|
||||||
|
|
||||||
Congratulations! You've successfully set up a Minecraft server. Now it's time
|
|
||||||
to play!
|
|
||||||
|
|
||||||
There are many exciting possibilities from here, such as installing mods or
|
|
||||||
creating scripts to manage the server. Enjoy your Minecraft adventures!
|
|
||||||
Executable → Regular
Executable → Regular
@@ -39,8 +39,6 @@ a **bare metal server that sucks a lot of power to a low power solution.**
|
|||||||
- 4 x PoE hats
|
- 4 x PoE hats
|
||||||
- 1 x 5 port PoE Switch
|
- 1 x 5 port PoE Switch
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
### **Point Of This post**
|
### **Point Of This post**
|
||||||
|
|
||||||
After following this post you will have setup _Docker swarm_ on a cluster of Pis
|
After following this post you will have setup _Docker swarm_ on a cluster of Pis
|
||||||
@@ -329,7 +327,7 @@ vim hosts
|
|||||||
```
|
```
|
||||||
|
|
||||||
- **_[piCluster]_** - specifies a group of hosts
|
- **_[piCluster]_** - specifies a group of hosts
|
||||||
- **_<ip address>_** - change these to the Pis IP addresses
|
- **_`<ip address>`_** - change these to the Pis IP addresses
|
||||||
|
|
||||||
**create the Pi Intercommunication keys**
|
**create the Pi Intercommunication keys**
|
||||||
|
|
||||||
|
|||||||
Executable → Regular
@@ -2,9 +2,9 @@
|
|||||||
title: Securing SSH 🤖
|
title: Securing SSH 🤖
|
||||||
description: Ever wanted to make your SSH connections more secure. Read this
|
description: Ever wanted to make your SSH connections more secure. Read this
|
||||||
tags:
|
tags:
|
||||||
- HomeLab
|
- homelab
|
||||||
- RemoteAccess
|
- remoteaccess
|
||||||
- SSH
|
- ssh
|
||||||
author: ahmza
|
author: ahmza
|
||||||
date: 2021-12-07
|
date: 2021-12-07
|
||||||
draft: false
|
draft: false
|
||||||
@@ -146,7 +146,7 @@ fine 😊
|
|||||||
- Max Auth Tries 5
|
- Max Auth Tries 5
|
||||||
- PasswordAuthentication no
|
- PasswordAuthentication no
|
||||||
- PermitEmptyPasswords no
|
- PermitEmptyPasswords no
|
||||||
- AllowUsers <user>
|
- AllowUsers `<user>`
|
||||||
- ClientAliveInterval 180
|
- ClientAliveInterval 180
|
||||||
|
|
||||||
``` bash
|
``` bash
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ title: Setup a HUGO Site
|
|||||||
description: Always wanted to setup a static website. Look no further !! In this post we go over the basics of setting up a HUGO site
|
description: Always wanted to setup a static website. Look no further !! In this post we go over the basics of setting up a HUGO site
|
||||||
tags:
|
tags:
|
||||||
- blog
|
- blog
|
||||||
- HUGO
|
- hugo
|
||||||
- web
|
- web
|
||||||
- development
|
- development
|
||||||
author: ahmza
|
author: ahmza
|
||||||
|
|||||||
Executable → Regular
@@ -36,7 +36,7 @@ wsl --install
|
|||||||
Go to the Microsoft store and search for a Linux distribution. I prefer
|
Go to the Microsoft store and search for a Linux distribution. I prefer
|
||||||
to use the "Ubuntu" distribution.
|
to use the "Ubuntu" distribution.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
Once installed, go ahead and run the distribution, after it finishes setting
|
Once installed, go ahead and run the distribution, after it finishes setting
|
||||||
itself up it will ask you for a username and password. These credentials are
|
itself up it will ask you for a username and password. These credentials are
|
||||||
@@ -51,7 +51,7 @@ I use the windows terminal app to run the Ubuntu distribution, it makes
|
|||||||
customising the environment a lot easier. To download it head over to the
|
customising the environment a lot easier. To download it head over to the
|
||||||
Microsoft store and search for Windows Terminal and download it.
|
Microsoft store and search for Windows Terminal and download it.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
When you login to WSL it will not default to your home directory. To fix that go
|
When you login to WSL it will not default to your home directory. To fix that go
|
||||||
to the Windows Terminal Settings look for Ubuntu or your distributions name and
|
to the Windows Terminal Settings look for Ubuntu or your distributions name and
|
||||||
@@ -61,11 +61,11 @@ change the Starting directory to
|
|||||||
\\wsl$\<distro>\home\<username>
|
\\wsl$\<distro>\home\<username>
|
||||||
```
|
```
|
||||||
|
|
||||||
> Be sure to change "<distro>" to your distributions name
|
> Be sure to change `<distro>` to your distributions name
|
||||||
|
|
||||||
> Be sure to change "<username>" to your username
|
> Be sure to change `<username>` to your username
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
## **Conclusion**
|
## **Conclusion**
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
---
|
---
|
||||||
title: Welcome
|
title: Welcome
|
||||||
|
description: The mandatory hello world post — a quick intro to who I am and what this blog is about.
|
||||||
tags:
|
tags:
|
||||||
- blog
|
- blog
|
||||||
- misc
|
- misc
|
||||||
|
|||||||
@@ -0,0 +1,423 @@
|
|||||||
|
# Caddy as a Reverse Proxy
|
||||||
|
|
||||||
|
This document describes how to run [Caddy](https://caddyserver.com/) as a
|
||||||
|
reverse proxy in front of the blog.
|
||||||
|
|
||||||
|
It uses the custom [`caddy-cf`](https://github.com/ahmzaa/caddy-cf) image
|
||||||
|
(`ghcr.io/ahmzaa/caddy-cf:latest`) — a Caddy build with the **Cloudflare DNS
|
||||||
|
module** baked in.
|
||||||
|
|
||||||
|
## Deployment topologies
|
||||||
|
|
||||||
|
There are two supported ways to run Caddy in front of the blog. **Pick one.**
|
||||||
|
|
||||||
|
### 1. Cloudflare in front (current production) — HTTP only
|
||||||
|
|
||||||
|
```
|
||||||
|
Cloudflare (terminates TLS) -> Caddy (HTTP :80) -> SWS (blog:80)
|
||||||
|
```
|
||||||
|
|
||||||
|
Cloudflare proxies the domain and provides the public HTTPS certificate, so
|
||||||
|
Caddy only needs to serve plain **HTTP on :80** and reverse-proxy to the blog.
|
||||||
|
Caddy does **not** provision a TLS cert in this mode. This is the live setup and
|
||||||
|
its config is the committed [`Caddyfile`](../Caddyfile) at the repo root —
|
||||||
|
see [Cloudflare-fronted setup](#cloudflare-fronted-setup-http-only) below.
|
||||||
|
|
||||||
|
Set the Cloudflare **SSL/TLS mode to "Full"** so the Cloudflare→origin hop is
|
||||||
|
still encrypted at the network layer (e.g. over Netbird), even though Caddy's
|
||||||
|
listener is HTTP.
|
||||||
|
|
||||||
|
### 2. Caddy terminates TLS via Cloudflare DNS-01
|
||||||
|
|
||||||
|
```
|
||||||
|
Client -> Caddy (HTTPS :443, ACME DNS-01) -> SWS (blog:80)
|
||||||
|
```
|
||||||
|
|
||||||
|
Caddy obtains/renews the certificate itself using the ACME **DNS-01** challenge
|
||||||
|
through the Cloudflare API — no inbound `80`/`443` from the public internet is
|
||||||
|
required, which suits a Netbird-only setup with no Cloudflare proxy in front.
|
||||||
|
The stock Caddy image cannot do this; the `caddy-cf` build bundles the
|
||||||
|
Cloudflare DNS provider plugin. See the Docker Compose / Kubernetes examples
|
||||||
|
later in this document.
|
||||||
|
|
||||||
|
## Why a reverse proxy?
|
||||||
|
|
||||||
|
The blog is served by [Static Web Server (SWS)](https://static-web-server.net/),
|
||||||
|
a tiny Rust binary that ships static files over plain HTTP on port `80`. SWS is
|
||||||
|
intentionally kept lean — it does **not** terminate TLS, and its compression and
|
||||||
|
security headers are disabled (see `sws.toml`). Those concerns are delegated to
|
||||||
|
the reverse proxy so that each layer owns exactly one job:
|
||||||
|
|
||||||
|
| Concern | Owned by | Notes |
|
||||||
|
| -------------------- | -------- | ------------------------------------------------- |
|
||||||
|
| TLS / HTTPS certs | Cloudflare *or* Caddy | Cloudflare in topology 1; Caddy (DNS-01) in topology 2 |
|
||||||
|
| Compression (gzip/zstd) | Caddy | `encode` directive; SWS compression is off |
|
||||||
|
| Security headers | Caddy | Single source of truth, avoids duplicate headers |
|
||||||
|
| Serving static files | SWS | Reads from `/public`, sets `Cache-Control`/`ETag` |
|
||||||
|
| Cache-Control / ETag | SWS | Declared at the origin, passed through by Caddy |
|
||||||
|
|
||||||
|
### Why the Cloudflare DNS-01 challenge?
|
||||||
|
|
||||||
|
Caddy does **automatic HTTPS** out of the box, but the default HTTP-01 /
|
||||||
|
TLS-ALPN-01 challenges require ports `80`/`443` to be publicly reachable so
|
||||||
|
Let's Encrypt can verify domain ownership. This project's infrastructure is
|
||||||
|
reached over [Netbird](https://netbird.io/) (a private overlay network), so
|
||||||
|
those inbound challenges are not an option.
|
||||||
|
|
||||||
|
The **DNS-01** challenge instead proves domain ownership by creating a TXT
|
||||||
|
record via the Cloudflare API — no inbound connectivity required. The `caddy-cf`
|
||||||
|
image bundles the Cloudflare DNS provider plugin so Caddy can do this. All it
|
||||||
|
needs is a Cloudflare API token with **Zone:DNS:Edit** permission on the
|
||||||
|
`ahmza.com` zone.
|
||||||
|
|
||||||
|
## Origin contract
|
||||||
|
|
||||||
|
Whatever the deployment, the SWS origin exposes:
|
||||||
|
|
||||||
|
- **Protocol:** plain HTTP
|
||||||
|
- **Port:** `80`
|
||||||
|
- **Health endpoint:** `GET /health` → `200 OK`
|
||||||
|
- **Cache headers:** already set by SWS (Caddy should pass them through, not override)
|
||||||
|
|
||||||
|
Caddy only needs to handle TLS (or let Cloudflare do it), add compression +
|
||||||
|
security headers, and forward requests to that origin.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Cloudflare-fronted setup (HTTP only)
|
||||||
|
|
||||||
|
**This is the current production topology.** The canonical config is the
|
||||||
|
committed [`Caddyfile`](../Caddyfile) at the repo root; copy it to the
|
||||||
|
`caddy_cf` host and reload. Highlights:
|
||||||
|
|
||||||
|
- **`http://blog.ahmza.com`** — the explicit `http://` scheme binds Caddy to
|
||||||
|
`:80` only and stops it from trying to provision a TLS certificate (Cloudflare
|
||||||
|
already serves HTTPS to visitors).
|
||||||
|
- **`reverse_proxy blog:80`** — proxies to the blog (SWS) container by its
|
||||||
|
compose service name. Caddy and the blog container must share a Docker
|
||||||
|
network. Omitting this responder makes Caddy return an empty `NOP` response —
|
||||||
|
i.e. a **blank page**.
|
||||||
|
- **`encode zstd gzip`** — compression happens here (SWS has it disabled).
|
||||||
|
- **`header { ... }`** — security headers (SWS has them disabled).
|
||||||
|
- **`trusted_proxies cloudflare { ... }`** + **`client_ip_headers
|
||||||
|
Cf-Connecting-Ip X-Forwarded-For`** — so the real visitor IP is used for
|
||||||
|
logging/matchers, but only when the request genuinely comes from Cloudflare
|
||||||
|
(prevents header spoofing from any other source). The `cloudflare` IP source
|
||||||
|
([WeidiDeng/caddy-cloudflare-ip](https://github.com/WeidiDeng/caddy-cloudflare-ip),
|
||||||
|
baked into the `caddy-cf` image) auto-fetches the ranges from
|
||||||
|
<https://www.cloudflare.com/ips-v4/> and <https://www.cloudflare.com/ips-v6/>
|
||||||
|
and refreshes them on the configured `interval`, so there is no static list to
|
||||||
|
maintain:
|
||||||
|
|
||||||
|
```caddy
|
||||||
|
trusted_proxies cloudflare {
|
||||||
|
interval 12h
|
||||||
|
timeout 15s
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`client_ip_headers` lists which header holds the real visitor IP:
|
||||||
|
`Cf-Connecting-Ip` is Cloudflare's single authoritative end-user IP, with
|
||||||
|
`X-Forwarded-For` as the fallback. It is only trusted for requests coming from
|
||||||
|
the `trusted_proxies` above.
|
||||||
|
|
||||||
|
> If you ever run without the `caddy-cloudflare-ip` plugin, you can instead
|
||||||
|
> pin the static ranges with `trusted_proxies static <ip/cidr ...>` copied
|
||||||
|
> from the Cloudflare IP pages, but then you must keep them in sync manually.
|
||||||
|
|
||||||
|
Deploy and reload:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Put the Caddyfile in place on the caddy_cf host (e.g. into the ./conf mount),
|
||||||
|
# then reload without downtime:
|
||||||
|
docker exec caddy_cf caddy reload --config /etc/caddy/Caddyfile
|
||||||
|
|
||||||
|
# Verify from the host (expect HTTP 200, Content-Encoding: gzip, X-Frame-Options):
|
||||||
|
curl -sI -H "Accept-Encoding: gzip" http://localhost/ | grep -iE 'HTTP|content-encoding|x-frame'
|
||||||
|
```
|
||||||
|
|
||||||
|
> **Cloudflare SSL/TLS mode:** set it to **Full** so the Cloudflare→origin hop
|
||||||
|
> is encrypted at the network layer (e.g. over Netbird), even though Caddy's
|
||||||
|
> listener is plain HTTP.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
The remaining sections describe **topology 2** (Caddy terminates TLS itself via
|
||||||
|
the Cloudflare DNS-01 challenge) for setups without a Cloudflare proxy in front.
|
||||||
|
|
||||||
|
## Docker Compose (Gimli)
|
||||||
|
|
||||||
|
Run Caddy and the blog container on the same Docker network. Caddy reaches the
|
||||||
|
blog by its service name (`blog`) over the internal network, so the blog's port
|
||||||
|
does **not** need to be published to the host.
|
||||||
|
|
||||||
|
The Cloudflare API token is passed to Caddy as the `CF_API_TOKEN` environment
|
||||||
|
variable and referenced from the Caddyfile — keep it out of the committed
|
||||||
|
config. Store it in a `.env` file (git-ignored) next to `compose.yml`:
|
||||||
|
|
||||||
|
```dotenv
|
||||||
|
# .env
|
||||||
|
CF_API_TOKEN=your-cloudflare-api-token-with-zone-dns-edit
|
||||||
|
```
|
||||||
|
|
||||||
|
### `compose.yml`
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
blog:
|
||||||
|
image: ghcr.io/ahmzaa/blog-ahmza-com
|
||||||
|
restart: unless-stopped
|
||||||
|
# No host port mapping needed — only Caddy talks to it, over the
|
||||||
|
# internal Docker network. Remove the previous "80:80" publish.
|
||||||
|
expose:
|
||||||
|
- "80"
|
||||||
|
|
||||||
|
caddy:
|
||||||
|
image: ghcr.io/ahmzaa/caddy-cf:latest # Caddy + Cloudflare DNS module
|
||||||
|
restart: unless-stopped
|
||||||
|
container_name: caddy-cf
|
||||||
|
ports:
|
||||||
|
- "80:80"
|
||||||
|
- "443:443"
|
||||||
|
- "443:443/udp" # HTTP/3 (QUIC)
|
||||||
|
environment:
|
||||||
|
# Consumed by the {env.CF_API_TOKEN} placeholder in the Caddyfile.
|
||||||
|
- CF_API_TOKEN=${CF_API_TOKEN}
|
||||||
|
volumes:
|
||||||
|
- ./conf:/etc/caddy # contains the Caddyfile
|
||||||
|
- ./data:/data # persists certificates — DO NOT lose this
|
||||||
|
- ./config:/config
|
||||||
|
```
|
||||||
|
|
||||||
|
Place the Caddyfile at `./conf/Caddyfile`.
|
||||||
|
|
||||||
|
### `./conf/Caddyfile`
|
||||||
|
|
||||||
|
```caddy
|
||||||
|
# Reusable Cloudflare DNS-01 TLS snippet. The token is read from the
|
||||||
|
# CF_API_TOKEN environment variable so it never lives in the config file.
|
||||||
|
(cloudflare) {
|
||||||
|
tls {
|
||||||
|
dns cloudflare {env.CF_API_TOKEN}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
blog.ahmza.com {
|
||||||
|
# Obtain/renew the cert via the Cloudflare DNS-01 challenge.
|
||||||
|
import cloudflare
|
||||||
|
|
||||||
|
# Reverse proxy to the blog container by its compose service name.
|
||||||
|
reverse_proxy blog:80 {
|
||||||
|
# Use the SWS health endpoint for active upstream checks.
|
||||||
|
health_uri /health
|
||||||
|
health_interval 10s
|
||||||
|
health_timeout 2s
|
||||||
|
}
|
||||||
|
|
||||||
|
# Compression is done here, not in SWS.
|
||||||
|
encode zstd gzip
|
||||||
|
|
||||||
|
# Security headers live here so there is a single source of truth.
|
||||||
|
header {
|
||||||
|
Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
|
||||||
|
X-Content-Type-Options "nosniff"
|
||||||
|
X-Frame-Options "SAMEORIGIN"
|
||||||
|
Referrer-Policy "strict-origin-when-cross-origin"
|
||||||
|
# Remove Caddy's default Server header
|
||||||
|
-Server
|
||||||
|
}
|
||||||
|
|
||||||
|
log {
|
||||||
|
output stdout
|
||||||
|
format console
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
> **Certificate persistence:** the `./data` volume stores the issued
|
||||||
|
> certificates and ACME account key. Keep it — deleting it forces Caddy to
|
||||||
|
> re-request certificates and can hit Let's Encrypt rate limits.
|
||||||
|
|
||||||
|
Bring it up with:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Kubernetes (Raspberry Pi cluster)
|
||||||
|
|
||||||
|
The blog runs as a `Deployment` behind a `Service`. Caddy runs as its own
|
||||||
|
`Deployment` and proxies to that Service via in-cluster DNS
|
||||||
|
(`blog.blog-ahmza-com.svc.cluster.local`, or just `blog` from within the same
|
||||||
|
namespace).
|
||||||
|
|
||||||
|
### Cloudflare API token Secret
|
||||||
|
|
||||||
|
Store the Cloudflare API token in a `Secret` and inject it into the Caddy
|
||||||
|
container as the `CF_API_TOKEN` environment variable (never bake it into the
|
||||||
|
ConfigMap):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
kubectl create secret generic caddy-cloudflare \
|
||||||
|
--namespace blog-ahmza-com \
|
||||||
|
--from-literal=CF_API_TOKEN='your-cloudflare-api-token-with-zone-dns-edit'
|
||||||
|
```
|
||||||
|
|
||||||
|
### Caddyfile via ConfigMap
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: caddy-config
|
||||||
|
namespace: blog-ahmza-com
|
||||||
|
data:
|
||||||
|
Caddyfile: |
|
||||||
|
(cloudflare) {
|
||||||
|
tls {
|
||||||
|
dns cloudflare {env.CF_API_TOKEN}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
blog.ahmza.com {
|
||||||
|
import cloudflare
|
||||||
|
|
||||||
|
reverse_proxy blog:80 {
|
||||||
|
health_uri /health
|
||||||
|
health_interval 10s
|
||||||
|
health_timeout 2s
|
||||||
|
}
|
||||||
|
|
||||||
|
encode zstd gzip
|
||||||
|
|
||||||
|
header {
|
||||||
|
Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
|
||||||
|
X-Content-Type-Options "nosniff"
|
||||||
|
X-Frame-Options "SAMEORIGIN"
|
||||||
|
Referrer-Policy "strict-origin-when-cross-origin"
|
||||||
|
-Server
|
||||||
|
}
|
||||||
|
|
||||||
|
log {
|
||||||
|
output stdout
|
||||||
|
format console
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Caddy Deployment + Service
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: caddy
|
||||||
|
namespace: blog-ahmza-com
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: caddy
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: caddy
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: caddy
|
||||||
|
image: ghcr.io/ahmzaa/caddy-cf:latest # Caddy + Cloudflare DNS module
|
||||||
|
ports:
|
||||||
|
- containerPort: 80
|
||||||
|
- containerPort: 443
|
||||||
|
- containerPort: 443
|
||||||
|
protocol: UDP
|
||||||
|
env:
|
||||||
|
- name: CF_API_TOKEN
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: caddy-cloudflare
|
||||||
|
key: CF_API_TOKEN
|
||||||
|
volumeMounts:
|
||||||
|
- name: config
|
||||||
|
mountPath: /etc/caddy
|
||||||
|
- name: data
|
||||||
|
mountPath: /data # certificate storage — must persist
|
||||||
|
volumes:
|
||||||
|
- name: config
|
||||||
|
configMap:
|
||||||
|
name: caddy-config
|
||||||
|
- name: data
|
||||||
|
persistentVolumeClaim:
|
||||||
|
claimName: caddy-data
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: PersistentVolumeClaim
|
||||||
|
metadata:
|
||||||
|
name: caddy-data
|
||||||
|
namespace: blog-ahmza-com
|
||||||
|
spec:
|
||||||
|
accessModes: ["ReadWriteOnce"]
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
storage: 256Mi
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: caddy
|
||||||
|
namespace: blog-ahmza-com
|
||||||
|
spec:
|
||||||
|
type: LoadBalancer # or NodePort, depending on the cluster
|
||||||
|
selector:
|
||||||
|
app: caddy
|
||||||
|
ports:
|
||||||
|
- name: http
|
||||||
|
port: 80
|
||||||
|
targetPort: 80
|
||||||
|
- name: https
|
||||||
|
port: 443
|
||||||
|
targetPort: 443
|
||||||
|
```
|
||||||
|
|
||||||
|
> **Blog Service:** the existing `blog` Service should expose port `80` and
|
||||||
|
> target the SWS container port `80`. Caddy reaches it as `blog:80` from inside
|
||||||
|
> the same namespace.
|
||||||
|
|
||||||
|
> **Certificate persistence:** the `caddy-data` PVC is the K8s equivalent of the
|
||||||
|
> `./data` Docker volume. Without a persistent volume, a pod restart wipes
|
||||||
|
> the certificates and re-triggers ACME issuance.
|
||||||
|
|
||||||
|
> **DNS-01 and Netbird:** because certificates are issued via the Cloudflare
|
||||||
|
> DNS-01 challenge, the cluster does **not** need inbound `80`/`443` from the
|
||||||
|
> public internet for ACME. The `LoadBalancer`/`NodePort` above only needs to be
|
||||||
|
> reachable by your clients (e.g. over Netbird or your LAN).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Notes and gotchas
|
||||||
|
|
||||||
|
- **DNS-01 needs no inbound reachability.** Because the `caddy-cf` image solves
|
||||||
|
the ACME challenge via the Cloudflare API (DNS-01), Caddy does **not** need
|
||||||
|
ports `80`/`443` exposed to the public internet to issue certificates. This is
|
||||||
|
what makes it work behind Netbird. It does need outbound HTTPS to the Let's
|
||||||
|
Encrypt and Cloudflare APIs.
|
||||||
|
- **Cloudflare API token scope.** The token needs **Zone → DNS → Edit** on the
|
||||||
|
`ahmza.com` zone. Keep it in a `.env` file (Docker) or a `Secret` (K8s), never
|
||||||
|
in the committed Caddyfile — the config references it as `{env.CF_API_TOKEN}`.
|
||||||
|
- **DNS must be managed by Cloudflare.** The `ahmza.com` zone has to be hosted on
|
||||||
|
Cloudflare for the DNS-01 challenge to create the required `_acme-challenge`
|
||||||
|
TXT record.
|
||||||
|
- **Do not double-compress.** SWS compression is off by design; Caddy's `encode`
|
||||||
|
directive is the only place compression happens. Enabling both wastes CPU.
|
||||||
|
- **Do not duplicate headers.** Security headers are set in the `Caddyfile`. SWS
|
||||||
|
has `security-headers = false` so there is no conflict.
|
||||||
|
- **Cache-Control comes from the origin.** SWS already sets long-lived caching on
|
||||||
|
static assets and short/no-cache on HTML. Caddy passes these through; avoid
|
||||||
|
adding conflicting `Cache-Control` header directives in the `Caddyfile`.
|
||||||
|
- **Health checks.** Both examples use SWS's `/health` endpoint for active
|
||||||
|
upstream health checking, and it also works as a K8s liveness/readiness probe
|
||||||
|
on the blog pod itself.
|
||||||
|
- **HTTP/3.** The Docker example publishes `443/udp` to enable QUIC. Remove it if
|
||||||
|
your network path does not support UDP.
|
||||||
@@ -2,4 +2,4 @@ module github.com/ahmzaa/blog-ahmza-com
|
|||||||
|
|
||||||
go 1.24.3
|
go 1.24.3
|
||||||
|
|
||||||
require github.com/nunocoracao/blowfish/v2 v2.86.0 // indirect
|
require github.com/nunocoracao/blowfish/v3 v3.4.0
|
||||||
|
|||||||
@@ -0,0 +1,2 @@
|
|||||||
|
github.com/nunocoracao/blowfish/v3 v3.4.0 h1:Fv7mS97lagllTGzHA2V1H6+N5fuQd3DuWmOQlFFV4Aw=
|
||||||
|
github.com/nunocoracao/blowfish/v3 v3.4.0/go.mod h1:8lJwR95VgcyWDhjKvUJMdOQXogrmhYSxkWh4ogSJfCg=
|
||||||
@@ -1 +1 @@
|
|||||||
<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank"{{ end }}>{{ .Text | safeHTML }}</a>
|
<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank" rel="noopener noreferrer"{{ end }}>{{ .Text | safeHTML }}</a>
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
<br>
|
<br>
|
||||||
<div class="flex items-center gap-x-5">
|
<div class="flex items-center gap-x-5">
|
||||||
<a class="text-sm text-neutral-500 dark:text-neutral-400 rel='me'" href="https://mastodon.social/@ahmza">Mastodon</a>
|
<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://mastodon.social/@ahmza">Mastodon</a>
|
||||||
<a class="text-sm text-neutral-500 dark:text-neutral-400 rel='me'" href="https://github.com/ahmzaa">Github</a>
|
<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://www.linkedin.com/in/ahmza/">Linkedin</a>
|
||||||
<a class="text-sm text-neutral-500 dark:text-neutral-400 rel='me'" href="https://www.linkedin.com/in/ahmza/">Linkedin</a>
|
<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://github.com/ahmzaa">Github</a>
|
||||||
|
<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://gitlab.com/ahmza">Gitlab</a>
|
||||||
|
<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://tea.ahmza.com/ahmza">Gitea</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
<img src="{{ .Get "url"}}" alt="{{ .Get "alt"}}" style="display:block;margin-left:auto;margin-right:auto;width:50%;height:auto;padding:10px;">
|
<img src="{{ .Get "url"}}" alt="{{ .Get "alt"}}" loading="lazy" decoding="async" style="display:block;margin-left:auto;margin-right:auto;width:50%;height:auto;padding:10px;">
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<video autoplay loop muted playsinline aria-label='{{ .Get "label"}}' style="display:block;margin-left:auto;margin-right:auto;width:50%;height:auto;padding:10px;">
|
<video autoplay loop muted playsinline preload="metadata" aria-label='{{ .Get "label"}}' style="display:block;margin-left:auto;margin-right:auto;width:50%;height:auto;padding:10px;">
|
||||||
{{ with .Get "mp4" }}<source src="{{ . }}" type="video/mp4">{{ end }}
|
{{ with .Get "mp4" }}<source src="{{ . }}" type="video/mp4">{{ end }}
|
||||||
{{ with .Get "webm" }}<source src="{{ . }}" type="video/webm">{{ end }}
|
{{ with .Get "webm" }}<source src="{{ . }}" type="video/webm">{{ end }}
|
||||||
</video>
|
</video>
|
||||||
|
|||||||
-70
@@ -1,70 +0,0 @@
|
|||||||
# auto detects a good number of processes to run
|
|
||||||
worker_processes auto;
|
|
||||||
|
|
||||||
#Provides the configuration file context in which the directives that affect connection processing are specified.
|
|
||||||
events {
|
|
||||||
# Sets the maximum number of simultaneous connections that can be opened by a worker process.
|
|
||||||
worker_connections 1024;
|
|
||||||
# Tells the worker to accept multiple connections at a time
|
|
||||||
multi_accept on;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
http {
|
|
||||||
# what times to include
|
|
||||||
include /etc/nginx/mime.types;
|
|
||||||
# what is the default one
|
|
||||||
default_type application/octet-stream;
|
|
||||||
|
|
||||||
# Sets the path, format, and configuration for a buffered log write
|
|
||||||
log_format compression '$remote_addr - $remote_user [$time_local] '
|
|
||||||
'"$request" $status $upstream_addr '
|
|
||||||
'"$http_referer" "$http_user_agent"';
|
|
||||||
|
|
||||||
gzip on;
|
|
||||||
gzip_disable "MSIE [1-6]\.(?!.*SV1)";
|
|
||||||
gzip_vary on;
|
|
||||||
gzip_proxied any;
|
|
||||||
gzip_comp_level 9;
|
|
||||||
gzip_buffers 10 8k;
|
|
||||||
gzip_http_version 1.1;
|
|
||||||
gzip_types text/plain text/css text/xml text/javascript image/webp image/svg+xml image/x-icon application/javascript application/x-javascript application/json application/xml application/xml+rss;
|
|
||||||
|
|
||||||
server {
|
|
||||||
# listen on port 80
|
|
||||||
listen 80;
|
|
||||||
# save logs here
|
|
||||||
access_log /var/log/nginx/access.log compression;
|
|
||||||
|
|
||||||
# where's the root dir
|
|
||||||
root /usr/share/nginx/html;
|
|
||||||
# what file to serve as index
|
|
||||||
index index.html index.htm;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
# First attempt to serve request as file, then
|
|
||||||
# as directory, then fall back to redirecting to index.html
|
|
||||||
try_files $uri $uri/ /index.html;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Media: images, icons, video, audio, HTC
|
|
||||||
location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|htc|webp)$ {
|
|
||||||
expires 1y;
|
|
||||||
access_log off;
|
|
||||||
add_header Cache-Control "public";
|
|
||||||
}
|
|
||||||
|
|
||||||
# Javascript and CSS files
|
|
||||||
location ~* \.(?:css|js)$ {
|
|
||||||
try_files $uri =404;
|
|
||||||
expires 1y;
|
|
||||||
access_log off;
|
|
||||||
add_header Cache-Control "public";
|
|
||||||
}
|
|
||||||
|
|
||||||
# Any route containing a file extension (e.g. /devicesfile.js)
|
|
||||||
location ~ ^.+\..+$ {
|
|
||||||
try_files $uri =404;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
## Commit messages
|
|
||||||
backend:
|
|
||||||
name: github
|
|
||||||
repo: ahmzaa/blog-ahmza-com
|
|
||||||
branch: main
|
|
||||||
squash_merges: true
|
|
||||||
base_url: https://sveltia-cms-auth.hamzaahmed12328.workers.dev
|
|
||||||
use_graphql: true
|
|
||||||
commit_messages:
|
|
||||||
create: Create {{collection}} "{{slug}}"
|
|
||||||
update: Update {{collection}} "{{slug}}"
|
|
||||||
delete: Delete {{collection}} "{{slug}}"
|
|
||||||
uploadMedia: Upload "{{path}}"
|
|
||||||
deleteMedia: Delete "{{path}}"
|
|
||||||
openAuthoring: '{{message}}'
|
|
||||||
|
|
||||||
## Publish mode
|
|
||||||
publish_mode: editorial_workflow # Allowed Values: simple, editorial_workflow
|
|
||||||
|
|
||||||
## Media and Public folders
|
|
||||||
#Media
|
|
||||||
media_folder: "assets/uploaded/img"
|
|
||||||
public_folder: "/uploaded/img"
|
|
||||||
|
|
||||||
## SiteTitle
|
|
||||||
site_url: htpps://blog.ahmza.com
|
|
||||||
display_url: blog.ahmza.com
|
|
||||||
logo_url: https://blog.ahmza.com/logo.webp
|
|
||||||
|
|
||||||
## Collections
|
|
||||||
collections:
|
|
||||||
- name: posts
|
|
||||||
identifier_field: name
|
|
||||||
label: posts
|
|
||||||
label_singular: post
|
|
||||||
icon: article
|
|
||||||
description: sites main content, blog posts
|
|
||||||
folder: "content/posts"
|
|
||||||
path: "{{slug}}/index"
|
|
||||||
media_folder: ""
|
|
||||||
public_folder: ""
|
|
||||||
create: true
|
|
||||||
slug: '{{slug}}'
|
|
||||||
fields:
|
|
||||||
- {label: "Title", name: "title", widget: "string"}
|
|
||||||
- {label: "Featured Image", name: "featureimage", widget: "image"}
|
|
||||||
- {label: "Featured Image Caption", name: "featureimagecaption", widget: "string"}
|
|
||||||
- {label: "Publish Date", name: "date", widget: "datetime", default: "{{now}}", date_format: "YYYY-MM-DD"}
|
|
||||||
- {label: "Last Modified", name: "lastmod", widget: "datetime", default: "{{now}}", date_format: "YYYY-MM-DD"}
|
|
||||||
- {label: "Author", name: "author", widget: "string", default: "ahmza"}
|
|
||||||
- {label: "Draft", name: "draft", widget: "boolean", default: "false"}
|
|
||||||
- {label: "Tags", name: "tags", widget: "list"}
|
|
||||||
- {label: "Description", name: "description", widget: "string"}
|
|
||||||
- {label: "Body", name: "body", widget: "markdown"}
|
|
||||||
extension: md
|
|
||||||
sortable_fields: ['title', 'date', 'lastmod', 'tags']
|
|
||||||
view_filters:
|
|
||||||
- label: "ahmza's posts"
|
|
||||||
field: author
|
|
||||||
pattern: 'ahmza'
|
|
||||||
- label: Drafts
|
|
||||||
field: draft
|
|
||||||
pattern: true
|
|
||||||
view_groups:
|
|
||||||
- label: Year
|
|
||||||
field: date
|
|
||||||
pattern: \d{4}
|
|
||||||
- label: Drafts
|
|
||||||
field: draft
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<meta name="robots" content="noindex" />
|
|
||||||
<title>Content Manager</title>
|
|
||||||
<!-- Include the script that enables Netlify Identity on this page. -->
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<!-- Include the script that builds the page and powers Decap CMS -->
|
|
||||||
<script src="https://unpkg.com/@sveltia/cms/dist/sveltia-cms.js"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,47 @@
|
|||||||
|
[general]
|
||||||
|
|
||||||
|
#### Server
|
||||||
|
|
||||||
|
# Listen on all interfaces, port 80 (matches previous nginx setup)
|
||||||
|
host = "0.0.0.0"
|
||||||
|
port = 80
|
||||||
|
|
||||||
|
# Root directory of the static site (Hugo `public/` output)
|
||||||
|
root = "/public"
|
||||||
|
|
||||||
|
# Number of worker threads (0 = auto-detect based on CPU cores)
|
||||||
|
threads-multiplier = 1
|
||||||
|
|
||||||
|
# Log level
|
||||||
|
log-level = "info"
|
||||||
|
|
||||||
|
#### Performance / caching
|
||||||
|
|
||||||
|
# Compression is handled by the upstream reverse proxy, so it is disabled
|
||||||
|
# here to avoid doing the work twice (wasted CPU per request). Re-enable if
|
||||||
|
# SWS is ever exposed directly without a compressing proxy in front.
|
||||||
|
compression = false
|
||||||
|
compression-static = false
|
||||||
|
|
||||||
|
# Emit Cache-Control + ETag headers with sensible per-content-type defaults.
|
||||||
|
# The origin is the correct place to declare cacheability; the proxy/CDN
|
||||||
|
# passes these through. SWS applies long-lived caching to static assets
|
||||||
|
# (images, css, js, fonts) and short/no-cache to HTML.
|
||||||
|
cache-control-headers = true
|
||||||
|
|
||||||
|
#### Routing
|
||||||
|
|
||||||
|
# No SPA-style page fallback: this is a static Hugo site, not a single-page app.
|
||||||
|
# Missing paths should return Hugo's generated 404.html with a real 404 status
|
||||||
|
# (SWS serves /public/404.html automatically) rather than masking broken links
|
||||||
|
# with a 200 homepage response, which harms SEO (soft 404s).
|
||||||
|
|
||||||
|
#### Security
|
||||||
|
|
||||||
|
# Security headers are set by the upstream reverse proxy, so they are
|
||||||
|
# disabled here to avoid duplicate/conflicting headers. Let one layer own
|
||||||
|
# the security posture. Re-enable if SWS is exposed without such a proxy.
|
||||||
|
security-headers = false
|
||||||
|
|
||||||
|
# Health endpoint at /health for container/K8s liveness probes
|
||||||
|
health = true
|
||||||
Reference in New Issue
Block a user