Skip to content
Open
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e847091
feat(docs): adding haproxy configuration example
kirby0025 Jun 2, 2025
4bc7f3b
Implement code changes to enhance functionality and improve performance
seanmorley15 Jun 20, 2025
0723ad7
Update nl.json
Ycer0n Jun 23, 2025
dc67ad1
Merge pull request #694 from Ycer0n/patch-1
seanmorley15 Jun 23, 2025
12a5221
feat(security): add Trivy security scans for Docker images and source…
seanmorley15 Jun 23, 2025
d865454
feat(security): restructure Trivy scans for improved clarity and orga…
seanmorley15 Jun 23, 2025
5026243
fix(dependencies): update Django version to 5.2.2
seanmorley15 Jun 23, 2025
d797095
style(workflows): standardize quotes and fix typo in frontend-test.yml
seanmorley15 Jun 23, 2025
b8d30d2
feat(workflows): add job names for clarity in backend and frontend te…
seanmorley15 Jun 23, 2025
e335d7d
refactor(workflows): remove path filters from pull_request and push t…
seanmorley15 Jun 23, 2025
42982d5
Merge branch 'development' into feat/docs_haproy
seanmorley15 Jun 23, 2025
00a6e67
feat(workflows): add paths to push and pull_request triggers for back…
seanmorley15 Jun 23, 2025
bad7021
Merge branch 'development' into feat/docs_haproy
seanmorley15 Jun 23, 2025
b6e5e4a
refactor(workflows): simplify trigger paths for backend and frontend …
seanmorley15 Jun 23, 2025
ed11d29
fix(package): add missing pnpm overrides for esbuild in package.json
seanmorley15 Jun 23, 2025
b4407dc
fix(workflows): add missing severity parameter for Trivy filesystem scan
seanmorley15 Jun 23, 2025
6665422
fix(workflows): add missing severity parameter for Docker image scans…
seanmorley15 Jun 23, 2025
295ecd1
fix(workflows): remove MEDIUM severity from Trivy scans in security w…
seanmorley15 Jun 23, 2025
1609c9e
Merge branch 'development' into feat/docs_haproy
seanmorley15 Jun 23, 2025
5308ec2
added-fix-image-deletion (#681)
taninme Jun 23, 2025
ce3fa9d
fix(docs): enhance HAProxy description in installation guide
seanmorley15 Jun 24, 2025
7b3d7aa
Merge branch 'development' into feat/docs_haproy
seanmorley15 Jun 24, 2025
493a139
Rename Adventures to Locations (#696)
seanmorley15 Jun 25, 2025
c461f7b
Import and Export Functionality (#698)
seanmorley15 Jun 26, 2025
fc358b9
enhance haproxy example
kirby0025 Jul 7, 2025
83e6510
Merge branch 'development' into feat/docs_haproy
kirby0025 Jul 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions .github/workflows/backend-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,33 @@ permissions:

on:
pull_request:
paths:
- 'backend/server/**'
- '.github/workflows/backend-test.yml'
push:
paths:
- 'backend/server/**'
- '.github/workflows/backend-test.yml'

jobs:
build:
name: Build and Test Backend
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: set up python 3.12
uses: actions/setup-python@v5
with:
python-version: '3.12'
python-version: "3.12"

- name: install dependencies
run: |
sudo apt update -q
sudo apt install -y -q \
python3-gdal
sudo apt install -y -q python3-gdal

- name: start database
run: |
docker compose -f .github/.docker-compose-database.yml up -d

- name: install python libreries
- name: install python libraries
working-directory: backend/server
run: |
pip install -r requirements.txt
run: pip install -r requirements.txt

- name: run server
working-directory: backend/server
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/frontend-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@ permissions:

on:
pull_request:
paths:
- "frontend/**"
- ".github/workflows/frontend-test.yml"
push:
paths:
- "frontend/**"
- ".github/workflows/frontend-test.yml"

jobs:
build:
name: Build and Test Frontend
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

Expand Down
75 changes: 75 additions & 0 deletions .github/workflows/trivy_security_scans.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Trivy Security Scans

on:
push:
branches:
- main
- development
pull_request:
branches:
- main
- development
schedule:
- cron: "0 8 * * 1" # Weekly scan on Mondays at 8 AM UTC

jobs:
filesystem-scan:
name: Trivy Filesystem Scan (Source Code)
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Scan source code (Filesystem) with Trivy
uses: aquasecurity/trivy-action@master
with:
scan-type: fs
scan-ref: .
format: table
exit-code: 1
ignore-unfixed: true
severity: CRITICAL,HIGH

image-scan:
name: Trivy Docker Image Scan (Backend & Frontend)
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

# Optional login step (remove if you're not pushing images to GHCR)
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build backend Docker image
run: docker build -t adventurelog-backend ./backend

- name: Build frontend Docker image
run: docker build -t adventurelog-frontend ./frontend

- name: Scan backend Docker image with Trivy
uses: aquasecurity/trivy-action@master
with:
image-ref: adventurelog-backend
format: table
exit-code: 1
ignore-unfixed: true
severity: CRITICAL,HIGH

- name: Scan frontend Docker image with Trivy
uses: aquasecurity/trivy-action@master
with:
image-ref: adventurelog-frontend
format: table
exit-code: 1
ignore-unfixed: true
severity: CRITICAL,HIGH
2 changes: 1 addition & 1 deletion backend/server/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==5.2.1
Django==5.2.2
djangorestframework>=3.15.2
django-allauth==0.63.3
drf-yasg==1.21.4
Expand Down
1 change: 1 addition & 0 deletions documentation/.vitepress/config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ export default defineConfig({
},
{ text: "Traefik", link: "/docs/install/traefik" },
{ text: "Caddy", link: "/docs/install/caddy" },
{ text: "HAProxy", link: "/docs/install/haproxy" },
],
},
],
Expand Down
1 change: 1 addition & 0 deletions documentation/docs/install/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ Perfect for Docker beginners.
- [Nginx Proxy Manager](nginx_proxy_manager.md) — Easy reverse proxy config
- [Traefik](traefik.md) — Dynamic reverse proxy with automation
- [Caddy](caddy.md) — Automatic HTTPS with a clean config
- [HAProxy](haproxy.md) — High-performance reverse proxy with advanced control
23 changes: 23 additions & 0 deletions documentation/docs/install/haproxy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Installation with Haproxy

HAProxy is a free and open source software that provides a high availability load balancer and Proxy for TCP and HTTP-based applications.

You need to make the frontend and the backend available in order to have your AdventureLog working properly.
To do this, you will need to add 2 ACLs and 2 corresponding HAProxy backends in your haproxy configuration :
- One for your regular Adventurelog domain that will direct the requests to the frontend.
- One for the URLs that need to access the backend.

Example :

```
acl is_adventurelog hdr_sub(Host) -i adventurelog
acl is_adventurelog_backend path_beg /media/ or /admin/

use_backend adventurelog_media if is_adventurelog is_adventurelog_backend
use_backend adventurelog if is_adventurelog

backend alog
server adventurelog 192.168.1.100:3000 check
Copy link
Contributor

@UndyingSoul UndyingSoul Jul 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't really used HAProxy, but I would think the 192.x ip address shoul be either 127.0.0.1 or localhost, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It depends on your local network. My local is haproxy balancing to other VMs, but if you do container on the same host it shoud be 127.0.0.1 yes.

backend adventurelog_backend
server adventurelog_media 192.168.1.100:8000 check
```
8 changes: 8 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,13 @@
"qrcode": "^1.5.4",
"svelte-i18n": "^4.0.1",
"svelte-maplibre": "^0.9.8"
},
"overrides": {
"esbuild": "^0.25.0"
},
"pnpm": {
"overrides": {
"esbuild": "^0.25.0"
}
}
}
Loading