From 11edb4d7bb74b1ab1d476abe0b72e3f6f0ac3b2a Mon Sep 17 00:00:00 2001
From: Tom Hubrecht
Date: Tue, 5 Dec 2023 21:29:05 +0100
Subject: [PATCH 01/24] feat: Init ssg cache workflow
---
.forgejo/workflows/cache-ssg.yaml | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 .forgejo/workflows/cache-ssg.yaml
diff --git a/.forgejo/workflows/cache-ssg.yaml b/.forgejo/workflows/cache-ssg.yaml
new file mode 100644
index 0000000..5025c14
--- /dev/null
+++ b/.forgejo/workflows/cache-ssg.yaml
@@ -0,0 +1,31 @@
+name: Cache the SSG build
+run-name: cache-ssg
+
+on:
+ push:
+ paths:
+ - 'ssg/**'
+
+jobs:
+ build-cache:
+ runs-on: debian-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ path: dgnum.eu
+
+ - name: Install sudo
+ run: apt update && apt install sudo
+
+ - name: Install Nix
+ uses: https://github.com/cachix/install-nix-action@v22
+ with:
+ nix_path: nixpkgs=channel:nixos-unstable
+
+ - name: Install attic, build and cache
+ run: |
+ nix-env -iA npins
+
+ npins init
+ npins add github zhaofengli attic -b main
+
From d9a0f7ad5ea9224817277222ddfb0cdd3fc3416d Mon Sep 17 00:00:00 2001
From: Tom Hubrecht
Date: Tue, 5 Dec 2023 21:31:27 +0100
Subject: [PATCH 02/24] feat: Init ssg cache workflow
---
.forgejo/workflows/cache-ssg.yaml | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 .forgejo/workflows/cache-ssg.yaml
diff --git a/.forgejo/workflows/cache-ssg.yaml b/.forgejo/workflows/cache-ssg.yaml
new file mode 100644
index 0000000..5025c14
--- /dev/null
+++ b/.forgejo/workflows/cache-ssg.yaml
@@ -0,0 +1,31 @@
+name: Cache the SSG build
+run-name: cache-ssg
+
+on:
+ push:
+ paths:
+ - 'ssg/**'
+
+jobs:
+ build-cache:
+ runs-on: debian-latest
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ path: dgnum.eu
+
+ - name: Install sudo
+ run: apt update && apt install sudo
+
+ - name: Install Nix
+ uses: https://github.com/cachix/install-nix-action@v22
+ with:
+ nix_path: nixpkgs=channel:nixos-unstable
+
+ - name: Install attic, build and cache
+ run: |
+ nix-env -iA npins
+
+ npins init
+ npins add github zhaofengli attic -b main
+
From e7b6cef91d0e4a00744c16688ee43763977e5b9c Mon Sep 17 00:00:00 2001
From: Tom Hubrecht
Date: Tue, 5 Dec 2023 21:33:07 +0100
Subject: [PATCH 03/24] feat: Update ssg cache workflow
---
.forgejo/workflows/cache-ssg.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.forgejo/workflows/cache-ssg.yaml b/.forgejo/workflows/cache-ssg.yaml
index 5025c14..b20816c 100644
--- a/.forgejo/workflows/cache-ssg.yaml
+++ b/.forgejo/workflows/cache-ssg.yaml
@@ -5,6 +5,7 @@ on:
push:
paths:
- 'ssg/**'
+ - '.forgejo/workflows/cache-ssg.yaml'
jobs:
build-cache:
@@ -15,7 +16,7 @@ jobs:
path: dgnum.eu
- name: Install sudo
- run: apt update && apt install sudo
+ run: apt-get update && apt-get install sudo
- name: Install Nix
uses: https://github.com/cachix/install-nix-action@v22
@@ -24,8 +25,7 @@ jobs:
- name: Install attic, build and cache
run: |
- nix-env -iA npins
+ nix-env -i npins -f ''
npins init
npins add github zhaofengli attic -b main
-
From c948d74afa67bbc3e1b26f7a87fe32a4eb9c3e1a Mon Sep 17 00:00:00 2001
From: Tom Hubrecht
Date: Fri, 15 Dec 2023 22:27:48 +0100
Subject: [PATCH 04/24] feat(workflows): Switch to nix runner
---
.forgejo/workflows/cache-ssg.yaml | 31 ----------------------------
.forgejo/workflows/deploy-dgnum.yaml | 9 +-------
2 files changed, 1 insertion(+), 39 deletions(-)
delete mode 100644 .forgejo/workflows/cache-ssg.yaml
diff --git a/.forgejo/workflows/cache-ssg.yaml b/.forgejo/workflows/cache-ssg.yaml
deleted file mode 100644
index 5025c14..0000000
--- a/.forgejo/workflows/cache-ssg.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Cache the SSG build
-run-name: cache-ssg
-
-on:
- push:
- paths:
- - 'ssg/**'
-
-jobs:
- build-cache:
- runs-on: debian-latest
- steps:
- - uses: actions/checkout@v3
- with:
- path: dgnum.eu
-
- - name: Install sudo
- run: apt update && apt install sudo
-
- - name: Install Nix
- uses: https://github.com/cachix/install-nix-action@v22
- with:
- nix_path: nixpkgs=channel:nixos-unstable
-
- - name: Install attic, build and cache
- run: |
- nix-env -iA npins
-
- npins init
- npins add github zhaofengli attic -b main
-
diff --git a/.forgejo/workflows/deploy-dgnum.yaml b/.forgejo/workflows/deploy-dgnum.yaml
index e5d787e..8cbf613 100644
--- a/.forgejo/workflows/deploy-dgnum.yaml
+++ b/.forgejo/workflows/deploy-dgnum.yaml
@@ -8,19 +8,12 @@ on:
jobs:
publish:
- runs-on: debian-latest
+ runs-on: nix
steps:
- uses: actions/checkout@v3
with:
path: dgnum.eu
- - name: install sudo
- run: apt update && apt install sudo
-
- - uses: https://github.com/cachix/install-nix-action@v22
- with:
- nix_path: nixpkgs=channel:nixos-unstable
-
- name: Build website
run: |
# Hack to set the cache in the working directory
From d7aee6e540b94a84bce73688b86490b45e551f40 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht
Date: Fri, 15 Dec 2023 22:44:58 +0100
Subject: [PATCH 05/24] fix(workflows): Install openssh
---
.forgejo/workflows/deploy-dgnum.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.forgejo/workflows/deploy-dgnum.yaml b/.forgejo/workflows/deploy-dgnum.yaml
index 8cbf613..5b740c7 100644
--- a/.forgejo/workflows/deploy-dgnum.yaml
+++ b/.forgejo/workflows/deploy-dgnum.yaml
@@ -24,6 +24,7 @@ jobs:
export HOME="$GITHUB_WORKSPACE"
echo "[+] Using SSH_DEPLOY_KEY"
+ nix-env -iA openssh
# Setup deploy key
DEPLOY_KEY_FILE="$HOME/.ssh/deploy_key"
From 94f22e42703fa2268188c92a56138ef3fe3e11a6 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht
Date: Fri, 15 Dec 2023 22:46:10 +0100
Subject: [PATCH 06/24] fix(workflows): Install openssh
---
.forgejo/workflows/deploy-dgnum.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.forgejo/workflows/deploy-dgnum.yaml b/.forgejo/workflows/deploy-dgnum.yaml
index 5b740c7..136a474 100644
--- a/.forgejo/workflows/deploy-dgnum.yaml
+++ b/.forgejo/workflows/deploy-dgnum.yaml
@@ -24,7 +24,7 @@ jobs:
export HOME="$GITHUB_WORKSPACE"
echo "[+] Using SSH_DEPLOY_KEY"
- nix-env -iA openssh
+ nix-env -f '' --install openssh
# Setup deploy key
DEPLOY_KEY_FILE="$HOME/.ssh/deploy_key"
From 01995594478785486d89525778e12f2f11174b65 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht
Date: Fri, 15 Dec 2023 23:41:14 +0100
Subject: [PATCH 07/24] fix(workflows): Assume openssh is here
---
.forgejo/workflows/deploy-dgnum.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.forgejo/workflows/deploy-dgnum.yaml b/.forgejo/workflows/deploy-dgnum.yaml
index 136a474..8cbf613 100644
--- a/.forgejo/workflows/deploy-dgnum.yaml
+++ b/.forgejo/workflows/deploy-dgnum.yaml
@@ -24,7 +24,6 @@ jobs:
export HOME="$GITHUB_WORKSPACE"
echo "[+] Using SSH_DEPLOY_KEY"
- nix-env -f '' --install openssh
# Setup deploy key
DEPLOY_KEY_FILE="$HOME/.ssh/deploy_key"
From 102d5cd06882bb29aa619a7e663cedb6def8892c Mon Sep 17 00:00:00 2001
From: Forgejo Action
Date: Sat, 16 Dec 2023 14:26:03 +0000
Subject: [PATCH 08/24] Automatic website update from
https://git.dgnum.eu/DGNum/reglement/commit/e9680b51ed207c9e456abfffd774b5997bf79d38
---
site/documents/reglement-interieur.pdf | Bin 56021 -> 56021 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/site/documents/reglement-interieur.pdf b/site/documents/reglement-interieur.pdf
index 09e39232ac75f1630c09ca13d2db4ac82ae112d2..f29b14c6e052690b3c4e11eb5c8bcc059310b19a 100644
GIT binary patch
delta 81
zcmcb*mHFyc<_#NfI2jrlCtD_3q!}1nrluMsrX(ksB_*4uCK?ze86+neo7&kBQnC5-
HjYo_CnMfQ(
delta 81
zcmcb*mHFyc<_#NfI2k7y8zq}s7$zB78k-s$SR|*IB$*@`n5QP08k-uMq}kaJQnC5-
HjYo_CM@kwS
From 238bfb6a14a061ed015b49fd6d9dba8e3e771a2f Mon Sep 17 00:00:00 2001
From: Tom Hubrecht
Date: Tue, 23 Jan 2024 17:56:09 +0100
Subject: [PATCH 09/24] feat(services): Add meet.dgnum.eu
---
site/services.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/site/services.md b/site/services.md
index 2b36139..236ad08 100644
--- a/site/services.md
+++ b/site/services.md
@@ -13,3 +13,4 @@ Voici une liste partielle des services proposés par la DGNum :
- Le [Support DGNum](https://support.dgnum.eu), une plateforme de tickets en cas de problème rencontré avec les applicatifs DGNum
- Les [Vidéos DGNum](https://videos.dgnum.eu), une instance [PeerTube](https://joinpeertube.org)
- Le [SSO DGNum](https://sso.dgnum.eu), l'authentification centralisée de la DGNum
+- [Crab Fit](https://meet.dgnum.eu), un logiciel permettant le choix d'une date de réunion en fonction des disponibilités de toutes
From 407428cd073dc3bd93d3421ca560a890e1fb82be Mon Sep 17 00:00:00 2001
From: Tom Hubrecht
Date: Thu, 25 Jan 2024 13:05:33 +0100
Subject: [PATCH 10/24] feat(services): Add qr.dgnum.eu
---
site/services.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/site/services.md b/site/services.md
index 236ad08..25e7695 100644
--- a/site/services.md
+++ b/site/services.md
@@ -14,3 +14,4 @@ Voici une liste partielle des services proposés par la DGNum :
- Les [Vidéos DGNum](https://videos.dgnum.eu), une instance [PeerTube](https://joinpeertube.org)
- Le [SSO DGNum](https://sso.dgnum.eu), l'authentification centralisée de la DGNum
- [Crab Fit](https://meet.dgnum.eu), un logiciel permettant le choix d'une date de réunion en fonction des disponibilités de toutes
+- Un générateur de [QR codes](https://qr.dgnum.eu), permettant de créer partager facilement des liens, tout en couleur.
From c5f1c2e8e971edf4268cc39174e31f5170eafcf6 Mon Sep 17 00:00:00 2001
From: sinavir
Date: Sun, 14 Apr 2024 11:25:11 +0200
Subject: [PATCH 11/24] feat: Add status page
---
site/services.md | 2 ++
site/templates/default.html | 3 +++
2 files changed, 5 insertions(+)
diff --git a/site/services.md b/site/services.md
index 25e7695..e9a8b3c 100644
--- a/site/services.md
+++ b/site/services.md
@@ -15,3 +15,5 @@ Voici une liste partielle des services proposés par la DGNum :
- Le [SSO DGNum](https://sso.dgnum.eu), l'authentification centralisée de la DGNum
- [Crab Fit](https://meet.dgnum.eu), un logiciel permettant le choix d'une date de réunion en fonction des disponibilités de toutes
- Un générateur de [QR codes](https://qr.dgnum.eu), permettant de créer partager facilement des liens, tout en couleur.
+
+L'état de fonctionnement de nos services peut être consulté sur [notre page de statuts](https://status.dgnum.eu/).
diff --git a/site/templates/default.html b/site/templates/default.html
index a70743b..19e51b7 100644
--- a/site/templates/default.html
+++ b/site/templates/default.html
@@ -86,6 +86,9 @@
src="https://mirrors.creativecommons.org/presskit/icons/cc.svg?ref=chooser-v1">
+
+ État des services
+