Compare commits

..

704 commits

Author SHA1 Message Date
DGNum [bot]
609830dcb1 lon: update lix-module
ea74d925e650948d296fb85e4671fb0ce944f550
→ 4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f

Last 5 commits:
  4d4c2b8 Merge pull request 'Hotfix lixFromNixpkgs overlay for >2.91' (#69) from eisfunke/nixos-module:main into main
  71e7a24 Update versions of inputs for validation testing
  77e4c83 fix: tolerate flakes missing revision info
  6b1163a use lix nix-eval-jobs from nixpkgs for lixFromNixpkgs overlay
  8a41d5a use renamed lix package in nixpkgs
2025-07-09 11:30:49 +02:00
DGNum [bot]
1058d54f38 lon: update cgroup-exporter
97b83d6d495b3cb6f959a4368fd93ac342d23706
→ 443dcf85b1623eb3098139cf3ed1df6f1e51d7cb

Last 4 commits:
  cd9dc38 Bump github.com/prometheus/client_model from 0.6.1 to 0.6.2
  c2fff85 update vendorHash
  c48deb2 Merge pull request #9 from arianvp/dependabot/go_modules/github.com/prometheus/client_model-0.6.2
  443dcf8 Update README.md
2025-07-09 11:26:48 +02:00
DGNum [bot]
ab8132583c lon: update disko
da6109c917b48abc1f76dd5c9bf3901c8c80f662
→ 16b74a1e304197248a1bc663280f2548dbfcae3c

Last 1 commits:
  16b74a1 flake.lock: Update
2025-07-09 06:00:28 +00:00
sinavir
9f15648e78 fix(dns): Remove "10.x.x.x" ips from A records 2025-07-07 15:49:35 +02:00
sinavir
026e79f395 feat(dns): Use sniproxy for status.dgnum 2025-07-07 15:49:35 +02:00
40b2c848e5 fix(zfs): Use filesystems to import the pools
This fixes dependencies issues when using fileSystems for bind mounting
directories onto the ZFS pools
2025-07-07 13:10:15 +02:00
2329adc1c2
fix: chore(nixos): Disable installer tools on servers
Double negation problems
2025-07-07 09:51:32 +02:00
c3ccca9575 chore(nixos): Disable installer tools on servers
A node is not supposed to redeploy itself, plus it removes a dependency
on cppnix
2025-07-07 09:35:30 +02:00
ec10bc5ec0
feat(auditd): disable by default
auditd generate too much logs for systemd-journal-upload
2025-07-07 09:32:14 +02:00
5c82201916 feat(workflows/lon-update): Run the updates at 06:00 UTC on Wednesdays 2025-07-06 23:38:06 +02:00
816d940fe3
fix(nix.settings): Add experimental feature nix-command
It is required to be able to run lix-diff as it uses `nix store`
internally.
2025-07-06 22:10:39 +02:00
ae47af02aa
feat(modules/dgn-s3): Upgrade garage to v1.2.0 2025-07-06 18:01:10 +02:00
0911f33925
feat(compute01/kanidm): Switch to kanidm v1.6 2025-07-06 17:56:14 +02:00
DGNum [bot]
45f60020c8
lon: update nixos-25.05
c7ab75210cb8cb16ddd8f290755d9558edde7ee1
→ 7a732ed41ca0dd64b4b71b563ab9805a80a7d693

Last 50 commits:
  1508641 waybar: 0.12.0 -> 0.12.0-unstable-2025-06-13
  01a20b6 waybar: remove dependency on hyperland/sway
  db77d42 waybar: 0.12.0-unstable-2025-06-13 -> 0.13.0
  23a6db9 hdf5-blosc: 1.0.0 -> 1.0.1
  9053834 hdf5-blosc: add passthru.updateScript, cleanup, add test
  2e177a1 [Backport release-25.05] incus: 6.12.0 -> 6.14.0 (#420906)
  05506c0 [Backport release-25.05] nixosTests.pixelfed.standard: handleTestOn -> runTestOn (#420962)
  b43c397 [Backport release-25.05] waybar: 0.12.0 -> 0.13.0 (#421027)
  2639e8f git-stack: add zlib to build input to fix darwin build (#419580)
  a6fff82 nexus: mark as insecure and remove maintainers
  53ecb54 [Backport release-25.05] git-stack: add zlib to build input to fix darwin build (#421043)
  6756714 mattermost: disable MySQL tests
  27ffd7b [Backport release-25.05] nexus: mark as insecure and remove inactive maintainers (#421051)
  3406ebe [Backport release-25.05] hdf5-blosc: 1.0.0 -> 1.0.1 (#421028)
  64d3cc1 signal-desktop: 7.58.0 -> 7.59.0
  ebe1c30 librewolf-unwrapped: 139.0.4-1 -> 140.0.2-1
  54c0645 [Backport release-25.05] mattermost: disable MySQL tests (#421064)
  219da19 decklink: fix build for kernel 6.15
  8d80a51 ci/README.md: one sentence per line
  51f994d ci/eval/README.md: one sentence per line
  e80b774 .github/workflows/README.md: one sentence per line
  2b37598 [25.05] ci/README.md: one sentence per line (#421096)
  8cfba09 [Backport release-25.05] mattermostLatest: 10.8.1 -> 10.9.1 (#419779)
  642361e rstudio{,-server}: 2024.12.1+563 -> 2025.05.0+496
  a2da6fd rstudio: 2025.05.0+496 -> 2025.05.1+513, unlock jdk version
  9d5f9e5 ruff: 0.11.10 -> 0.11.11
  18fe0e3 ruff: 0.11.11 -> 0.11.12
  5e3b802 ruff: 0.11.12 -> 0.11.13
  028c00e rstudio: do minor cleanup
  818cdc9 rstudio: move to pkgs/by-name
  c34a8ea rstudio: bump electron version
  e2e83df python3Packages.ruff: reuse already built ruff binary
  58bbdaa grafana-metricsdrilldown-app: init at 1.0.4
  e410afb [Backport release-25.05] linuxKernel.kernels.linux_lqx: 6.14.11-lqx1 -> 6.15.2-lqx1 (#417989)
  aca4d34 mdns-scanner: 0.15.0 -> 0.16.1
  60f1ddb python312Packages.aggregate6: 1.0.12 -> 1.0.14
  fc979a3 Merge release-25.05 into staging-next-25.05
  b251558 nodejs_20: 20.19.2 -> 20.19.3
  ad810bf deepin.dde-shell: fix qml models import in qt 6.9
  9d8010e llvmPackages_git: 21.0.0-unstable-2025-06-22 -> 21.0.0-unstable-2025-06-29
  175081f [Backport release-25.05] librewolf-unwrapped: 139.0.4-1 -> 140.0.2-1 (#421087)
  b497599 [Backport release-25.05] deepin.dde-shell: fix qml models import in qt 6.9 (#421168)
  2688310 release-python: drop lib-tests
  7fb19dd [Backport release-25.05] release-python: drop lib-tests (#421184)
  67870f7 release.nix: pass lib-tests to tarball
  b5ba005 nixVersions.nix_2_3: add knownVulnerabilities
  fddc292 [Backport release-25.05] decklink: fix build for kernel 6.15 (#421094)
  f2cd69a lixPackageSets.lix_2_91: patch for the critical correctness bug
  bd99fb8 lixPackageSets.lix_2_92: patch for the critical correctness bug
  5f3aa7f lixPackageSets.lix_2_93: patch for the critical correctness bug
2025-07-06 17:18:16 +02:00
DGNum [bot]
37f89a6c7e lon: update nixos-unstable
3016b4b15d13f3089db8a41ef937b13a9e33a8df
→ 5c724ed1388e53cc231ed98330a60eb2f7be4be3

Last 50 commits:
  de9c370 python3Packages.bloodyad: 2.1.20 -> 2.1.21 (#421996)
  b9af1c9 exploitdb: 2025-06-27 -> 2025-07-03 (#421964)
  3225bfd python313Packages.wavinsentio: refactor
  d6da6a3 splayer: init at 3.0.0-beta.1 (#420058)
  dc21b5b yaralyzer: 0.9.6 -> 1.0.0 (#421912)
  4f7b88b mediawriter: 5.2.6 -> 5.2.7 (#421457)
  30d4b0f nuclei: 3.4.5 -> 3.4.6 (#421454)
  7948541 openvas-scanner: 23.20.1 -> 23.20.2 (#421420)
  c1d1a45 pypy3Packages.celery.tests: fix the eval (#421336)
  bcd95af terraform-mcp-server: 0.1.0 -> 0.2.0 (#422008)
  100a073 Merge: iputils: 20240905 -> 20250605  (#413267)
  47718ec jellyfin-tui: fix versionCheck on darwin (#422013)
  f88e1c3 treewide: move StartLimitIntervalSec/StartLimitBurst to unitConfig
  aab7416 Merge: postgresql_jdbc: 42.6.1 -> 42.7.7 (#417952)
  81fdc23 upbound: 0.39.0 -> 0.39.1 (#422039)
  c6e4c59 xbill: fix build
  1b12701 maintainers: add jonhermansen
  4670fea python3Packages.django_5_2: 5.2.3 -> 5.2.4 (#421924)
  d1a266e zed-editor: 0.192.8 -> 0.193.3 (#421886)
  53c316d paretosecurity: 0.2.36 -> 0.2.37
  9210794 esphome: 2025.6.2 -> 2025.6.3
  31a8d4a python3Packages.py-ocsf-models: 0.5.0 -> 0.6.0
  f6df92d chirpstack-rest-api: 4.12.0 -> 4.13.0
  a71ec4c esphome: 2025.6.2 -> 2025.6.3 (#422112)
  cfb89a4 Merge: matrix-synapse: 1.132.0 -> 1.133.0 (#421538)
  74acfac luau: 0.679 -> 0.680 (#420709)
  53b89ac postgresqlPackages.omnigres: 0-unstable-2025-06-03 -> 0-unstable-2025-06-27
  8157f8d golangci-lint: 2.1.6 -> 2.2.1 (#421854)
  60c90e8 nixos/homebox: fix link to documentation (#421819)
  771770c mapproxy: 4.1.2 → 5.0.0
  3a01555 Merge: podget: init at 1.0.0 (#418219)
  086b48d namespace-cli: 0.0.425 -> 0.0.428 (#421707)
  14fa9be redpanda-client: 25.1.5 -> 25.1.6 (#422087)
  5cb1f85 git-repo-updater: 0.5.1 -> 0.5.2
  eb44d49 libressl: 4.0.0 -> 4.1.0 (#421245)
  9e6bc90 python3Packages.awsiotsdk: 1.23.0 -> 1.24.0
  2dda602 Merge: linux_6_{13,14}{,_hardened}: remove (#418956)
  938285a ruffle: 0-nightly-2025-06-21 -> 0-nightly-2025-06-30 (#421303)
  f29a69c make-bootstrap-tools-cross: add powerpc64-unknown-linux-gnuabielfv1 (#419955)
  59bfeeb gobuster: 3.6.0 -> 3.7.0 (#421390)
  5a8fc5a python3Packages.msgraph-sdk: 1.34.0 -> 1.35.0 (#421302)
  22f5ba9 python3Packages.model-checker: 0.9.21 -> 0.9.26 (#421132)
  44d5d65 python3Packages.cf-xarray: 0.10.5 -> 0.10.6 (#421148)
  7edddcf python312Packages.boto3-stubs: 1.38.46 -> 1.39.2
  43c0e5c python312Packages.botocore-stubs: 1.38.30 -> 1.38.46
  ea35b55 python3Packages.awsiotsdk: 1.23.0 -> 1.24.0 (#422132)
  e4e55ba python3Packages.py-ocsf-models: 0.5.0 -> 0.6.0 (#422114)
  5b6c392 turbo: add shell completions
  dbcd3fc xbill: add platforms
  f6e2b49 home-assistant-custom-components.oref_alert: 2.22.1 -> 3.1.3
2025-07-06 15:14:01 +02:00
DGNum [bot]
67bb6fbb17 lon: update lix
362bfd827f522b57062e4ebcb465bb51941632a4
→ 29d9a88af6c8f2954e19744df745bd943ba50754

Last 4 commits:
  29d9a88 libutil: handle sigint only once per thread
  b154458 libutil: quit immediately on second sigint
  0cc021e libutil: asyncify signal handler thread
  9dbf46f cli: asyncify daemonLoop
2025-07-06 15:10:53 +02:00
DGNum [bot]
4be42a58b5 lon: update lix-diff
3d52194bc78f0d7478c6d1a900f2c806c643b995
→ 548e54365e083aff84d67eb3cca0447ffbf87f1e

Last 5 commits:
  caf8ffe docs: explain installation
  a55f48a fix(direnv): add direnv dir to .gitignore
  a1f6c47 fix: don't error out if before and after are not valid UTF-8
  5101233 fix: switch to opt-level="s"
  548e543 feat: switch to clap
2025-07-06 15:07:48 +02:00
e573f1d212
feat(web03/www-eleves): Restrict access to .git directories 2025-07-06 14:57:55 +02:00
7d27efe3d5 feat(web03): Init www-eleves
This deploys an Apache webserver listening on *:8080 so that it is both
accessible directly and throug an nginx reverse-proxy.

NOTE: The 8080 port is blocked by the ENS itself and will need opening
for it to work properly
2025-07-06 11:53:35 +02:00
DGNum [bot]
2e17e48643 lon: update proxmox-nixos
91c96a414e14835b84adbf775f793739a5851fab
→ bfe830d4d3fc055b8d157313a3ec2fa69ded5d4e

Last 50 commits:
  bfe830d Merge pull request #175 from FilipTLW/fix/nixmoxer-vmid-exists
  65040d4 chore: display funding information
  c23f382 Merge pull request #177 from proxmox-update/auto-update/socket
  9d73bf8 socket: 2.038 -> 2.039
  374a739 fix(nixmoxer): fixed vmid-exists crash when no VMs exist
  8df8417 Merge pull request #168 from 5aaee9/main
  850a1d1 fix: vm not auto start when cloud init enabled
  48f39fb Merge pull request #65 from xddxdd/declarative-bridge
  4f2c493 Add option to declaratively configure visible bridges
  b3483bb Update cache key
  0d4d626 Merge pull request #162 from SaumonNet/newcache
  b900a4b Merge pull request #161 from codgician/evergreen
  67c5fc9 pve-manager: 8.2.10 -> 8.3.5
  a9a9a07 proxmox-i18n: init at 3.2.4
  5ce11fd pve-common: 8.2.9 -> 8.3.1
  2b7758e pve-guest-common: 5.1.6 -> 5.1.7
  2567deb pve-access-control: 8.2.0 -> 8.2.2
  8fb3952 pve-common: 8.2.1 -> 8.2.9
  483faa6 pve-manager: 8.2.4 -> 8.2.10
  89a8387 Merge pull request #118 from proxmox-update/auto-update/linstor-proxmox
  b94cd64 fix: cache key
  c7740e7 Merge pull request #160 from SaumonNet/firstvmid
  32e4599 Merge pull request #114 from proxmox-update/auto-update/markedjs
  31468f3 Merge pull request #145 from proxmox-update/auto-update/pve-container
  22ef831 Merge pull request #156 from proxmox-update/auto-update/pve-ha-manager
  204532e Merge pull request #159 from SaumonNet/backup-qemu-hash-stability
  99187f3 fix: nixmoxer: find first vmid
  87ad0ba proxmox-backup-qemu: remove leaveDotGit
  1cf98ce Merge pull request #158 from SaumonNet/autoinstall
  b3c4a99 Merge pull request #147 from proxmox-update/auto-update/uuid
  8e3c6a4 Merge pull request #143 from proxmox-update/auto-update/testharness
  5a84f32 fix: force iso name
  7be8021 pve-ha-manager: 4.0.6 -> 4.0.7
  de68467 uuid: 0.36 -> 0.37
  e078b6c markedjs: 15.0.4 -> 15.0.12
  f7ca9bc pve-container: 5.2.2 -> 5.2.6
  55113bb testharness: 3.50 -> 3.52
  292e513 linstor-proxmox: 8.0.4 -> 8.1.1
  bb52ad5 Merge pull request #121 from codgician/qemu-update-script
  9937276 re-enable linstor test
  a30672b pve-qemu-server: ensure bootsplash.jpg is copied
  051f0df pve-qemu-server: fix qemu version check
  1ff2292 pve-common: migrate substituteAll to replaceVars as the former will be removed in 25.11
  1d339bd linstor-server: fix hash of source
  26bb504 proxmox-backup-qemu: fix hash of source
  6c52096 update to 25.05
  dda2c5b pve-qemu-server: 8.2.1 -> 8.3.8
  92d03a3 pve-http-server: 5.1.2 -> 5.2.2
  7df1e81 linstor-server: use protobuf_24
  b209161 pve-qemu: 9.1.2 -> 9.2.0-5
2025-07-06 11:47:20 +02:00
5869d73704
fix(options-search): Set defaultText on package options
This avoids errors when evaluating the modules in a nixpkgs version that
does not have the default packages
2025-07-06 11:43:00 +02:00
70fda0034c
fix(patches): Netbird dashboard was upgraded upstream 2025-07-06 11:26:51 +02:00
DGNum [bot]
cac5518af2 lon: update nixos-unstable
3e3afe5174c561dee0df6f2c2b2236990146329f
→ 3016b4b15d13f3089db8a41ef937b13a9e33a8df

Last 50 commits:
  81c9af4 gtkd: avoid with lib;
  e171f08 terragrunt: 0.81.8 -> 0.82.3 (#420909)
  c28b140 swayimg: 4.2 -> 4.3 (#420902)
  c7327b1 python3Packages.requirements-parser: 0.11.0 -> 0.13.0 (#410485)
  4baf968 kubexporter: 0.6.4 -> 0.6.5
  74fc212 python3Packages.anyascii: 0.3.2 -> 0.3.3
  d26cb83 python3Packages.pushover-complete: 1.2.0 -> 2.0.0 (#412237)
  a930333 signal-desktop-bin: 7.58.0 -> 7.59.0 (#420245)
  87a4e1f python3Packages.anyascii: 0.3.2 -> 0.3.3 (#420927)
  c82b750 teams/kodi: remove sephalon
  d0c18c0 sccmhunter: use python3.12
  224a1e7 structurizr-cli: init at 2025.05.28  (#417630)
  5a7a0b4 teams/kodi: remove sephalon (#420931)
  074b333 python3Packages.bibtexparser_2: init at 2.0.0b8
  5293ede python3Packages.clldutils: 3.21.0 -> 3.24.2
  e185b87 python3Packages.clldutils: modernize
  a48741b libetonyek: enable strictDeps / parallel building, clean up (#420169)
  1aff5d6 gemini-cli: fix file collisions
  c8a1b81 lmstudio: 0.3.16.8 -> 0.3.17.11
  3c8b36a nezha-agent: 1.12.3 -> 1.13.0 (#420900)
  7c45aa9 rerun: 0.23.3 -> 0.23.4 (#420359)
  ef9cba9 glab: 1.60.2 -> 1.61.0
  0ba0452 nchat: 5.7.24 -> 5.8.4 (#420817)
  8f6be61 eza: 0.21.5 -> 0.21.6
  721ad15 python3Packages.hawkmoth: init at version 0.21.0 (#385824)
  dd55409 glab: 1.60.2 -> 1.61.0 (#420427)
  2db497a heynote: 2.2.2 -> 2.3.2
  afe1980 lmstudio: 0.3.16.8 -> 0.3.17.11 (#420934)
  ea5887d mattermostLatest: 10.9.1 -> 10.9.2 (#420222)
  b8bff8a python3Packages.clldutils: 3.21.0 -> 3.24.2 (#420728)
  6af3d14 zed-editor: 0.192.6 -> 0.192.7 (#420897)
  2c2bded clever-tools: 3.13.0 -> 3.13.1
  c00b8eb python312Packages.parsedatetime: refactor (#420862)
  398a31d python313Packages.polyswarm-api: remove future (#420863)
  dcd01ae python313Packages.pygreat: refactor (#420860)
  c8b8408 python313Packages.hcloud: 2.5.2 -> 2.5.3 (#420859)
  e5d197d python313Packages.yte: 1.8.1 -> 1.9.0 (#420850)
  1655cd7 python313Packages.mscerts: 2025.5.28 -> 2025.6.27 (#420846)
  dbf0c54 vuls: 0.32.0 -> 0.33.1 (#420842)
  0eb0eec python313Packages.youtokentome: 1.0.6 -> 1.0.7 (#420841)
  a299326 python313Packages.tencentcloud-sdk-python: 3.0.1409 -> 3.0.1410 (#420830)
  7567d87 ldeep: 1.0.86 -> 1.0.87 (#420829)
  c7d529f python312Packages.mypy-boto3-*: updates (#420828)
  4f46aa8 buf: 1.53.0 -> 1.55.1
  b9b5b74 protobuf_26: remove
  aa18ed2 gtkd: 3.10.0 -> 3.11.0
  b330496 sarasa-gothic: 1.0.30 -> 1.0.31 (#420820)
  7c93458 gtkd: use finalAttrs
  53bc90c tilix: fix build
  2ac2ae7 cargo-careful: 0.4.7 -> 0.4.8 (#420753)
2025-07-06 11:23:51 +02:00
DGNum [bot]
e7c953d31d lon: update dgsi
6bf964daac1ab1695b884f6cc920084000137c2b
→ 5cf5a35e5e9a5e929ae0dba799de4dc1a8c03849

Last 1 commits:
  5cf5a35 feat: Update font
2025-07-06 11:19:01 +02:00
a4503210a4
fix(nix-reuse): Customization of the hook is no longer necessary 2025-07-06 11:14:11 +02:00
DGNum [bot]
74d04dd837 lon: update nix-reuse
45633dc6a0512cbbb010bc615b5d1b6e46e57597
→ 75befb3933b41e600d1806deb435a2e3d63a072f

Last 1 commits:
  75befb3 chore(nix): Switch to lon and update hook
2025-07-06 11:10:36 +02:00
DGNum [bot]
083108785e lon: update lix
9a59106c172b7d5963e3dc2cf07ff5b19f8119d6
→ 362bfd827f522b57062e4ebcb465bb51941632a4

Last 30 commits:
  362bfd8 cli: drop extraneous daemon thread
  a232d14 libutil: remove unused ProcessOptions members
  ebf665b libutil: remove unused DoSignalSave
  7b37d5e cli: fork+exec subdaemons, don't just fork
  dffb8e9 libutil/runProgram2: add explicit argv0 support
  164d23f libutil/runProgram2: support posix_spawn-like dup-to-self redirections
  0f07184 libutil: rename runProgram redirections to make more sense
  897f87e libutil: allow non-blocking fds for writeFull
  61c276e repl: default to turning off ignore-try
  bfabaa6 libutil: fix segfault in makeInterruptible callback
  ed3c202 libstore: be more economical about fcntl on RemoteStore
  ce6eba5 libutil: add makeNonBlocking, resetNonBlocking
  6e7c081 libstore: drop checkInterrupt from LocalStore::verifyPath
  32cfbe3 drop checkInterrupt from ThreadPool items
  96fbc29 libutil: checkInterrupt in AsyncIoRoot::blockOn
  2c00a68 libutil: explicitly declare and document our reserved signals
  325f937 remove old commented-out checkInterrupt calls
  286aa40 Revert "libstore/build: automatic clean up of unsuccessfully built scratch outputs"
  13e46d3 Revert "libstore: fix scratch output cleanup"
  a60c1de Revert "libstore: don't delete already valid outputs after build"
  d1db3e5 libstore: fix Unix sockets in the build directory on sandboxed macOS
  e1ccbe9 daemon: prefer daemon stores for `nix-daemon --stdio`
  b395831 libstore: expose the `allowDaemon` parameter of `openStore()`
  3cfce7b tests: add test for bug with remote builds as non‐`root` user
  33122e7 libstore: weaken the top-level fallback temp dir to 0755 for macOS
  ac80a11 packaging: unbreak static builds
  fd35e86 libstore: fallback on creating a safe space in the default tempdir
  e356d54 libstore: don't delete already valid outputs after build
  a0a0094 libstore: fix scratch output cleanup
  34696c6 libstore: fix race condition when creating state directories
2025-07-06 11:07:38 +02:00
DGNum [bot]
208e30fcbc lon: update nixos-24.11
bf3287dac860
→ 50ab793786d9de88ee30ec4e4c24fb4236fc2674

Last 50 commits:
  cbeeed7 clamav: 1.4.2 -> 1.4.3
  6106b63 xwayland: 24.1.7 -> 24.1.8
  d810ea0 [Backport release-24.11] xwayland: 24.1.7 -> 24.1.8 (#418089)
  5d542d8 google-chrome: 137.0.7151.103 -> 137.0.7151.119
  63b4272 [Backport release-24.11] google-chrome: 137.0.7151.103 -> 137.0.7151.119 (#418121)
  d883b62 fedigroups: 0.4.5 -> 0.4.6
  1226f56 [Backport release-24.11] thunderbird-latest-bin-unwrapped: 139.0.1 -> 139.0.2 (#417902)
  d29d2e9 workflows/labels: fix pull_request event trigger
  118c904 linux_6_15: 6.15.2 -> 6.15.3
  05047fe linux_6_12: 6.12.33 -> 6.12.34
  a5e78d9 linux_6_6: 6.6.93 -> 6.6.94
  eb2b984 [Backport release-24.11] Kernel updates for 2025-06-19 (#418204)
  da4640c [Backport release-24.11] workflows/labels: fix pull_request event trigger (#418199)
  7ded164 workflows/eval: small improvements
  4fad714 workflows/{pr,push}: move prepare job from eval workflow
  0cb346b workflows: sync merge commits
  c93fb23 workflows/{labels,reviewers}: move from Eval to PR context
  41c9482 workflows/pr: add required job
  81ac1f7 [Backport release-24.11] workflows/pr: preparation for required status checks (#418399)
  7f8fa05 OWNERS: drop security team from CI
  4d7ff87 teams/ci: init
  668d0b8 [24.11] teams/ci: init (#418427)
  f1f28bb matrix-synapse: 1.131.0 -> 1.132.0
  2b6ccc7 ungoogled-chromium: 137.0.7151.103-1 -> 137.0.7151.119-1
  d20d9ce [Backport release-24.11] ungoogled-chromium: 137.0.7151.103-1 -> 137.0.7151.119-1 (#418581)
  b5cb10f ci/eval/compare: fix rebuild-stdenv labels
  c489b85 workflows/labels: fix race condition with throttling
  a299aec workflows/labels: lower API calls reservoir to 500
  61c5d80 workflows/pr: run in pull_request context on changed labels.yml
  0cb7bdf workflows/labels: fix on older PRs
  ea7a4b0 [Backport release-24.11] workflows/labels: various fixes (#418712)
  bbf1161 [Backport release-24.11] salt: 3007.1 -> 3007.4 (#416682)
  34ec6bd tomcat: 11.0.7 -> 11.0.8
  5605152 tomcat10: 10.1.41 -> 10.1.42
  6518974 tomcat9: 9.0.105 -> 9.0.106
  9669088 [Backport release-24.11] tomcat: 11.0.7 -> 11.0.8 (#418740)
  909ccf3 [Backport release-24.11] tomcat10: 10.1.41 -> 10.1.42 (#418742)
  392c30d firefox-beta-unwrapped: 140.0b7 -> 140.0b9
  f6936cd [Backport release-24.11] tomcat9: 9.0.105 -> 9.0.106 (#418744)
  7d4eb80 python312Packages.signxml: 4.0.2 -> 4.0.3
  ccf30ac python3Packages.signxml: 4.0.3 -> 4.0.5
  17a44de tio: fix Bash completion
  fb8569c rubyPackages.rack: 3.0.10 -> 3.0.18
  a276df1 [Backport release-24.11] tio: fix Bash completion (#418769)
  8229f2e [Backport release-24.11] firefox-beta-unwrapped: 140.0b7 -> 140.0b9 (#418756)
  b209f6e linux_xanmod: 6.12.31 -> 6.12.32
  69398a6 linux_xanmod_latest: 6.14.9 -> 6.14.10
  6e9c7c2 linux_xanmod: 6.12.32 -> 6.12.33
  b8896fe linux_xanmod_latest: 6.14.10 -> 6.14.11
  b77dc47 linux_xanmod: 6.12.33 -> 6.12.34
2025-07-06 11:04:41 +02:00
DGNum [bot]
4cd4e5eb1d lon: update lix-module
3c23c6ae2aecc1f76ae7993efe1a78b5316f0700
→ ea74d925e650948d296fb85e4671fb0ce944f550

Last 1 commits:
  ea74d92 flake.lock: lock for secure & non-breaking version
2025-07-06 11:01:14 +02:00
7d5ffc2f60 feat(activation): Use lix-diff instead of nvd
The colors are better
2025-07-06 10:55:19 +02:00
d9987c4024
fix(gestiocof): pin old version of python.[channels channels-redis] 2025-07-04 18:31:46 +02:00
ffe38272f8
fix(django-apps): keep config.python packageOverrides 2025-07-04 18:29:22 +02:00
58b6b95e21
test(cof-stage): status change is in prod now 2025-07-04 18:28:39 +02:00
DGNum [bot]
0cdf901c24 lon: update disko
83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae
→ da6109c917b48abc1f76dd5c9bf3901c8c80f662

Last 1 commits:
  da6109c fix: flakes support on disko standalone cli
2025-07-04 12:56:11 +00:00
sinavir
003f491f57 lon: update nixos-25.05 2025-07-02 18:30:52 +02:00
sinavir
62e002616a fix(web01/ntfy-sh): Remove useless overlay 2025-07-02 18:30:52 +02:00
e133e8da20 feat(krz01): Upgrade to nixos-unstable
- Disabled whisper-cpp as the packaging changed too much and it no
longer build
2025-07-02 18:30:52 +02:00
219bf4b8c7 feat(compute01/librenms): remove 2025-07-02 18:30:52 +02:00
077aeb25c1 fix(patches/kanidm-provision): feature has been upstreamed 2025-07-02 18:30:52 +02:00
52de74c97d feat(storage01): Upgrade to nixos-25.05 2025-07-02 18:30:52 +02:00
f9b2b81a4d feat(compute01): Upgrade to nixos-25.05
- Removed `adminUser` configuration from plausible as it no longer
exists upstream
- Removed `signald` as it no longer exists upstream
2025-07-02 18:30:52 +02:00
ba55fd5419 feat(web01): Upgrade to nixos-25.05 2025-07-02 18:30:52 +02:00
3ec66208ea feat(web03): Upgrade to nixos-25.05 2025-07-02 18:30:52 +02:00
6c5a7873c6 feat(web02): Upgrade to nixos-25.05 2025-07-02 18:30:52 +02:00
daef2eb93a feat(tower01): Upgrade to nixos-25.05 2025-07-02 18:30:52 +02:00
3906924e96 feat(rescue01): Upgrade to nixos-25.05 2025-07-02 18:30:52 +02:00
7096cdd62e feat(hypervisor*): Upgrade to nixos-25.05 2025-07-02 18:30:52 +02:00
239ea89d1d fix(dgn-hardware): Don't pin zfs package
We don't use advanced functionnalities anyway
2025-07-02 18:30:52 +02:00
ac61b5ebf1 feat(geo*): Upgrade to nixos-25.05 2025-07-02 18:30:52 +02:00
5690f86630 feat(build01): Upgrade to nixos-25.05 2025-07-02 18:30:52 +02:00
f95930390d
Revert "feat(zulip): Configure inbound mailserver MX record"
This reverts commit edf8edb696.
2025-07-02 10:53:11 +02:00
sinavir
edf8edb696
feat(zulip): Configure inbound mailserver MX record 2025-07-01 00:56:38 +02:00
582903395c feat(meta): add new ssh keys to ecoppens 2025-06-28 14:59:25 +02:00
sinavir
571502e3b7
fix(forgejo-multiuser-nix-runners): Bind mount the new build directory of lix 2025-06-26 19:08:57 +02:00
sinavir
25e5e49627
fix(forgejo-multiuser-nix-runners): NIX_PATH was wrong 2025-06-26 17:57:20 +02:00
DGNum [bot]
1ef57eb11c lon: update disko
8fd2d6c75009ac75f9a6fb18c33a239806778d01
→ 83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae

Last 1 commits:
  83c4da2 flake.lock: Update
2025-06-26 12:55:51 +00:00
DGNum [bot]
4184044040 lon: update git-hooks
623c56286de5a3193aa38891a6991b28f9bab056
→ 16ec914f6fb6f599ce988427d9d94efddf25fe6d

Last 4 commits:
  8f917ec fix(trufflehog): Remove redundant --no-update flag
  fae816c Merge pull request #594 from spacekitteh/patch-1
  b8c7eb0 feat: add uv hooks
  16ec914 Merge pull request #598 from totoroot/uv-hooks
2025-06-26 02:10:21 +02:00
DGNum [bot]
b170795d29 lon: update disko
dfa4d1b9c39c0342ef133795127a3af14598017a
→ 8fd2d6c75009ac75f9a6fb18c33a239806778d01

Last 2 commits:
  7f1857b flake.lock: Update
  8fd2d6c make-disk-image: QEUM_OPTS -> QEMU_OPTS
2025-06-26 02:04:11 +02:00
DGNum [bot]
88fceb8126 lon: update dgsi
fbf6385e65400802a3f9f75f7cd91d5c01373d1b
→ 6bf964daac1ab1695b884f6cc920084000137c2b

Last 1 commits:
  6bf964d fix(dgsi/CreateKanidmAccount): Use correct reverse
2025-06-26 01:58:04 +02:00
sinavir
8b1c85d72e
feat(zulip): Switch to a public ipv4 ip 2025-06-26 01:57:48 +02:00
eef7d051c3
refactor(zulip01): remove disko dependencies 2025-06-26 01:53:54 +02:00
b01a3dcdbd
refactor(web01): remove disko dependencies 2025-06-26 01:53:54 +02:00
7d6afc4ba8
fix(build01): Update lix and enable cgroups once again 2025-06-25 18:14:03 +02:00
d5256c53f7 feat(kanidm): Create grp-ext_lasuite
This is scoped to lasuite applications only
2025-06-25 15:42:27 +02:00
DGNum [bot]
8936128aad
lon: update arkheon
3eea876b29217d01cf2ef03ea9fdd8779d28ad04
→ 3d77866e60b02c80f21d2145ae905f8f67232e96

Last 41 commits:
  2ae6323 chore: Move files around
  26b58b8 chore(npins): Update
  cc6bc98 feat(config): Get rid of pydantic-settings
  b301716 feat(arkheon): Rewrite FastAPI interface
  0dc6429 chore(pyproject): Switch to setuptools build-system
  bab8b92 feat(nix): Update
  a8f27f1 feat(frontend): Use dart-sass to compile frontend
  49b74de feat(sass): Update to Bulma v1
  ce0e073 feat(frontend): Update colors
  628152a feat(nix/module): Remove env file and use secrets instead
  2b692a4 feat(module): Update socket path
  a629ca6 fix(frontend): Set padding for the hero
  5707b67 feat(module/record): Allow setting the identifier in the
config
  d86f9a8 chore(module): Update record method
  fe6823d fix(module/record): Use the correct endpoint for recording
  eb15a33 fix(arkheon/record): Use correct setting
  21d4326 fix(arkheon/get_machines): Sort by identifier
  c434814 feat(module): Harden and tweak
  9787d08 feat(frontend): Change fonts and update
  da669d9 feat(arkheon/diff): Transmit machine name as well
  c038cd9 fix(frontend/date): Acknowledge that the time is in UTC
  5023726 feat(arkheon/system-diff): Add navigation buttons
  bfa470c chore(frontend/notification): Switch to TS
  8e41f50 chore(frontend/node): Update
  d329047 chore(frontend): Tweaks
  8d342d5 chore(shell): Remove unused package
  c4546b8 feat(deployments): Add size information
  1c2c758 chore(arkheon/models): Rename tables
  77d8b26 chore: Update image
  6b170f0 chore(nix): Use inherit
  ad41a33 chore(frontend/sass): Shorten transition duration
  fd434e2 chore(frontend/system-diff): Clean up
  641e02e chore(frontend/machine): Clean up
  6d99644 feat(frontend/package-list): Add spinner when sorting the
package list
  fe696a2 feat(arkheon/deployments): Store the deployment size
  2aaba24 chore(nix): Switch to lon from npins
  f0e25cd lon: update nixpkgs
  3d8549a fix(frontend/package-list): Only make the versions scroll
  b2117c4 chore(frontend/sass): Rename bulma directory
  476967c feat(nix): Add git checks
  3d77866 feat: Add REUSE compliance

Co-authored-by: sinavir <sinavir@sinavir.fr>
2025-06-25 11:50:15 +02:00
e5b94f845b
fix(buil01): Disable cgroups as it blocks deployment 2025-06-24 19:23:18 +02:00
d08825d425
feat(lon): Update lix 2025-06-24 16:11:11 +02:00
sinavir
760582dc1b
fix(comitizen): Allow lon related commits 2025-06-24 12:11:00 +02:00
a737c805ad
fix(ntfy-acl): avoid fail if path not present 2025-06-21 09:15:31 +02:00
ed4f86f409
fix(ntfy-sh): overlay for taking some 25.05 features 2025-06-21 09:15:31 +02:00
9e794ff457
feat(meta/ntfy-sh): register ntfy-sh password in meta 2025-06-21 09:15:31 +02:00
88fd9e858b
feat(ntfy-sh): enable acl-control
feat(ntfy-sh): allow us to manage password hashes directly

fix(ntfy/patch): use upstreamed HashedPassword

fix(ntfy-sh): various typos and bug
2025-06-21 09:15:31 +02:00
74535b83ba
feat(dgn-notify): use nfty-sh to push notification
fix(ntfy-sh): various typos and bug
2025-06-21 09:15:31 +02:00
9931e7ba85
feat(monitoring/snmp): pdu groups monitoring 2025-06-21 09:10:22 +02:00
823462255b
feat(monitoring/snmp): psu monitoring 2025-06-21 09:10:22 +02:00
823dc6f878
feat(monitoring/snmp): pdu monitoring 2025-06-21 09:10:22 +02:00
sinavir
57fb87baf8
fix(dgn-monitoring): Increase logs upload timeout 2025-06-20 17:13:05 +02:00
22b85b99aa
fix(nimbolus): fix hardening 2025-06-19 17:16:39 +02:00
a09fa37261
chore(lon/kat-pkgs): update to fix nimbolus patch 2025-06-19 17:16:18 +02:00
DGNum [bot]
6aca263e50 lon: update lix
1e34c3747779a82d59ef27b351d4ed02fb372a2a
→ 20fed838a622e48128827278db91312f580f9214

Last 33 commits:
  20fed83 libcmd: replace @docroot@ when rendering markdown
  87d99da libutil/cgroup: ensure that cleanup takes place even under interruptions
  c3bc0d3 libstore: use async streams in RemoteStore
  3f62905 libstore: instantiate RemoteStore FdSources as needed
  687ea19 libstore: drop pervasive RemoteStore send buffering
  b0edb26 libutil: add bidirectional async fd streams
  7b65d7c libutil: add buffered async streams
  81d2d26 libutil: add async output stream type
  fa116c9 perl: ensure that stores are destroyed after aio roots
  bc33c21 cli: remove static destruction from nix-store
  49e6147 libutil: remove unused Source::good
  e5c4de3 libstore: eagerly mark daemon connections as bad on local errors
  37c1780 libstore: serialize wire messages into temp buffer
  6f64e1b libutil: make Fd{Sink,Source} io buffer shareable
  fc18a6d libutil: disallow Fd{Sink,Source} copy and move
  8835b2f libutil: remove unused AsyncFdInputStream
  d4d20df libutil: remove unused FdSink::written
  ba2432f libutil: add asyncJoin, a Result-based joinPromises
  5f42f66 libstore: rpc-ish-ify remaining RemoteStore methods
  833aef5 fix(rl-next): systemd unit description is using wrong section
  e01ad92 libstore/local-derivation-goal: cleanup "hash mismatch" error formatting
  97f1c5c Fix markdown link edge cases
  7453e29 libstore: asyncify S3BinaryCacheStore
  1729c8c libstore: asyncify curl return streams
  04a2aba libstore: explicitly init curl transfer sources
  490c4e3 libstore: extract closures in curl wrapper to methods
  de89c7f libstore: asyncify curl interface
  a0d5900 libstore: asyncify BinaryCacheStore::upsertFile
  c76f046 libstore: asyncify BinaryCacheStore::fileExists
  c108f33 libstore: asyncify BinaryCacheStore::getFile
  9f32ab8 libstore: asyncify BinaryCacheStore::getFileContents
  743703c libstore: asyncify Store::narFromPath return stream
  d824753 libutil: add async decompression support
2025-06-19 16:26:43 +02:00
DGNum [bot]
b320ef857f lon: update kat-pkgs
19b3de953c4d4e8888b90019db81852f8ad39dbb
→ 3838db6ebbfe5ad9f904ce553543c1c301b67274

Last 1 commits:
  3838db6 fix(nimbolus): add patch to trim end_of_files
2025-06-19 15:40:56 +02:00
DGNum [bot]
ad3a7129d7 lon: update agenix
4835b1dc898959d8547a871ef484930675cb47f1
→ 531beac616433bac6f9e2a19feb8e99a22a66baf

Last 1 commits:
  531beac Improve `age.identityPaths must be set` error (#335)
2025-06-19 15:37:17 +02:00
DGNum [bot]
af32d397d2 lon: update lon
f9693fae910a8e58ae059d5a02afba07e9e583bb
→ c44e33ce55eed38a06fde43e69512380c4065441

Last 2 commits:
  969cc84 treewide: release 0.8.0
  c44e33c Merge pull request #40 from nikstur/prepare-0.8.0
2025-06-19 12:55:58 +00:00
48f0df7745
fix(dgn-notify): use writeShellScriptBin for getExe to work 2025-06-18 15:12:16 +02:00
DGNum [bot]
78cdd4fcca lon: update snix-cache
62346b99c2e1085203bc2e5bb5f07e7773977b49
→ f3d0a3146c64f8fe6bdb208b75cc680c96f524e1

Last 3 commits:
  f3d0a31 chore(sources): Switch to lon from npins
  7975caa feat(module): Allow passing extra arguments to snix-cache
  2df8b6c fix(priority): Control with cli arg
2025-06-18 14:53:55 +02:00
DGNum [bot]
7b58d8af01 lon: update nix-modules
44ccf96bd73c1bbbbcc849cb0f2e0d1f5f75f934
→ fd4ba193ea3eda529ac27b43b206e9e3618b1975

Last 1 commits:
  fd4ba19 fix(ntfy-sh/acl): use replaceVarsWith
2025-06-17 21:10:02 +02:00
a7def32a75
feat(nimbolus): init a http terraform backend 2025-06-17 17:26:53 +02:00
d6300e6e19 feat(systemd-notify): allow multiple failure scripts 2025-06-17 17:11:56 +02:00
c1afcb7768 refactor(systemd-notify): take it from nix-modules 2025-06-17 17:11:56 +02:00
e1699ba735
feat(dns): add nimbolus for compute01 2025-06-15 08:09:00 +02:00
DGNum [bot]
7b596c8886 lon: update lix
ee0655240270480d7f6063dcf12ec47f04d2ded6
→ 1e34c3747779a82d59ef27b351d4ed02fb372a2a

Last 2 commits:
  1e34c37 flake/inputs: 24.11-small -> 25.05-small
  db56d23 tests/functional2: fixes prerequisite to ruff upgrade to 0.11.10
2025-06-14 12:55:53 +00:00
0cc1f3a23f
fix(storage01): Move StateDirectory to another disk 2025-06-13 20:05:01 +02:00
b2cf1c2715 feat(nix-patches): Reimplement pkgs.applyPatches
It allows fetching patched-sources from cache and avoids idiotic
decisions made upstream
2025-06-13 11:02:05 +02:00
0455ca4175
fix(dgn-console): Remove duplicate neovim
`programs.neovim` is already enabled
2025-06-13 10:41:25 +02:00
6cde27f0aa
fix(nix_path): Write correct nix
The CI is borked.....
2025-06-12 23:58:49 +02:00
d0731500b3
fix(nix_path): Use a constant name for the path
It will be symlinked when deploying, which will render its behavior
correct
2025-06-12 23:55:10 +02:00
cc4bc6e563
chore(lon): Update lon
Patches were included upstream
2025-06-12 23:39:35 +02:00
DGNum [bot]
08edb60af9 lon: update nixos-unstable
d89fc19e405c
→ 3e3afe5174c561dee0df6f2c2b2236990146329f

Last 50 commits:
  bd1c971 dbeaver-bin: 25.0.5 -> 25.1.0 (#414411)
  d311c0e doc: call out 'src' should ideally point to sources
  cf85d81 shh: 2025.6.4 -> 2025.6.5
  db5c622 Merge: matrix-synapse: 1.130.0 -> 1.131.0 (#413629)
  9756867 firefox-devedition-bin-unwrapped: 140.0b4 -> 140.0b5
  ca726ed copilot-language-server: 1.322.0 -> 1.330.0 (#411058)
  8339848 lightning-loop: 0.28.8 -> 0.31.1 (#414283)
  90f36a1 framework-tool: 0.4.2 -> 0.4.3
  1619e5a framework-tool: add johnazoidberg as maintainer
  1a58b25 python3Packages.py-machineid: 0.7.0 -> 0.8.0 (#414416)
  bd22d19 vimPlugins: update on 2025-06-05 (#414296)
  a1ea6c9 python3Packages.ipyvuetify: 1.11.1 -> 1.11.2
  6e25d98 nixos/filesystems: chore replace 'with' statements
  ebd3748 attic-client: 0-unstable-2025-02-02 -> 0-unstable-2025-05-29 (#414408)
  e95626e mastodon: allow specifying missingHashes when overriding src
  27c294b geteduroam: 0.11 -> 0.12
  08d3857 pywal16: 3.8.6 -> 3.8.9 (#414451)
  72e9f57 mobilizon: use lib.getExe
  458b3d1 python3Packages.replicate: 1.0.4 -> 1.0.7
  78aa5d7 kew: 3.3.2 -> 3.3.3
  1019651 nixos/dnscrypt-proxy2: add `package` option
  8b4e41e homebank: 5.9.1 -> 5.9.2 (#414144)
  e2443f7 python3Packages.markitdown: 0.1.1 -> 0.1.2
  2e50149 mobilizon: 5.1.2 -> 5.1.4
  65c2df8 python3Packages.craft-grammar: move pydantic to dependencies
  1ec5ab7 snapcraft: pin Python 3.12
  925fd2a python3Packages.craft-grammar: move pydantic to dependencies (#414488)
  4e238e4 elmPackages.elm: Fix runtime TLS connection to package.elm-lang.org
  45a2f12 doc: call out 'src' should ideally point to sources (#413559)
  fffc35b apacheHttpdPackages.php: 8.4.7 -> 8.4.8
  dfa2b38 dorion: 5.0.1 → 6.7.1; dorion: build from source (#265771)
  559987a shh: 2025.6.4 -> 2025.6.5 (#414457)
  68b1422 geteduroam: 0.11 -> 0.12 (#414479)
  d0a93ec radicle-{explorer,httpd}: 0.18.2 → 0.19.1
  585e6f6 labelife-label-printer: 1.2.1 -> 2.0.0
  94bb902 firefox-devedition-bin-unwrapped: 140.0b4 -> 140.0b5 (#414460)
  20eb58b snapcraft: pin Python 3.12 (#414493)
  92e1950 elmPackages.elm: Fix runtime TLS connection to package.elm-lang.org (#414495)
  af0a73d ecapture: 1.0.2 -> 1.1.0 (#413011)
  a4ff0e3 nixos/kanidm: Fix bind paths (#409310)
  69407aa maintainers: add yethal
  cc43028 nushellPlugins.hcl: init at 0.104.1
  b0afabc zipline: 4.1.0 -> 4.1.1
  1edd461 mobilizon: 5.1.2 -> 5.1.4 (#414487)
  c31d074 azure-cli: 2.73.0 -> 2.74.0 (#413503)
  c7a62d3 exploitdb: 2025-05-30 -> 2025-06-06
  56353fd python313Packages.tencentcloud-sdk-python: 3.0.1393 -> 3.0.1394
  24b3e36 python313Packages.publicsuffixlist: 1.0.2.20250603 -> 1.0.2.20250606
  cf0749d checkov: 3.2.436 -> 3.2.437
  144b478 python312Packages.mypy-boto3-cloudformation: 1.38.0 -> 1.38.31
2025-06-12 21:09:53 +02:00
5e7ac52ce7 fix(patch): pr 403844 has conflict now 2025-06-12 21:09:53 +02:00
DGNum [bot]
a7377a6afc lon: update dns.nix
a3196708a56dee76186a9415c187473b94e6cbae
→ 96e548ae8bd44883afc5bddb9dacd0502542276d

Last 17 commits:
  3fa62df Add DANE-Related RRs
  d86ffdc zone#toString relative to $ORIGIN
  b2c6c9d useOrigin option in zone to switch toString
  e13b516 merge writeRecord{,Rel}
  b0a5a0f remove writeRecordDel
  2307af0 fix subdomain case
  0d4694f Update dns/types/record.nix
  e3ad889 Update dns/types/record.nix
  3b4d4b3 Update dns/types/record.nix
  f084caf doc: adds useOrigin example
  025996a Merge pull request #33 from pigam/unqualified-domain-names
  7d62cee fix syntax error
  a23f43f Merge pull request #36 from griffi-gh/patch-1
  51e3deb Apply suggestions from code review
  1ad7b72 Apply suggestions from code review
  17e7f9b Merge pull request #27 from DarkKirb/dnssec-rr
  96e548a fix: Make the example work
2025-06-12 21:06:55 +02:00
DGNum [bot]
f137ff5e03 lon: update nixos-25.05
70c74b02eac4
→ 88331c17ba434359491e8d5889cce872464052c2

Last 50 commits:
  cbd2361 lomiri.lomiri-content-hub: 2.0.0 -> 2.1.0
  0b041bb discord: allow not disabling updates
  f1dd86b linuxKernel.kernels.linux_zen: 6.14.7-zen1 -> 6.14.9-zen1
  6f4cf13 linuxKernel.kernels.linux_lqx: 6.14.7-lqx1 -> 6.14.9-lqx1
  d68067a openterface-qt: 0.3.12 -> 0.3.14
  6c2a0db google-cloud-sdk: 2nd fix for pyopenssl
  e6349fb [release-25.05] rke2_1_29: mark as vulnerable due to EOL
  e9f574a firefly-iii: 6.2.10 -> 6.2.16
  55ea961 knot-dns: 3.4.6 -> 3.4.7
  2f0990c samba: 4.20.4 -> 4.20.8
  8565f96 openvswitch: 3.5.0 -> 3.5.1
  a29b809 webkitgtk_6_0: 2.48.2 → 2.48.3
  4d97194 google-cloud-sdk: docu
  5106751 homebank: 5.9.1 -> 5.9.2
  2344702 mozhi: init at 0-unstable-2025-04-14
  03981db zipline: 4.1.1 -> 4.1.2
  73e167b [Backport release-25.05] zipline: 4.1.1 -> 4.1.2 (#414569)
  77b2b4b mbedtls_2: 2.28.9 -> 2.28.10
  6879530 headscale: patch /machine/map endpoint vulnerability
  ae6bd2e [Backport release-25.05] knot-dns: 3.4.6 -> 3.4.7 (#414141)
  cf0b95b [Backport release-25.05] firefly-iii: 6.2.10 -> 6.2.16 (#414136)
  63921b2 [Backport release-25.05] samba: 4.20.4 -> 4.20.8 (#414155)
  86e5d92 olivetin: 2025.6.1 -> 2025.6.6
  ce7ee08 [Backport release-25.05] olivetin: 2025.6.1 -> 2025.6.6 (#414601)
  15c7b1d zluda: provide fallback CMAKE_BUILD_TYPE
  1c9b107 [Backport release-25.05] mbedtls_2: 2.28.9 -> 2.28.10 (#414588)
  33fd628 [Backport release-25.05] zluda: provide fallback CMAKE_BUILD_TYPE (#414608)
  dbeb1f6 rustic: simplify shell completion installation
  8217c6e [Backport release-25.05] rustic: simplify shell completion installation (#414618)
  e66f041 sylpheed: fix with gcc 14
  c6ee89b uudeview: 0.5.20 -> 0.5.20-unstable-2025-03-20, update repo, fixes build (#411084)
  1b0417e [Backport release-25.05] mozhi: init at 0-unstable-2025-04-14 (#414537)
  1a95f2e [release-25.05] rke2_1_29: mark as vulnerable due to EOL (#414009)
  5cf7c54 [Backport release-25.05] discord: allow not disabling updates (#412750)
  df6e50a [Backport release-25.05] sylpheed: fix with gcc 14 (#414657)
  6003004 [Backport release-25.05] uudeview: 0.5.20 -> 0.5.20-unstable-2025-03-20, update repo, fixes build (#414659)
  a09ac07 [Backport release-25.05] webkitgtk_6_0: 2.48.2 → 2.48.3 (#414255)
  4ee336f shadps4: fix update script
  1295d6e [Backport release-25.05] shadps4: fix update script (#414680)
  2c4964a matrix-synapse-unwrapped: restore ability to make backports
  45346c3 matrix-synapse: 1.130.0 -> 1.131.0
  2bf8c5e [Backport release-25.05] linuxKernel.kernels.linux_zen: 6.14.7-zen1 -> 6.14.9-zen1, linuxKernel.kernels.linux_lqx: 6.14.7-lqx1 -> 6.14.9-lqx1 (#413520)
  8977813 [25.05] headscale: patch /machine/map endpoint vulnerability (#414589)
  6ef270c grafana-image-renderer: 3.12.5 -> 3.12.6
  4a587be apacheHttpdPackages.php: 8.4.7 -> 8.4.8
  1ef9180 Merge: [25.05] matrix-synapse-unwrapped: 1.130.0 -> 1.131.0 (#414686)
  c0572a7 [Backport release-25.05] google-cloud-sdk: 2nd fix for pyopenssl (#414271)
  0f305a9 Merge: [Backport release-25.05] grafana-image-renderer: 3.12.5 -> 3.12.6 (#414698)
  acf018e Merge: [Backport release-25.05] apacheHttpdPackages.php: 8.4.7 -> 8.4.8 (#414704)
  07e68f0 php83: 8.3.21 -> 8.3.22
2025-06-12 21:04:03 +02:00
0eb9d1c9c2 fix(patches): adapt kanidm patch to nixpkgs upgrade 2025-06-12 21:04:03 +02:00
6df3c70a42 feat(workflows/lon-update): Set label for lon-bot PRs 2025-06-12 17:31:22 +02:00
DGNum [bot]
eb6b00fce2 lon: update agenix
564595d0ad4be7277e07fa63b5a991b3c645655d
→ 4835b1dc898959d8547a871ef484930675cb47f1

Last 50 commits:
  344f985 dev: remove i686 support; simplify flake
  097aa18 contrib: add direct tests for agenix
  17090d1 Merge pull request #163 from ryantm/rtm-2-21-recursive-nix
  08dc506 Revert "contrib: add direct tests for agenix "
  d0d4ad5 Merge pull request #231 from ryantm/revert-163-rtm-2-21-recursive-nix
  9bc80dc Merge pull request #229 from ryantm/rtm-12-20-flake
  5c1198a feat: switch from rage to age
  eb3b5cf update nixpkgs
  bd86c06 fix doc build
  58017c0 update inputs
  b6aa618 test removing installer
  23d4d5d maybe this fixes darwin checks?
  6ce42cc Fix CI for darwin
  457669d Merge pull request #230 from ryantm/rtm-12-20-age
  bc24f2e Revert "Revert "contrib: add direct tests for agenix ""
  a23aa27 dev: reland add direct tests for agenix
  417caa8 Merge pull request #232 from ryantm/rtm-12-23-test
  1746e4f agenix: fix installCheckPhase with Nix 2.3
  1f62cef fix: update docs for 5c1198a
  8cb01a0 Merge pull request #244 from kraem/fix/rage_to_age_docs
  3fd98a2 doc: fix wrong ssh-keyscan usage
  1381a75 Merge pull request #254 from oluceps/fix-doc
  2c1d1fb fix: allow for newlines in keys
  24a7ea3 Merge pull request #256 from spectre256/main
  07479c2 update link to nixos wiki (#258)
  63a57d8 Fix typo
  8d37c5b Merge pull request #259 from hansemschnokeloch/patch-1
  08ed896 fix: always treat link destinations as files to ensure error when destination is a directory.
  c2fc076 Merge pull request #241 from sternenseemann/nix-2.3-install-check
  3a56735 Merge pull request #187 from oddlama/main
  760751b README: Add warning about HNDL and PQS in theat model
  de96bd9 Merge pull request #265 from Kreyren/patch-1
  40012e5 Remove import for NixOS/HM modules
  3f1dae0 Merge pull request #277 from fzakaria/import-module-remove
  e341399 age-home: Use curly-brackets for XDG_RUNTIME_DIR
  f6291c5 Merge pull request #280 from Kreyren/patch-3
  cce0ff4 fix: bad age.identityPaths default value on darwin
  302ab0c fix: bump to macOS-15 in CI
  989ade2 feat: dynamically determine architecture in ci
  96b7e4f contrib: improve readability of age.identityPaths default value
  4d0d81e fix: bad indentation in ci
  e600439 Merge pull request #307 from codgician/fix-darwin-module
  cccd5af docs: add home-manager module documentation
  58c5544 fix: use replaceVars instead of substituteAll
  96e078c Merge pull request #324 from K900/replace-vars
  af991e8 Separate flags from positional args with `--`
  72f7f68 Merge pull request #327 from n8henrie/leading-hyphen-filename
  8a4516a Merge pull request #318 from bcl1713/main
  bd33a9b doc: strip trailing whitespace
  6697e8b Merge pull request #328 from ryantm/doc-strip-whitespace
2025-06-12 16:25:49 +02:00
1c7f174987 fix(patch): commit has been rebased 2025-06-12 16:25:49 +02:00
DGNum [bot]
a389fb26de lon: update git-hooks
fa466640195d38ec97cf0493d6d6882bc4d14969
→ 623c56286de5a3193aa38891a6991b28f9bab056

Last 3 commits:
  d1deac1 fix(govet): change to dir before running
  80479b6 Merge pull request #590 from yurrriq/govet-change-directory
  623c562 show an example for devenv
2025-06-12 16:18:43 +02:00
124d9b72b0 feat(workflows/eval-nodes): Print evaluation statistics 2025-06-12 16:14:13 +02:00
DGNum [bot]
fc6c88543e lon: update lix-module
fa69ae26cc32dda178117b46487c2165c0e08316
→ 3c23c6ae2aecc1f76ae7993efe1a78b5316f0700

Last 6 commits:
  3c23c6a Merge pull request 'nix-eval-jobs: add `__intentionallyOverridingVersion`' (#65) from isabelroses/nixos-module:eval-jobs-fix into main
  aaedf4e nix-eval-jobs: add `__intentionallyOverridingVersion`
  58baedd Begin 2.94.x
  4ca269a Merge tag '2.93.0'
  cd2a9c0 Module 2.93.0
  ad0a6a9 flake.lock: Update
2025-06-12 16:05:24 +02:00
8c09de1529
fix(build01/nix-builder): Remove impure-derivations from experimental-features
Lix no longer supports it
2025-06-12 16:00:42 +02:00
05a7477a8e
fix(lix): Drop fetchGit-locked patch as it is included upstream 2025-06-12 15:55:42 +02:00
DGNum [bot]
07a3435f90
lon: update lix
d169c092fc28838a253be136d17fe7de1292c728
→ ee0655240270480d7f6063dcf12ec47f04d2ded6

Last 50 commits:
  ee06552 libstore: asyncify RemoteStore::Connection::processStderr
  7a10df6 libstore: asyncify RemoteStore connection setup
  cc04a43 libstore: remove flushing from processStderr
  8b3fdbc libstore: add framed data support to sendCommand
  1a22475 libstore: encapsulate reading simple command results
  2128a2d libstore: encapsulate sending of simple commands
  ec374bc libstore: deserialize findRoots data as vector-of-tuples
  ab8f4ae libstore: add CommonProto code for bool/unsigned/uint64_t
  87fbc15 libutil: make the pool element factory a promise
  56847dc libutil: make Buffered{Sink,Source} io buffer shareable
  7d681a5 libutil: add io buffer abstraction
  cc56070 libstore: have SSH use a socketpair, not two pipes
  9c4fd3d libstore: remove unused RemoteStore::Connection::closeWrite
  bea24c8 libutil/cgroup: destroy state record at destroy time
  7bd8271 libstore/platform/linux: destroy cgroup before we release user locks
  797c6d4 libutil/file-system: make `AutoDelete` not copyable and movable
  9f9fced libstore/build/worker: clean up cgroup error messages typos
  a527bb2 libstore/build: cgroup delegation to sandbox
  1783d5b libstore/build: drop cgroups experimental feature
  21dbd77 libstore/binary-cache-store: skip NAR listings if it's not possible to serialize it
  1e71df3 doc/manual/rl-next: mention symbol value reuse
  ebc8f56 libexpr/primops: pass the underlying `Value` of symbols if possible
  5e98a21 libexpr/symbol-table: introduce `InternedSymbol`
  364e94f libexpr/value: do not depend on `Symbol`
  95ea358 libexpr/print: drop redundant constructor in emplace_back call
  ac3b742 libexpr/symbol-table: remove unused field from `SymbolTable::symbols`
  5db71cf libutil: `add` should emplace inside a `ChunkedVector`
  d8b1bb5 build: fix Meson warning about lix-clang-tidy not having meson_version
  b70bbbe misc/pre-commit: add automatic `clang-format` of changed lines
  c19a0fe devshell: add `git-clang-format`
  004a505 tests/functional2/nix: fix config serialization
  0625e69 tests/functional2: fix bad error message when merging files
  afa5b92 tests/functional2: improve type checking util
  60830ca libstore: add derivation wire generator
  4ebf79b libstore: associate wire connection states with stores
  ce9acd5 libstore: use proper connection handle for narFromPath
  2cd44d2 libstore: don't wrap&unwrap connection handles
  b33669b libutil: remove withFramedSink
  c135710 libstore: send worker options packet as one blob
  cf93814 libutil: remove unused FdSource::read
  8c30a16 libutil: remove long-dead create_coro_gc_hook
  dd31a23 libstore: add worker serializer for SubstitutablePathInfo
  fca0a30 libstore: remove pre-2.18 protocols
  019b17f tests/functional2/lang: Migrate trivial `eval-okay` tests
  9673c64 tests/functional2/lang: Migrate trivial `parse-okay` tests
  0219434 tests/functional2/lang: Migrate trivial `parse-fail` tests
  63edb9c tests/functional2/lang: Migrate trivial `eval-fail` tests
  a7e5ff0 tests/functional2: Make symlink handling less confusing
  e753fcb gc: delay throwing error until cleanup is complete
  530b40a tests/functional2: fix overly broad xfail test passing
2025-06-12 15:55:42 +02:00
DGNum [bot]
ff1920acf6 lon: update nixos-24.05
b134951a4c9f
→ b134951a4c9f3c995fd7be05f3243f8ecd65d798

Last 0 commits:
2025-06-12 15:53:25 +02:00
DGNum [bot]
3962ada269 lon: update nix-modules
0cdf222c07b9cbd49857ae046fb41ae9f651cc3f
→ 44ccf96bd73c1bbbbcc849cb0f2e0d1f5f75f934

Last 3 commits:
  44ccf96 feat(ntfy-sh): allow to manage hashed password directly
  5612e8f chore: Remove substituteAll usage
  1c4a60c fix(ntfy-sh): Write correct nix
2025-06-12 12:58:26 +00:00
6e0f65cb4d
chore(workflows/lon-update): Change timer again 2025-06-12 14:54:00 +02:00
d80322fe53
chore(lon): Update disko
Something went bad and the bot could not update it
2025-06-12 14:53:10 +02:00
fb766aee9f
fix(workflows/lon-update): Write the shell definition correctly 2025-06-12 14:31:40 +02:00
f857afb21b
fix(workflows/lon-update): Declare the shell that is to be used
Also tweak the cron time
2025-06-12 14:20:33 +02:00
1ae7676d4e
feat(kanidm): Add SuiteNumerique Drive client 2025-06-11 23:13:20 +02:00
0a4e31671a
chore(web01/static): Switch to lon for managing sources 2025-06-11 23:00:50 +02:00
1e1e3c6965
feat(lon): Add import from npins patch 2025-06-11 23:00:50 +02:00
ae60a8c77b
fix(patches/agenix): Switch to the commit of the PR 2025-06-11 23:00:50 +02:00
95c9d24623
chore(web03/wikiens): Switch to overlays option 2025-06-11 23:00:50 +02:00
863f141ec0
feat(lon): Init from npins 2025-06-11 23:00:50 +02:00
6e76bcf5f8
feat(openbao): Enable UI and setup oidc 2025-06-11 19:51:30 +02:00
HT Chores
4adf9b2286 chore(npins): Update kat-pkgs 2025-06-11 14:30:11 +00:00
HT Chores
7e9878c0c7 chore(npins): Update kat-pkgs 2025-06-10 13:30:32 +00:00
a2b66d75c4
chore(fai/nixos): upgrade to nixos-25.05 2025-06-09 23:26:39 +02:00
4534909d09
feat(bridge01): finally connected to vpn 2025-06-09 23:21:02 +02:00
HT Chores
e6d3f11d32 chore(npins): Update nixos-25.05 2025-06-09 23:11:34 +02:00
40f660fe76
feat(grafana/plugins): add weathermap panel 2025-06-09 17:05:06 +02:00
44a6b658a1
feat(snmp_exporter): enable snmp exporter for network monitoring
fix(snmp_exporter): increase scrape_timeout
2025-06-09 17:05:06 +02:00
0d13b5cd69
docs(netconf): descriptive naming of near all interfaces 2025-06-09 17:05:00 +02:00
a0596d022a
feat(netconf/junos): allow snmp management 2025-06-09 17:04:59 +02:00
4dbd5ac6b1
feat(netconf/junos): add description 2025-06-09 17:04:58 +02:00
e4697fc809
fix(librenms): allows kanidm to create accounts 2025-06-07 23:19:16 +02:00
f685e7e4ec
fix(librenms): fix kanidm login 2025-06-07 22:22:05 +02:00
2fe8b66fa2
revert(hackdays): remove all infra dedicated to hackdays 2025-06-06 10:59:42 +02:00
sinavir
4b6f200c31
fix(kanidm/zulip): disable pkce and allow legacy crypto 2025-06-05 22:19:08 +02:00
7e39b40b0d
chore(dgsi): Update 2025-06-02 22:05:00 +02:00
37741075d8
fix(dns): Make use of the modularity of meta
Define A and AAAA options in meta.addresses that can be reused later
Also define proxying in the metadata
2025-06-02 20:03:50 +02:00
sinavir
4f7d0e6fdb
feat(zulip): dns records 2025-06-02 20:03:50 +02:00
sinavir
92d8da0673
feat(zulip01): init 2025-06-02 20:03:50 +02:00
sinavir
da808fc305
feat(kanidm): add zulip 2025-06-02 20:03:50 +02:00
c358db30ff
feat(web03): Deploy vector on photos.dgnum.eu 2025-06-02 18:04:05 +02:00
81ab5ca4ac
fix(vault01/ups): ups is not connected anymore 2025-06-02 15:41:27 +02:00
e88a9ccda9
feat(hackdays): all switches GO 2025-06-02 15:41:21 +02:00
276f2f4f7d
feat(hackdays): generic switch config 2025-06-02 15:41:21 +02:00
f8c2f2f5ee
feat(hackdays): hackdays network 2025-06-02 15:41:21 +02:00
78e54b02f1
feat(netconf-junos): added required configuration for dhcp 2025-06-02 15:41:21 +02:00
1032b3225e
feat(wordpress/npr): Add a plugin 2025-05-30 16:43:31 +02:00
75ba2e4fcf
fix(netbird): Update dashboard version
The daemon and dashboard versions are supposed to be somewhat couples,
but nixpkgs does not do it. The daemon is regularly updated but the
dashboard lags behind.
2025-05-30 14:56:02 +02:00
4bc96151b2
feat(netconf): chnages in potos network
* core-links in dgn-isp module
* factorize nodes/netconf.nix
2025-05-26 14:28:58 +02:00
4bbaeee232
refactor(netconf): renamed switchs
netcore00 -> netcore01
netcore01 -> netcore02
netcore02 -> Jaccess01
netaccess01 -> Jaccess04
2025-05-26 14:24:07 +02:00
db195b9c0b
fix(colmena): Revert aliases
This made colmena unnecessarily slow, we don't plan to use aliases and
it was a big bowl of slow spaghetti
2025-05-26 13:55:32 +02:00
b09a0e8b10
fix(storage01/victorialogs): bump maxConcurrentInserts to keepup log flow 2025-05-26 00:37:09 +02:00
sinavir
5e731419f3 feat(agenix): Rekey 2025-05-25 22:22:53 +02:00
sinavir
e37ca27064 fix(dgn-forgejo-runners): Forgejo runner secret token don't have to be known by all machines 2025-05-25 22:22:53 +02:00
sinavir
78fbf6cc28 fixup! fix(keys): take root age keys for mkRootSecrets 2025-05-25 22:22:53 +02:00
1c1c19487e fix(keys): take root age keys for mkRootSecrets 2025-05-25 22:22:53 +02:00
e53d46108f
feat(hypervisor03): activate SFP 2025-05-25 20:53:13 +02:00
e8f4fcce60
feat(hypervisor02): activate SFP 2025-05-25 20:52:10 +02:00
c6b14fb48e
feat(hypervisor01): activate SFP 2025-05-25 20:50:44 +02:00
e96d74a726
feat(dgn-network): add metric option 2025-05-25 20:46:11 +02:00
dec93715be
feat(build01): activate SFP 2025-05-25 19:56:08 +02:00
fb5a0ae7eb
fix(patches): fix kanidm patches for 25.05 2025-05-20 16:48:45 +02:00
ee4adaf937 chore(nixos): pass cof02 to 25.05 to have build tests 2025-05-20 15:36:48 +02:00
e3cc0a6788 chore(npins): init nixos-25.05 pin 2025-05-20 15:36:48 +02:00
c65e27d74f
fix(bridge01): disable monitoring 2025-05-20 15:16:14 +02:00
sinavir
90039850de
fix: Disable dgn-notify, dgn-records and dgn-monitoring 2025-05-20 14:55:37 +02:00
sinavir
622fd05807 feat: Dedicated email for monitoring 2025-05-20 13:42:26 +02:00
0945659efd fix(journald-upload): Don't exit as soon as the network connectivity is lost 2025-05-20 11:42:50 +02:00
HT Chores
61fe15b289 chore(npins): Update colmena 2025-05-19 13:30:49 +00:00
48e6f7f739 feat(scripts): Add rekey-all 2025-05-19 10:03:12 +02:00
2e6ba17cdf chore(secrets): Rekey all secrets 2025-05-19 10:03:12 +02:00
9f642eb963 feat(meta/groups): Add catvayor to root 2025-05-19 10:03:12 +02:00
b3d6e50fd2
fix(storage01): Move the storage of victoriametrics to another disk
Victorialogs is postponed as it will be more involved
2025-05-19 09:55:30 +02:00
2c370d804e
fix(forgejo): Don't use gitea for fetching actions 2025-05-19 09:09:40 +02:00
4454192c27
fix(dns): Setup www.dgnum.eu redirection
This allows fetching the main website from both dgnum.eu and
www.dgnum.eu
2025-05-18 17:19:56 +02:00
51ec9b8764
chore(catvayor): add age ssh key 2025-05-15 23:04:47 +02:00
sinavir
742ed8c182
feat(secrets): Add a possibility to use extra keys for secret encryption 2025-05-15 23:04:47 +02:00
HT Chores
ef0efe73ef chore(npins): Update cgroup-exporter 2025-05-13 15:40:56 +02:00
HT Chores
ed9a21c1fa chore(npins): Update git-hooks 2025-05-13 13:31:15 +00:00
HT Chores
8fb86e8fa8
chore(npins): Update nixos-unstable 2025-05-12 15:32:15 +02:00
dc8b7a8808
fix(eval/deprecation): replace substituteAll by replaceVars 2025-05-12 15:32:15 +02:00
a99e9007d2
fix(patches): remove already applied patches 2025-05-12 15:32:15 +02:00
45299918c7
fix(openbao): disable upstream module 2025-05-12 15:32:14 +02:00
1ad9ef3d70
chore(workflows/npins-update): Update running date 2025-05-12 15:24:24 +02:00
e0dfac7fae
fix(shell): Use the correct npins for the update script 2025-05-12 15:21:57 +02:00
c299614b50
chore(npins): Update SRI patch 2025-05-12 10:37:55 +02:00
10f5322016 fix(lix): Make fetchGit use the narHash attribute 2025-05-11 15:54:41 +02:00
4545af8044 feat(npins): Upgrade to locked versions of git pins 2025-05-11 15:54:41 +02:00
25e94f4a6f
chore(kanidm/isp): remove vlan groups from kanidm 2025-05-09 17:11:23 +02:00
6a55299bbc
chore(nix-patches): The check on empty patches is included upstream 2025-05-06 12:37:51 +02:00
HT Chores
3521fcf61d chore(npins): Update nix-pkgs 2025-05-04 22:21:54 +02:00
b1223cf8f1
docs(git/attributes): mark some files as generated or vendored 2025-05-04 17:57:21 +02:00
106a6d74d6
fix(workflows/npins-update): make EXISTING_BRANCH always bounded 2025-05-04 15:50:58 +02:00
5dceb573b7 fix(substituters): Allow all paths from the infra cache 2025-05-04 15:20:47 +02:00
9aabdedb83
fix(vault01/radius): add configuration declaration 2025-05-04 11:45:30 +02:00
40f5fc2a55
feat(forgejo): Don't use unstable's version anymore 2025-05-03 22:32:31 +02:00
7c9f73e921
feat(vault01/radius): ask dgsi for vlan id 2025-05-03 22:06:36 +02:00
025cc2b56a
chore(workflows/npins-update): Regenerate 2025-05-03 20:51:02 +02:00
HT Chores
5091e6ba4a chore(npins): Update nixos-24.11 2025-05-03 20:39:05 +02:00
2145e20271 fix(pkgs/docuseal): Unlock ruby version 2025-05-03 20:39:05 +02:00
3e01c6aa03 fix(patches): remove already applied patches 2025-05-03 20:39:05 +02:00
10ab6314dc fix(workflows): Update nix-actions 2025-05-03 20:39:05 +02:00
fed05df362 fix(workflow): Try to not eat errors 2025-05-03 20:39:05 +02:00
e8663d88c4
fix(workflows): Remove npins and tea from the runners dependencies
This ensures we use those from the defined shells
2025-05-03 18:40:02 +02:00
c950aed3fc
chore(workflows): Update npins-update 2025-05-03 18:36:25 +02:00
e775d3049d
fix(radiusd): Disable debug output 2025-05-03 18:27:22 +02:00
b13ba3f17a
fix(k-radius): Reduce log level
In debug mode, the radius secrets were printed to the log...
2025-05-03 18:26:02 +02:00
2537b8550d chore(dgsi): Update 2025-05-03 17:24:11 +02:00
51e08a6b89
feat(crabfit): Reduce log level for sqlx queries 2025-05-03 15:28:20 +02:00
58f7f2b735
fix(web01): 48h.arts.ens.fr is on S3 2025-05-03 10:49:33 +02:00
8c965282a7
feat(compute01): Deploy opengist on gist.dgnum.eu 2025-05-01 15:07:19 +02:00
c8dde546f6
feat(dns): Allow restricting ip records to only one address
This allows simpler migrations
2025-04-29 10:33:54 +02:00
0ed5d7f1e0 fix(extranix): Build HTML description in the python script
This avoids creating one derivation per option
2025-04-28 22:18:25 +02:00
fc0ab4f677 fix(extranix): Make options description replacement fast 2025-04-28 22:18:25 +02:00
dbd2528994
fix(build01): Set a global token for multiuser runners 2025-04-28 22:17:23 +02:00
c02cd7047d
fix(scripts): Add build-iso to the shell 2025-04-28 20:43:17 +02:00
a62cfafcb4 feat(web03): change IP for a non-DHCP one 2025-04-28 13:58:46 +02:00
sinavir
9d3c6d14b8 fix(debian-runners): Use new tokens 2025-04-28 12:42:51 +02:00
sinavir
a7fe5cdd7d fix(dgn-forgejo-runners): Move secret to module 2025-04-28 12:42:51 +02:00
sinavir
8a958087f7 feat(workflows): Move workflows to dedicated runners
This also removes storage01 as a builder
2025-04-28 12:42:51 +02:00
sinavir
fc7620a338 feat(forgejo-runners): Use a multiuser nix installation 2025-04-28 12:42:51 +02:00
sinavir
e7b76d1579 feat(snix-cache): Use snix-cache module 2025-04-28 12:42:51 +02:00
sinavir
361572d013
fix(tower01): Import data zpool 2025-04-27 17:03:25 +02:00
d28d2ac5e5 revert: feat(web03): change IP for a non-DHCP one
This IP is currently reserved for other matters
2025-04-26 21:41:04 +02:00
7346f53817
feat(web03): change IP for a non-DHCP one 2025-04-25 18:01:55 +02:00
sinavir
95a5b4cf55
fix(secrets): Rekey for krz01 2025-04-25 15:14:23 +02:00
f642e2e106
fix(krz01/eval): specified stateVersion 2025-04-25 15:14:23 +02:00
95c0f9a3a1
fix(lab-router01/eval): move some Config attribute up 2025-04-25 15:14:23 +02:00
2bf11ba2e1
fix(meta): lab-router01 has no netbird 2025-04-25 15:14:23 +02:00
sinavir
f0771ff28d
feat: move back router02 and rename it lab-router01 2025-04-25 15:14:23 +02:00
sinavir
6303da3811
feat: move back krz01 2025-04-25 15:14:00 +02:00
HT Chores
fca2486e01 chore(npins): Update wp4nix 2025-04-25 15:08:18 +02:00
HT Chores
e3ddfee02c chore(npins): Update lix-module 2025-04-25 15:03:12 +02:00
HT Chores
4aa809e680 chore(npins): Update git-hooks 2025-04-25 14:47:52 +02:00
46332e793e
chore(modules/dgn-network): The web02 workaround is no longer necessary 2025-04-25 14:45:19 +02:00
ea27842782
feat(iso): Add README 2025-04-25 14:40:32 +02:00
189b1357dd
feat(iso): everyone is admin of iso 2025-04-25 10:08:43 +02:00
427cee0c3e
feat(iso): place iso inside hive 2025-04-25 10:08:43 +02:00
43abc137dc
chore(npins): remove unused pins
* lon
* nixos-generator
* kahulm
2025-04-25 10:08:43 +02:00
sinavir
0109b4703a
feat(web03/ernestophone): Pull app from master 2025-04-25 10:07:54 +02:00
1bc03e83e8
feat(workflows/eval-nodes): separate workflow in multiple stage 2025-04-25 00:30:45 +02:00
35bf5793a6
fix(modules/extranix): don't crash when having to many options 2025-04-23 15:33:34 +02:00
6b71080404
feat(kanidm): Add SuiteNumerique Visio client 2025-04-22 17:26:39 +02:00
1c7a138f1a
fix(storage01): Add back podman
We have build01 now
2025-04-21 19:08:27 +02:00
dfa46faee1
chore(storage01): Disable forgejo nix runners
We have build01 now
2025-04-21 18:56:01 +02:00
HT Chores
2c48143966 chore(npins): Update nixos-24.11 2025-04-21 17:33:54 +02:00
HT Chores
78fdf04f29 chore(npins): Update nixos-unstable 2025-04-20 18:03:45 +02:00
32b0bf7e1c fix(action-validator): patch to build & use in default 2025-04-20 18:03:45 +02:00
0c44467e0b
fix(nix): Use correct expression for list-nodes 2025-04-20 17:06:42 +02:00
bfff4108d1 feat(kanidm): Add SuiteNumerique Docs client 2025-04-20 16:54:36 +02:00
2ad9125ffc
fix(storage01/tvix-cache): fix build after force-push... 2025-04-17 14:57:46 +02:00
6d81001b85
feat(extranix): Add theme option and update 2025-04-17 12:58:44 +02:00
01d72bfa13
chore(dns): Switch rescue01 to v6 only
ipv4 seems to have difficulties right now
2025-04-16 18:03:48 +02:00
a1fc8f8cfe feat(modules/dgn-audit): init 2025-04-16 07:54:17 +02:00
bb7c377cb3 feat(modules/extranix): Simplify 2025-04-16 07:48:57 +02:00
447e4df244 feat(extranix): Add docuseal documentation 2025-04-16 07:48:57 +02:00
8f8585038d feat(bootstrap): Add the root of the repository
This avoids making ../../.. in some places
2025-04-16 07:48:57 +02:00
6ffa71c17d feat(hive): Pass bootstrap as an argument 2025-04-16 07:48:57 +02:00
ee05a030da fix(workflows/npins-update): hack! ?? 2025-04-15 12:16:54 +02:00
3748efa295
fix(keys): unique is not in extra anymore 2025-04-15 00:34:36 +02:00
9f91f73270
fix(compute01): Add nofail to dgsi mounts 2025-04-15 00:23:16 +02:00
f77e011c11
fix(docuseal): Actually import the module
Minor cleanup as well
2025-04-14 13:16:29 +02:00
41a4b98cc5
feat(compute01): Deploy docuseal on docuseal.dgnum.eu 2025-04-14 11:24:10 +02:00
ad5d108bc0
feat(pkgs): Init docuseal at 1.9.8 2025-04-14 11:22:15 +02:00
f01b1fd6e4 feat(nix-lib): Add genAttrs' 2025-04-13 11:29:51 +02:00
4b9721457c
feat(npins): Use a dedicated shell 2025-04-13 11:28:55 +02:00
HT Chores
fbd10262c3
chore(npins): Update nixos-unstable 2025-04-12 18:34:50 +02:00
9b6ffcb7ae
fix(compute01/build): sourceRoot did not exists 2025-04-12 18:34:50 +02:00
7b1542302c
chore(npins): upgrade sources version 2025-04-12 17:46:27 +02:00
sinavir
0a41c80113
feat(netbox): use nixpkgs-stable package
Co-authored-by: catvayor <catvayor@katvayor.net>
2025-04-12 17:36:48 +02:00
3db1fb3f98
fix(patches): netbird moved to by-name 2025-04-12 17:36:48 +02:00
HT Chores
091afa02d0
chore(npins): Update signal-irc-bridge 2025-04-12 17:36:48 +02:00
b1179a63c4
fix(workflows/npins-update): use shell npins to ensure npins coherence 2025-04-12 17:36:11 +02:00
7442de051f chore(npins): Update nixos-24.11 2025-04-12 09:28:10 +02:00
2255963369 fix(patches): reformat a patch after treewide format of upstream 2025-04-12 09:28:10 +02:00
da27885108 chore(k-radius): ensure same kanidm version 2025-04-12 09:28:10 +02:00
dc759d84c1 chore(kanidm): upgrade 2025-04-12 09:28:10 +02:00
HT Chores
71a29ea879 chore(npins): Update lix 2025-04-12 09:28:10 +02:00
df715ce343 fix(django-apps): Set nofail on mounts
This disables the dependency from local-fs.target to the mounts, which
caused a dependency cycle
Co-authored-by: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Co-committed-by: Tom Hubrecht <tom.hubrecht@dgnum.eu>
2025-04-11 21:07:32 +02:00
f04a1aa6bc
feat(workflows/npins-update): push when only rebasing
Co-authored-by: Tom Hubrecht <tom.hubrecht@dgnum.eu>
2025-04-10 17:32:15 +02:00
5c2b3c73d8
fix(web03/gestiocof): missings ldap credentials 2025-04-10 14:08:26 +02:00
e27790cf28
fix(worflows/npins-update): don't try to open PR if not needed 2025-04-09 18:29:04 +02:00
ca9d1b1b1d
feat(vault01): add admin ipv4 2025-04-05 18:38:27 +02:00
08e4576f06
feat(netcore01): connect power systems to admin 2025-04-05 18:37:00 +02:00
f1914df929
feat(netcore01/tower02): add relevant connections 2025-04-05 16:22:39 +02:00
ffc63e6a9c
fix(netcore01): model & separate idracs 2025-04-05 16:22:15 +02:00
9aa3e450e8
fix(dgn-hardware/EX4100-f-48P): typo in interfaces range 2025-04-05 16:20:56 +02:00
567147e9b4
fix(web02): Disable backup jobs, as it is not on the VPN 2025-04-04 10:26:25 +02:00
efad0b4736
chore(cas-eleves): They had a certificate after all 2025-04-04 10:26:25 +02:00
c20bf265ad
chore(web02/cas): Patch cas-eleves settings 2025-04-04 10:26:25 +02:00
sinavir
723a3ac193
feat(garage): Enable 48h-arts public website 2025-04-02 11:48:13 +02:00
ecf39c6bb8 fix(web03/postgresql): Increase the maximum number of connexions 2025-04-01 18:23:29 +02:00
sinavir
aed96b16e1 feat(monitoring): drop prometheus in favor of victorialogs 2025-04-01 17:04:54 +02:00
sinavir
e2b916e649
feat(forgejo): Enable captcha for registration 2025-04-01 16:35:21 +02:00
sinavir
bb73cc2a13
fix(arkheon): Simplify module 2025-04-01 11:59:21 +02:00
HT Chores
f21fa29caa chore(npins): Update dgsi 2025-04-01 11:22:58 +02:00
f8c058d3e4 chore(dgsi): add django REST framework & drf spectacular
Co-Authored-By: Tom Hubrecht <tom.hubrecht@dgnum.eu>
2025-04-01 11:22:58 +02:00
HT Chores
8a6b13644b chore(npins): Update arkheon 2025-03-31 21:33:14 +02:00
sinavir
7dd7251f41
feat(garage): init 48h-arts bucket 2025-03-31 21:00:45 +02:00
c72bd97035 feat(netconf): init netcore00
This will be the center of Jourdan isp network
2025-03-27 18:21:17 +01:00
sinavir
f184aa7956
feat(garage): Add citoyens-website 2025-03-27 12:23:18 +01:00
1fcc0844ca
feat(cof-stage): add bulma package for current development 2025-03-19 15:50:30 +01:00
b1cfe1bc16
feat(cof-stage): add staging branch 2025-03-19 15:50:30 +01:00
98cbe3ce69
fix(cof-staging): DEBUG flag 2025-03-19 15:50:30 +01:00
568bf7f1eb
fix(default/purity): empty overlays for pkgs in bootstrap 2025-03-14 12:48:26 +01:00
sinavir
3319b5c3ce
fix(tower01): Use vpn for deployments 2025-03-14 10:30:14 +01:00
sinavir
2aac734fa6
fix: Use ens ntp for some machines 2025-03-14 03:01:59 +01:00
sinavir
26833e7b64
fix(forgejo): Move repo archives and actions_artifact to our big slow disks 2025-03-14 01:34:29 +01:00
959d5ae501
fix(collabora): use stable collabora 2025-03-13 16:46:52 +01:00
7d7c83e1c8
chore(garage): update from garage 1.0.1 to 1.1.0 2025-03-13 16:46:52 +01:00
d40c4011bd
fix(patches): removed upstream patches 2025-03-13 16:46:52 +01:00
HT Chores
ef30f84273
chore(npins): Update nixos-unstable 2025-03-13 16:46:52 +01:00
HT Chores
80f4ba0abd
chore(npins): Update nixos-24.11 2025-03-13 16:46:52 +01:00
19ec8d2bab
fix(openbao): Correctly use UMask feature, tcp listener and genJqScript 2025-03-13 16:19:00 +01:00
f1e92c01c7
fix(journal-upload): Increase restart delay 2025-03-13 15:44:38 +01:00
HT Chores
4333df563c chore(npins): Update colmena 2025-03-12 16:57:02 +01:00
a03164240e
feat(machines/storage01): init openbao
Signed-off-by: Elias Coppens <elias@dgnum.eu>
2025-03-11 11:56:15 +01:00
1e53dc09ba
feat(modules/nixos): init openbao module
Signed-off-by: Elias Coppens <elias@dgnum.eu>
2025-03-11 11:49:16 +01:00
HT Chores
a84028b3e7 chore(npins): Update git-hooks 2025-03-11 09:43:45 +01:00
a4c38e1b5f
chore(npins): Drop proxmox-nixos 2025-03-11 09:06:21 +01:00
HT Chores
f87702cf66
chore(npins): Update nix-modules 2025-03-10 22:00:10 +01:00
6fd52bda33
feat: add TXT record to be validate by google
Signed-off-by: Elias Coppens <elias@dgnum.eu>
2025-03-10 21:43:25 +01:00
bd4c64db02
feat(cof02): init cof staging vm
The purpose of cof02 is to allow presenting under development features
on gestiocof, or check that the next update of gestiocof works in
production-like environment, by placing it in a near perfect copy of
this environment
2025-03-10 10:19:04 +01:00
4229835ec4
feat(django-apps): allow adding extra init steps 2025-03-09 21:53:18 +01:00
990206da3c
feat(django-apps): make backups optional 2025-03-09 21:53:18 +01:00
c705ba8176 fix(nix-actions): now steps are under lib 2025-03-09 21:39:35 +01:00
HT Chores
6449fcc87e chore(npins): Update nix-actions 2025-03-09 21:39:35 +01:00
22dfdaeb37
chore(catvayor/keys): add less secured key for builder 2025-03-09 20:37:14 +01:00
sinavir
e208be6037
fix(radius): Be less verbose in the logs not to overflow journald 2025-03-09 18:34:20 +01:00
c01d4ba9c3
feat(web03/gestiojeux): Update settigns 2025-03-07 23:03:55 +01:00
86a3811327
fix(wrappers/colmena): ensure purity of evaluation 2025-03-02 22:20:10 +01:00
cdc867fd59
fix(meta/dns): Add netbox-v2 2025-03-01 17:00:32 +01:00
20334be668
feat(compute01): Deploy a copy of netbox 2025-03-01 16:59:55 +01:00
HT Chores
b0ee48c21a chore(npins): Update dgsi 2025-03-01 16:55:29 +01:00
953b69b1c6 fix(vault01/victorialogs): listen netbird & aps 2025-03-01 16:49:32 +01:00
9e4dec4fc0 feat(vault01): Deploy victorialogs to prepare the collect of the AP logs 2025-03-01 16:49:32 +01:00
3dd4619aa7
fix(nextcloud): Disable automatic app update 2025-03-01 14:00:23 +01:00
b7c225a9cd
feat(web03/gestioCOF): passing in cof-prod branch 2025-02-26 09:12:02 +01:00
97e4ed43d5
feat(web03/gestioCOF): email config 2025-02-25 11:37:27 +01:00
0558b48aaa
fix(django-apps/timers): avoid socket suppression 2025-02-25 11:37:17 +01:00
34197a21ec feat(django_apps): enable logging by default 2025-02-24 17:55:20 +01:00
b524b96fce feat(web03/gestiocof): timers 2025-02-24 17:48:00 +01:00
5a37cf7d64
feat(web02): Switch to django-apps for deploying kadenios 2025-02-24 17:47:13 +01:00
6dc90315c5
feat(lib/keys): Add a function for nodeless secrets 2025-02-24 17:47:13 +01:00
8e39d6bc1a
fix(django-apps): Place the bracket correctly 2025-02-24 17:47:13 +01:00
78f32c1b0a
chore(meta/dns): Add a webhook endpoint for web02 2025-02-24 16:16:59 +01:00
09ffafade0
feat(django-apps): Add timers option
This is similar to extraServices but without the partOf, upheldBy and
wantedBy settings.
2025-02-24 16:03:01 +01:00
80ede4b1f6
feat(web03): Do the migration 2025-02-24 15:33:42 +01:00
2e9afbfe8e
chore(dns): Update redirection 2025-02-24 13:23:31 +01:00
34b22ae119
chore(web03/secrets): Rekey 2025-02-24 12:12:10 +01:00
9395a96337
test(vault01/network): use netchecker to see connectivity looses 2025-02-23 09:48:37 +01:00
417c39d469
feat(web03): Add catvayor as admin 2025-02-20 12:49:55 +01:00
438b86d088
fix(web03/gestiocof): Use correct file 2025-02-20 12:49:35 +01:00
e0a0bc8c5f feat(meta/organization): Split the file 2025-02-19 19:33:45 +01:00
HT Chores
6cc74e8d2a chore(npins): Update kat-pkgs 2025-02-19 14:00:24 +01:00
a604232fa8
chore(npins): Update dgsi 2025-02-19 12:01:15 +01:00
a86609ca90
feat(web03): Prepare the migration by setting up the sympa credentials 2025-02-19 10:32:05 +01:00
34f1a36b5e
feat(web01/wordpress): Deploy npr.wp.dgnum.eu 2025-02-16 00:35:24 +01:00
83aa42ac79
fix(keys): Make it so agenix works again 2025-02-13 17:38:12 +01:00
909bb55764
chore(keys/catvayor): finish ssh key rotation 2025-02-13 12:36:26 +01:00
e61031d93b
chore(npins): Update dgsi 2025-02-11 17:04:21 +01:00
8d2be99daf
feat(compute01/kanidm): Generate the VLAN groups 2025-02-11 15:07:13 +01:00
7f7e245123
chore(meta): Use mkImports for the module list 2025-02-11 10:31:37 +01:00
299c8c8108
chore(nix-lib): Remove nixpkgs.nix
It is no longer used
2025-02-11 10:31:37 +01:00
14ef9d88f3
chore(meta/options): Add comments 2025-02-11 10:31:37 +01:00
ecb6b54b9e
feat(lib): init genFuse 2025-02-10 16:52:50 +01:00
85374e9d6c
chore(npins): Revert failed update
This reverts commit e1c6b1b749.
2025-02-10 16:52:12 +01:00
HT Chores
e1c6b1b749 chore(npins): Update nixos-24.11 2025-02-10 12:16:28 +00:00
0243b21cce fix(patches): Remove changes included upstream 2025-02-10 12:16:03 +00:00
69d79a7049
fix(nixos-unstable): Revert netbox-qr update as it is incompatible with netbox 2025-02-10 00:10:27 +01:00
0235b77777
fix(compute01/extranix): Make it build 2025-02-09 23:05:39 +01:00
3dd314e78c
feat(compute01/grafana): Add victoria* data sources 2025-02-09 22:58:41 +01:00
3678c24ed4
feat(modules/dgn-monitoring): Replace dgn-node-monitoring 2025-02-09 00:30:46 +01:00
95df4a5ed6
feat(modules/dgn-monitoring): Setup VictoriaMetrics and VictoriaLogs 2025-02-09 00:30:46 +01:00
358b5a6497
feat(storage01): Deploy VictoriaMetrics and VictoriaLogs on the VPN 2025-02-09 00:30:46 +01:00
HT Chores
50a97b42ec chore(npins): Update nixos-unstable 2025-02-08 12:17:26 +00:00
0597476550 chore(npins): Update dgsi 2025-02-06 14:01:36 +01:00
7eef4e2661
feat(meta): Use the module system to directly create the admin list from the groups 2025-02-06 13:41:03 +01:00
0433a00636
chore(bootstrap): Rename file 2025-02-06 13:08:04 +01:00
9fe392d4ea
chore(meta): Format 2025-02-06 13:08:04 +01:00
sinavir
00c70ce869
chore(lib): Clean instanciation 2025-02-06 13:08:04 +01:00
sinavir
e0759140cc
chore: Refactor meta to a module architecture
Get rid of the weird half nix half module stuff.
2025-02-06 13:08:04 +01:00
sinavir
9d24c766f3
feat(keys): Move keys to meta
chore: revert meta stuff
2025-02-06 13:08:04 +01:00
f55107301a
chore(npins): Update dgsi 2025-02-06 11:24:34 +01:00
b5fe7bd71f feat(machines/nixos/build01/nix-builder): add builder-specific keys via dgn-keys
Reuses the commit on builder-specific keys.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2025-02-06 01:30:45 +01:00
551c75ac47 feat(machines/nixos/build01/nix-builder): enable trusted remote building
This enables any nix-builder to be able to remote build with the trusted
bit in Nix.

This effectively gives root to all these people, I don't think it's a
big deal.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2025-02-06 01:30:45 +01:00
5ca85e3430 feat(keys): add builder-specific keys
For remote building, keys are usually isolated from the main keys.

This enables another list of keys to add.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2025-02-06 01:28:11 +01:00
c5623896f3 feat(isp/legal): scripts to reply to legal request 2025-02-05 17:05:01 +01:00
HT Chores
bdd1c14a46 chore(npins): Update kat-pkgs 2025-02-05 16:56:55 +01:00
HT Chores
8864aefa38 chore(npins): Update dgsi 2025-02-05 16:30:36 +01:00
a305a69aad
fix(bridge01/network): hack! resolve arp of the router 2025-02-05 16:20:33 +01:00
ce66001883 fix(update): adapted patch to unstable update 2025-02-05 16:08:06 +01:00
HT Chores
c27f63b2e2 chore(npins): Update nixos-unstable 2025-02-05 16:08:06 +01:00
b3eb86c0a1
feat(ISP/firewall): forward filtering
removes the snat filtering of preliminar tests
2025-02-05 15:52:06 +01:00
HT Chores
5f5fae103f chore(npins): Update lix-module 2025-02-05 15:44:07 +01:00
HT Chores
69e85ad6da chore(npins): Update lix 2025-02-05 15:30:26 +01:00
69849b3d08
feat(isp): connecting all APs 2025-02-05 14:20:00 +01:00
76239af209
refactor(netconf): use dgn-isp for switches 2025-02-05 14:20:00 +01:00
1ed3749c33
feat(netconf/dgn-isp): init
module to make isp switches description easier
2025-02-05 14:20:00 +01:00
15cec17611
feat(netconf/dgn-profiles): init
Module to factorise port configuration
2025-02-05 14:20:00 +01:00
sinavir
902cce4edb
fix(bridge01): Make it finally work 2025-02-05 12:32:58 +01:00
sinavir
2f2cee559e
feat(sso/groups): Add grp_cri_nps 2025-02-05 10:56:37 +01:00
sinavir
bf324738b1
feat(sources/nixpkgs): Add kanidm memberless patch 2025-02-04 15:27:05 +01:00
sinavir
bbdc5ef6da
fix(web03/ernestophone): Missing secrets 2025-02-04 14:06:46 +01:00
9560055caf
feat(programs): Add utilities programs to dgn-console 2025-02-04 00:25:02 +01:00
304103af3a feat(netconf/netcore01): init 2025-02-03 15:08:36 +01:00
d2603b38d8 feat(netconf/netaccess01): init 2025-02-03 15:08:36 +01:00
222dbd724c feat(netcore02): allow hypervisor vlan in potos 2025-02-03 15:08:36 +01:00
2b4a332bf6 feat(netconf/scripts): init script for deployment 2025-02-03 15:08:36 +01:00
fabfc982f2
feat(compute01/dgsi): Update 2025-02-02 11:12:04 +01:00
sinavir
9e0e7d01ec
feat(garage/actes-administratifs): Init bucket 2025-02-02 11:09:27 +01:00
2c59fd4e81
feat(dgsi): Update staff group 2025-01-30 17:34:04 +01:00
8705fe8865
feat(meta): Add bureau group 2025-01-30 17:18:49 +01:00
HT Chores
526a2e709d chore(npins): Update wp4nix 2025-01-30 13:42:31 +01:00
HT Chores
9aa8d49378 chore(npins): Update dgsi 2025-01-30 12:15:33 +00:00
905b252ac6
fix(vault01/snat): we lost an ip for the oob 2025-01-28 12:17:19 +01:00
7d0f447036
fix(vault01/iprules): allow packets to return to orig saddr 2025-01-28 12:16:42 +01:00
567b153c31 feat(kanidm): Add groups for service admins 2025-01-28 08:31:45 +01:00
93a26c26f9
feat(vault01/radius): declare user vlans 2025-01-27 20:35:35 +01:00
c97db7609d
feat(vault01): global options for vlans decl 2025-01-27 20:29:15 +01:00
7dab4ef1cb
feat(isp/vault01): (temp) ipv4 for production APs 2025-01-27 10:27:29 +01:00
2277fdb32d feat(isp/vault01): IPv6 send RA for APs 2025-01-27 10:00:02 +01:00
cd0414f12f
chore(dgsi): Update 2025-01-26 00:53:37 +01:00
d0b4f2a921
fix(pretalx): Disable test failing in CI 2025-01-26 00:14:09 +01:00
50486ec476
fix(meta/dns): Add pretalx.dgnum.eu 2025-01-25 23:28:40 +01:00
fe8330ed84 feat(rescue01): Deploy a netbird relay 2025-01-25 22:07:42 +01:00
HT Chores
8666fdb128 chore(npins): Update nixos-generators 2025-01-25 22:04:12 +01:00
HT Chores
80bcd23f30 chore(npins): Update kat-pkgs 2025-01-25 22:03:02 +01:00
HT Chores
275d9e179c chore(npins): Update git-hooks 2025-01-25 22:02:47 +01:00
HT Chores
7bf39ad0f6 chore(npins): Update nix-reuse 2025-01-25 21:58:38 +01:00
HT Chores
3f9fe3b7c9 chore(npins): Update metis 2025-01-25 21:51:46 +01:00
c94e2e1cbf fix(keys/getKeys): don't fail if no key is specified 2025-01-25 21:44:53 +01:00
58bffb0263 feat(meta/checks): check only for required ssh keys 2025-01-25 21:44:53 +01:00
b0bc3fae4a
fix(dgsi): Update 2025-01-25 21:41:56 +01:00
137b629a0f
feat(dgsi): Update 2025-01-25 19:54:35 +01:00
11c7892f54 fix(vault01/networking): mtu 2025-01-25 19:30:43 +01:00
sinavir
ccce19ef3b
feat(web01/metis): Update metis 2025-01-24 16:42:12 +01:00
sinavir
d5b452caf5
feat(meta/organization): Enroll Anaelle 2025-01-23 23:19:42 +01:00
sinavir
ac3cd0a505
fix(cache): Use right nix option for client cache settings 2025-01-22 12:41:47 +01:00
sinavir
a03fe42131
fix(outline): Proxy websockets 2025-01-21 16:26:19 +01:00
820088c78e
fix(ds-fr): User correct patch 2025-01-20 01:09:35 +01:00
8ba6cedc1b
feat(compute01): Deploy pretalx 2025-01-20 01:09:35 +01:00
05591252a7
chore(pretix): Sort attributes 2025-01-20 00:55:55 +01:00
eea36da34b
feat(compute01): Deploy pretix 2025-01-19 23:37:08 +01:00
4e684fc7ff
fix(list-nodes): Use the correct file 2025-01-19 23:36:47 +01:00
180087728f
chore(patches): Add helper function 2025-01-19 23:36:47 +01:00
02084b130f
feat(web03/gestiocof): Add passthrough for some clubs 2025-01-17 09:18:56 +01:00
383667f5f9
chore(django-apps): Sort 2025-01-16 18:51:14 +01:00
9036426500
feat(django-apps): Restart the main unit after the update is successful 2025-01-16 18:51:03 +01:00
a7b34850f4
feat(django-apps): Finish the daphne-specific setup 2025-01-16 18:50:44 +01:00
03541914ae
feat(django-apps): Automatically add admins 2025-01-16 18:50:01 +01:00
5512fce677
fix(django-apps): Use correct default channel layer 2025-01-16 18:49:26 +01:00
af7f161e24
feat(web03/gestiocof): Make the configuration suitable for a production setup 2025-01-16 18:49:02 +01:00
776f5f5426
feat(web03/bocal): Make the redirections work correctly 2025-01-16 16:56:39 +01:00
e555bbc06e
chore(django-apps): Reduce webhook output 2025-01-16 16:56:39 +01:00
93f51cf972
feat(web03/bocal): Add preparation.pdf 2025-01-16 16:56:39 +01:00
79cb15120d
feat(web03): Add guests directory ass sshfs 2025-01-16 16:56:39 +01:00
2efe27cb62
fix(django-apps): Use correct word in description 2025-01-16 16:56:39 +01:00
ec564b46f4
feat(django-apps): Factorize overlays 2025-01-16 16:56:39 +01:00
c58f68bab2
chore(workflows): Regenerate npins-update 2025-01-16 16:56:39 +01:00
05935d95c5
feat(web03/django-apps): Deploy gestiocof 2025-01-16 16:56:39 +01:00
c65c2036e0
feat(web03/django-apps): Deploy gestiobds 2025-01-16 16:56:39 +01:00
c5988aebd9
chore(django-apps): Don't set variables to their default value 2025-01-16 16:56:39 +01:00
b263c1fc84
feat(dgn-firewall): Ban f*cking AI crawlers again 2025-01-16 15:27:41 +01:00
sinavir
fa2aefdb9a fix(agenix): Working rekeying 2025-01-16 11:10:43 +01:00
sinavir
9219e8a9c5
chore(npins): Remove nixpkgs, use nixos-unstable instead 2025-01-16 10:58:09 +01:00
sinavir
91cd3c9c07
fix(gestiojeux): missing dependencies 2025-01-16 10:16:42 +01:00
HT Chores
b7ccb14bf8 chore(npins): Update wp4nix 2025-01-15 12:16:46 +00:00
45e5c02fdb
chore(workflows/npins-update): Update timing 2025-01-15 13:13:44 +01:00
18137768ae
chore(workflows): Use nix-shell helper 2025-01-15 13:10:47 +01:00
sinavir
ea9f513459
fix(nixfmt): Reformat 2025-01-15 09:31:25 +01:00
sinavir
75f00f4b9c
chore(npins): Update 2025-01-15 09:31:25 +01:00
sinavir
1da26f4143
fix(ds-fr): Update dgn patch 2025-01-15 09:31:25 +01:00
sinavir
d7622f4d8f
chore(nixfmt): Format all files since nixfmt version changed 2025-01-15 09:31:25 +01:00
sinavir
380f629b0e
feat(web02): Upgrade to 24.11 2025-01-15 09:31:25 +01:00
95b25b946a
fix(compute01/extranix): use unstable lib 2025-01-15 09:31:25 +01:00
sinavir
7bdf27f823
fix(shell): Use right version of reuse 2025-01-15 09:31:25 +01:00
a81c4009de
chore(npins): Update 2025-01-15 09:31:25 +01:00
b9d30e77b4 chore(catvayor): begin rotating ssh keys 2025-01-14 18:42:34 +01:00
sinavir
81690c1ea3
fix(garage): Garage doesn't like empty TOML sections 2025-01-14 17:43:30 +01:00
sinavir
5b02658e08
fix(garage): Switch to dangerous mode 2025-01-14 16:51:27 +01:00
8fc2d93244
fix(npins): Update nix-modules 2025-01-14 14:49:47 +01:00
0f192ead79
fix(npins): Add the required hash 2025-01-14 14:49:47 +01:00
sinavir
e6906a0aa3
feat(garage): Use a module and replicate on tower01 2025-01-14 09:52:42 +01:00
fb993945c8
fix(nextcloud): Create home directory for cool 2025-01-11 11:39:47 +01:00
1447ec9eb8 fix(vault01): Fixed MTU of br0 2025-01-10 19:37:54 +01:00
sinavir
07d226a06e
fix(build01/nix-builder): Use dgn-access-control 2025-01-10 19:26:24 +01:00
4b30fb8a36
fix(meta/nodes): Don't duplicate imported modules 2025-01-10 09:37:58 +01:00
8cfc0001b9
feat(build01): Init 2025-01-09 23:08:08 +01:00
sinavir
d474e39b92
fix(kanidm): Remove useless nixpkgs config for old kanidm 2025-01-09 22:04:02 +01:00
sinavir
ea5c0787d7
fix(forgejo): Renamed option mailerPasswordFile 2025-01-09 21:16:03 +01:00
409a7877df feat(vault01): higher MTU 2025-01-08 21:58:22 +01:00
642a5effc2
chore(npins): Update dependencies 2025-01-08 20:17:31 +01:00
3c9c38fb03
chore(modules/firewall): Rewrite to simplify
Also disable the ai filter for nodes that don't have nginx enabled
2025-01-06 00:32:05 +01:00
e0cfd1ceb0
feat(firewall): Ban AI crawlers 2025-01-06 00:11:58 +01:00
sinavir
c4108a62ab
chore(web02/cas-eleves): Factorize source and use host in ALLOWED_HOSTS 2025-01-05 00:14:50 +01:00
sinavir
5cd85d38b1
fix(cas-eleves): Fix migration commands order 2025-01-05 00:13:25 +01:00
e574d2ab72
fix(workflows/npins-update): Set the env correctly 2025-01-04 17:00:50 +01:00
4a911b26c6 feat(npins-update): Make it run weekly, but per pin 2025-01-04 14:25:52 +01:00
2551da6388
fix(extranix): ensure default entry exists and escape html 2025-01-04 13:23:12 +01:00
sinavir
1eac1ec486
fix(garage): Remove legacy config 2025-01-03 16:18:02 +01:00
sinavir
194c09b291 fix(keys): Add nixosMachineKeys and rekey
This is needed for secret encryption since netconf and liminix machines
don't have an ssh key for now.
2024-12-28 23:01:19 +01:00
8656a52afe feat(tower01): Init 2024-12-28 23:01:19 +01:00
30daeb5edc
feat(meta/dns): Add extranix record 2024-12-28 22:43:55 +01:00
0307d15302
chore(extranix): Rename folder 2024-12-28 22:43:35 +01:00
7ac02ac5af feat(compute01/search): init search.infra and modules/nixos/extranix 2024-12-28 22:25:26 +01:00
7c691ea920 fix(doc): missing description and lib.mdDoc 2024-12-28 22:25:26 +01:00
fd1bdd3296 fix(netconf): type any doesn't exist 2024-12-28 22:25:26 +01:00
bbdae45f4f
chore(nix-actions): Update and take advantage of the new stuff 2024-12-26 21:26:07 +01:00
sinavir
172d2920bf fix(scripts): Refactor cache uploading 2024-12-23 14:02:22 +01:00
sinavir
f685061ab1 feat(shell): Add an action to cache it 2024-12-23 14:02:22 +01:00
sinavir
383911d619
fix(web03/redirections): import module 2024-12-22 15:16:48 +01:00
5fa7ccb8e7
fix(django-apps): Disable statedir backup until it is fixed 2024-12-21 17:18:32 +01:00
e19100f856
feat(django-apps): Add automatic backup 2024-12-21 08:24:11 +01:00
sinavir
3085d9e3a8
feat(dj-apps/ernestophone): Switch to production 2024-12-20 16:45:53 +01:00
31e3aabc8f
chore(npins): Update stateless-uptime-kuma
This version has exponential backoff for trying to connect to the
upstream server
2024-12-20 13:33:57 +01:00
sinavir
7c6c753c67
feat(django-apps): Init ernestophone website 2024-12-20 04:21:06 +01:00
4622da188c
fix(ds-fr): Make email work again 2024-12-18 09:51:28 +01:00
2855d62a43
chore(ds-fr): Disable var/lib backups for now
It is spitting out errors
2024-12-18 07:57:05 +01:00
f8df18f13c
fix(ds-fr): Update module 2024-12-18 00:42:12 +01:00
sinavir
324c37f884
fix(dns): Remove old pub.dgnum.eu 2024-12-17 22:21:52 +01:00
sinavir
9b71232c58
feat(garage): Deploy landing page 2024-12-17 22:14:40 +01:00
54f2057dfc chore(cas-eleves): Remove server alias as we have a permanent redirection in place 2024-12-17 20:06:13 +01:00
b8e75176e1
feat(hypervisors): Init 2024-12-17 17:41:33 +01:00
cab2bc381c
feat(vault01/networking): open vlan hypervisor 2024-12-17 12:09:03 +01:00
f6d2de3115
chore(patches): Drop patches from nixos-24.05 as only web02 and ap01 use it 2024-12-17 00:14:46 +01:00
200104bf84
chore(kanidm): Update origin uris, oauth2 endpoints and switch to 1.4 2024-12-17 00:11:05 +01:00
8c8093b778
feat(netbird): Use a kanidm-proof redirect uri 2024-12-16 22:37:51 +01:00
1b7b1c3a4f
chore(npins): Update cas-eleves 2024-12-16 22:37:31 +01:00
af1e11f01b
chore(git-hooks): Use a fixed nixfmt that does not depend on upstream 2024-12-16 16:40:39 +01:00
60a5aea5a8
chore(nextcloud): Update to v30 2024-12-16 16:21:37 +01:00
accf643294
chore(meta): Remove nodes.nix 2024-12-16 09:40:38 +01:00
09e55d4a80
chore(reuse): Add copyright and license information 2024-12-16 09:34:15 +01:00
fdb355bac7
feat(netconf/netcore02): ci build 2024-12-16 09:26:52 +01:00
3c9bf80f24
feat(netconf): use meta for access control 2024-12-16 09:26:52 +01:00
e8cdd06706
feat(netconf): toplevel rpc drv 2024-12-16 09:26:52 +01:00
9601caba4f
fix(netconf/dgn-hardware): missing parenthesis 2024-12-16 09:26:52 +01:00
sinavir
d63751578a
fix(HACK): not broken anymore 2024-12-16 09:26:52 +01:00
99ef0b76de
feat(netconf)!: wip! broken! netconf-eval 2024-12-16 09:26:52 +01:00
aa4cdf0fd4
fix(netconf): typo 2024-12-16 09:26:52 +01:00
318f6927c1
feat(lib): Init netconf-junos
The code is copied from netconf-module, `with lib;` have been replaced
by inherits
2024-12-16 09:26:52 +01:00
1980d3c34e
feat(modules/netconf): Add lbailly's dgn-interfaces module 2024-12-16 09:26:52 +01:00
9024590a34
fix(netconf/dgn-hardware): Some models are extension cards 2024-12-16 09:26:52 +01:00
fbfb22d777
feat(modules/netconf): Add hardware module 2024-12-16 09:26:52 +01:00
c5e3da3ac9
chore(meta): Split nodes into systems 2024-12-16 09:26:52 +01:00
a818917d77
chore(storage01): Disable vm for now 2024-12-16 00:19:57 +01:00
9a99c8a29e
chore(compute01): Update swap device 2024-12-16 00:12:28 +01:00
08d7dc46b3
fix(modules/dgn-network): Make it work on web02
This is the only node still on 24.05 as the cas server is f*cked
2024-12-15 23:33:14 +01:00
1c74c67de6
fix(compute01/librenms): Update patch and vendorHash 2024-12-15 23:33:14 +01:00
30da92618a
chore(compute01): Disable satosa for now 2024-12-15 23:08:42 +01:00
af66eb557f
fix(patches): Port necessary patches to nixos 24.11 2024-12-15 23:08:42 +01:00
12f19506fc
feat(compute01): Update nixos, but keep kanidm_1_3 2024-12-15 23:08:42 +01:00
659ddf39e5
fix(wordpress): Include the selected theme 2024-12-15 23:08:42 +01:00
7d99a0d334
chore(crabfit): Update 2024-12-15 23:08:42 +01:00
046ed0c005
chore(networking): Attributes have to me moved up 2024-12-15 23:08:42 +01:00
a2d397de70
feat(nodes): Update to nixos 24.11 2024-12-15 23:08:42 +01:00
a65e348f0e
feat(hive): Add tvix-store as a substituter 2024-12-15 22:15:56 +01:00
ecf5fefbaa fix(machines/storage01): scrape all exporter ports
There may be more than one port for a given node.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-15 20:47:04 +01:00
bb7f538110 fix(modules/nixos/dgn-node-monitoring): listen and fix the cgroup port
Otherwise, we cannot scrape that specific port.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-15 20:47:04 +01:00
a1f17d1850
feat(meta/options): Add the system type to the default tags 2024-12-15 12:49:13 +01:00
76419de740
fix(modules/django-apps): Add descriptions where missing 2024-12-13 16:38:36 +01:00
3872b17ff6
fix(modules/dgn-console): Udate description of psql options 2024-12-13 15:48:04 +01:00
f5147dec8d
feat(workflows/pre-commit): Check multiple stages 2024-12-13 12:50:25 +01:00
88d9b8c3e3
chore: Add license and copyright information
Signed-off-by: Tom Hubrecht <tom.hubrecht@dgnum.eu>
Acked-by: Ryan Lahfa <ryan.lahfa@dgnum.eu>
Acked-by: Maurice Debray <maurice.debray@dgnum.eu>
Acked-by: Lubin Bailly <lubin.bailly@dgnum.eu>
Acked-by: Jean-Marc Gailis <jean-marc.gailis@dgnum.eu> as the legal authority, at the time of writing, in DGNum.
Acked-by: Elias Coppens <elias.coppens@dgnum.eu> as a member, at the time of writing, of the DGNum executive counsel.
2024-12-13 12:41:38 +01:00
630b7c0ffc
chore(web01): Remove kahulm.nix 2024-12-12 14:03:32 +01:00
b2bebdc20d
chore(web01): Remove dolibarr.nix 2024-12-12 14:00:14 +01:00
a2ca441284
fix: remove lib.mdDoc references 2024-12-11 23:07:14 +01:00
fe19171d85 feat(nextcloud): Deploy collabora without docker 2024-12-11 14:46:32 +01:00
b23312dcaa feat(dgn-web): Add yearly logrotate for nginx 2024-12-11 14:40:29 +01:00
e0cf11276d feat(monitoring): support cgroup exporting of metrics
This needs an update in our node_exporter dashboard but nothing too
hard.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-11 11:08:07 +01:00
026acdecb7
fix(tvix-cache): Import an existing file 2024-12-10 11:14:10 +01:00
6d03c084a0
feat(hive): Add serverNodes to the arguments 2024-12-08 22:31:14 +01:00
25eee32a22 feat(scripts): introduce manual push script
This way, we can send some closures if some of our members build them on
more powerful machines.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 21:14:28 +01:00
f16d8ce68f fix(ap01): switch Liminix nodes to 24.05
There's a bug in 24.11 regarding GCC bootstrap for mipsel which makes it
impossible to use that NixOS version.

We will need to pin 24.05 and bisect until we find the root cause…

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 21:14:28 +01:00
ba62dcd6a6
fix(storage01): Make prometheus work again
By only looking at nixos nodes
2024-12-08 17:15:45 +01:00
65b188a7cd
fix(meta): Use correct optional 2024-12-08 17:15:45 +01:00
715201abc2
fix(rescue01): Filter nodes to only include real servers 2024-12-08 17:15:45 +01:00
a2295953da
fix(meta): Add required stuff for ap01 2024-12-08 17:15:45 +01:00
303f53af0f
chore: Apply the abstraction to ap01 2024-12-08 17:15:45 +01:00
e89ed2d0e7
feat(hive): ensure purity of cache-node.sh
Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:24:40 +01:00
e94d6fd16e
fix(hive): ensure we are in hermetic evaluation
We don't want any <nixpkgs> to appear out of nowhere.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:24:40 +01:00
6ca347ee51
Revert "chore(HACK): open a tmate session in the CI"
This reverts commit 5907ba80e1a608e1c2674e94bb4e5c98ac9dfc55.
2024-12-08 15:24:40 +01:00
4158d85efb
fix(npins): update liminix to fix graphviz incident
Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:24:40 +01:00
a12b180592
chore(HACK): open a tmate session in the CI
Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:24:40 +01:00
104d64f23f
feat(scripts/cache-node): support non-NixOS systems
Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:24:40 +01:00
cdd8b9cc12
feat(machines): add ap01 initial configuration
Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:24:40 +01:00
df6b48e2f3
feat(hive/registry): add Zyxel NWA50AX in the registry
Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:24:40 +01:00
d9a6d38d5e
feat(modules/dgn-access-control): support Liminix systems
Liminix are not totally aligned with their implementation of users.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:23:28 +01:00
a2a6bf8d1c
feat(npins/sources): switch to DGNum fork of Liminix
Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:23:28 +01:00
ec98e60c3d
feat(devshell): add SSO and serial access tools
Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-08 15:23:28 +01:00
750a2f90eb
feat(crabfit): Remove overzealous padding 2024-12-08 15:11:16 +01:00
0b27fef19f
fix(bridge01): Use correct node name 2024-12-08 13:46:29 +01:00
ecbad0a638
chore: Abstract machines and modules
This adds subdirectories for the different types of systems, for the
modules and the machines
2024-12-08 13:39:10 +01:00
c3f4e7ade6
fix(meta): Only define targetHost when the network config is defined 2024-12-08 12:49:46 +01:00
e1586b4873
fix(dns): Only generate infra records for nixos machines 2024-12-08 12:19:31 +01:00
4fa4d0bc21
feat(hive.nix): Refactor mkNixpkgsConfig 2024-12-08 12:10:50 +01:00
3a325437b8
chore(hive.nix): Simplify system management 2024-12-08 12:04:54 +01:00
3a58ac3fdc
fix(hive.nix): Remove inifinite recursion 2024-12-08 11:59:39 +01:00
eb5b8740a8
feat(meta): Remove default values for nixpkgs version
They are considered harmful, and it simplifies the code.
2024-12-08 11:52:26 +01:00
1821104e8e
feat(meta): Add system to the nodes meta 2024-12-08 11:40:01 +01:00
12c8870f6d
chore(meta): Sort nodes 2024-12-08 11:02:04 +01:00
4fabadccb4 feat(scripts/): use our own colmena
In the future, we should not have to do this.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-07 15:30:42 +01:00
344cc26d8e feat(meta/*): support generalized deployments
Our colmena knows how to deal with families of system types, e.g. NixOS
systems or Liminix-based systems.

This is a step 1 towards supporting our APs in our infrastructure.

Signed-off-by: Ryan Lahfa <ryan@dgnum.eu>
2024-12-07 15:26:13 +01:00
ae057f480f
feat(lib): Add warn 2024-12-07 13:12:20 +01:00
f909853119
feat(dns): Add autoritative DNS for lab subdomain 2024-12-07 11:05:45 +01:00
a60b546277
feat(vault01/gretap): gretap for hackaton 2024-12-07 10:52:37 +01:00
sinavir
09b5963449
fix(ds-fr): Lock patch with hash 2024-12-06 10:58:57 +01:00
sinavir
d4dab1e7ae
fix(ds-fr): Update dgn patch 2024-12-06 10:31:29 +01:00
sinavir
41caf293b0
chore(ds-fr): Remove unused files 2024-12-06 09:50:23 +01:00
2a7a3aba83
fix(npins): Update hash 2024-12-02 17:25:41 +01:00
96e8bfff5b
feat(django-apps): Internalize 2024-11-25 23:29:39 +01:00
sinavir
aa154d1b1b
fix(web03/dj-apps): Use secret tokens 2024-11-25 16:06:08 +01:00
sinavir
f37a7449cb
fix(netbox-agent): Disable as it is broken 2024-11-25 15:18:28 +01:00
030803ba29
chore(patches): Reorganize 2024-11-25 11:15:20 +01:00
13abd5400b
fix(web03/dj-wikiens): Update dependencies 2024-11-23 11:33:56 +01:00
f6c933f374
fix(kanidm): Use last usable version: 1.3.3 2024-11-22 23:12:18 +01:00
c9839d4be6 chore(npins): Update 2024-11-22 15:27:34 +00:00
fe52f0ebe2
feat(forgejo-runners): Use /data/slow/nix and not /data/slow/nix/nix
The upstream module should be updated to reflect that, use rootPath
instead of storePath
2024-11-22 14:04:35 +01:00
1f9f56ac91
chore(lix): Use the global patch infrastructure for lix 2024-11-22 12:56:39 +01:00
75b621e298
fix(ds-fr): Switch to nix-pkgs 2024-11-21 15:13:25 +01:00
sinavir
32f68a54a9
chore(workflows): regenerate 2024-11-19 00:53:33 +01:00
sinavir
b00e47ec85
chore(netbox): Upgrade 2024-11-19 00:40:15 +01:00
a50637d55e
chore(stirling-pdf): New version 2024-11-19 00:13:49 +01:00
aa4f972085
fix(forgejo-runners): Let the shell handle colmena 2024-11-19 00:01:06 +01:00
8a5de73b47 chore(npins): Update 2024-11-18 15:29:55 +00:00
3fecacb482
chore(npins): Update nix-modules 2024-11-18 13:03:13 +01:00
ded867d274
feat(dj-interludes): Add a real secret 2024-11-18 13:02:54 +01:00
f61bd85d63
chore(forgejo): Disallow more domains 2024-11-17 19:01:26 +01:00
bf06d2573b
feat(nix): Use passthru for shells and return to importing the scripts 2024-11-14 22:18:40 +01:00
6fbda40e5e
feat(scripts): Unify behaviour and improve generation 2024-11-14 22:01:58 +01:00
2ffd7732ba
feat(django-apps/interludes): Allow base webapps domain 2024-11-12 15:08:17 +01:00
d45b044b22
feat(django-apps/interludes): Switch to interludes.ens.fr 2024-11-12 14:55:04 +01:00
21b422b1ad
fix(nix-lib): Allow defining top-level imports 2024-11-12 12:29:36 +01:00
420fe99984
fix(django-apps/interludes): Don't run in debug mode 2024-11-12 10:52:49 +01:00
32f13adaad
feat(web03): Deploy interludes.webapps.dgnum.eu 2024-11-12 10:40:09 +01:00
a816c81125
chore: Update nix-actions 2024-11-11 22:05:16 +01:00
6ab3e4b685
fix(workflows): Correct typos 2024-11-11 18:01:44 +01:00
5f1436e4bf
feat(workflows): Switch to a nix-based definition of workflows 2024-11-11 17:57:23 +01:00
sinavir
d8f90dd940
fix(patches): Label nextcloud patch 2024-11-11 00:57:49 +01:00
89b22a34da
feat(forgejo): Add blocklist for registering e-mails 2024-11-10 16:24:51 +01:00
32d28ed351
feat(organization): Added Antoine Groudiev and Matthieu Boyer to organization 2024-11-09 22:55:24 +01:00
46657a7f74
fix(tvix-cache): Turn down the log vomit, and increase the limit of file handles 2024-11-09 19:11:10 +01:00
0a40fbbda0
Revert "chore(npins): Update"
This reverts commit 045554b2e6.
2024-11-09 18:43:56 +01:00
045554b2e6 chore(npins): Update 2024-11-09 15:29:23 +00:00
sinavir
2cee8006d3
feat(access-control): Remove luj from admins 2024-11-08 00:18:14 +01:00
sinavir
9e5be2a279
fix(web01): www.lanuit.ens.fr redirection is not used anymore 2024-11-04 20:07:33 +01:00
0576d1ecf8
fix(web03): Use a different domain for webhooks endpoint 2024-10-31 10:58:07 +01:00
06bbe99769
feat(meta/dns): Add private subdomain linking to the netbird ips 2024-10-31 10:58:07 +01:00
sinavir
45f2f59055 feat(keys): Add a key for mdebray 2024-10-30 23:21:36 +01:00
0e3463102c
feat(metis): Update and validate providers 2024-10-24 00:27:15 +02:00
d2f039755b
chore(metis): Update 2024-10-23 23:40:21 +02:00
a6aac2b0b4
feat(web03): Deploy www-bocal on bocal.webapps.dgnum.eu 2024-10-23 13:56:47 +02:00
ae7aaabf29
feat(meta/network): Add web03 netbirdIp 2024-10-23 11:04:28 +02:00
7ab63fb4a5
fix(netbox-agent): Use the latest version, which returns the correct value to the shell 2024-10-23 10:05:25 +02:00
2bb03126cf
feat(web03): Deploy django-wiki on wiki.webapps.dgnum.eu 2024-10-22 14:19:58 +02:00
2b858bbae4
feat(web03): Switch to nixos-unstable 2024-10-22 14:09:54 +02:00
4f18e8d387
feat(meta/dns): Add apps-webhook domain, to separate from the apps 2024-10-22 13:55:30 +02:00
4a102117a4
feat(storage01): Init victoria-metrics DB 2024-10-22 13:07:07 +02:00
969f59fbc4
feat(web03): Deploy the new annuaire 2024-10-21 20:03:20 +02:00
972b9554b7 feat(netbox-agent): Internalize 2024-10-21 19:38:11 +02:00
sinavir
e993d6de34 fix(stateless-uptime-kuma): Typo in domain name 2024-10-21 12:25:18 +02:00
sinavir
e0eb7bbf7c fix(stateless-uptime-kuma): Correct probes for ollama and s3-api 2024-10-21 12:16:00 +02:00
7875007a4f
feat(meta/dns): Add victoria-metrics 2024-10-21 11:15:31 +02:00
b5fc554f0f
fix(patches): Update commit for netbox-qrcode 2024-10-21 09:41:01 +02:00
a93a64d747
feat(forgejo): Send email to admins when new users appear 2024-10-21 09:33:40 +02:00
51133e6e5f
feat(netbird): Update 2024-10-20 23:01:14 +02:00
5f0c7d4e22
feat(meta/nodes): Sort nodes 2024-10-20 22:35:35 +02:00
39abf0b62d chore(npins): Update 2024-10-20 13:29:01 +00:00
63c9f02b16
fix(meta): Use correct username
(Sorry @jemagius)
2024-10-18 18:46:33 +02:00
f0b3d4b490
feat(kanidm): Use kanidm-provision to setup active members 2024-10-18 14:36:38 +02:00
sinavir
e7edf29e11 fix(ollama-proxy): Use ip instead of vpn domain name
VPN dns is slow to start so nginx will fail
2024-10-18 12:45:27 +02:00
sinavir
c0435e694d fix(modules/dgn-records): Add enable option 2024-10-18 11:53:32 +02:00
sinavir
1a05ea3a9a feat(krz01): Move to lab-infra repo 2024-10-18 11:53:32 +02:00
113c83bb9c
feat: laptop change and smartphone add to authorized MACs 2024-10-18 11:12:14 +02:00
ac0aaa9228
fix(npins): Update nix-pkgs 2024-10-18 11:10:47 +02:00
16dfdf1032
feat(patches): Add kanidm provisioning 2024-10-17 23:03:37 +02:00
05edf3f295
feat(meta/dns): Update web02 2024-10-17 23:03:37 +02:00
sinavir
3c445ab4c7 feat(networking): Add a bridge to connect VMs to the world 2024-10-17 17:56:09 +02:00
sinavir
492fe550d9 chore(krz01): Put all ollama/whisper stuff in separate modules 2024-10-17 15:47:10 +02:00
sinavir
a02da5f496 chore(proxmox-nixos): Update 2024-10-17 15:34:11 +02:00
b850ee56c2
chore(nixpkgs): Drop nixos-23.11 2024-10-17 15:11:43 +02:00
db5859e472
feat(web03): Initial deployment of django-apps 2024-10-17 15:11:43 +02:00
fd6b9678ef
chore(netbox-agent): Rekey 2024-10-17 15:06:26 +02:00
f771ec72c8
fix(secrets): Rekey Arkheon and email secrets 2024-10-16 11:45:50 +02:00
9931c622b6
feat(workflows/eval): Add web03 to the list 2024-10-16 11:28:30 +02:00
ad8ddb1f4d
feat(dns): Redirect webapps subdomain to web03 2024-10-16 11:24:10 +02:00
14866df004
fix(dgn-web): Set a default for simpleProxies 2024-10-16 11:08:24 +02:00
b6cbf6e918
feat(infra): Deploy web03 2024-10-16 11:08:24 +02:00
4b2d1cde5b
chore(dgsi): Update 2024-10-12 22:25:53 +02:00
06653220bb
fix(kanidm): Revert switch to simpleProxies
As we proxy to an https endpoint, this was not supported
2024-10-12 22:11:34 +02:00
9ea51137fc
chore(dgsi): Update 2024-10-12 22:06:26 +02:00
2f06f22ac7 feat(nginx): Switch to simpleProxies for the majority of configs 2024-10-12 20:00:54 +02:00
af61ae6e61 feat(dgn-web): Add simpleProxies
This proxies the required host to localhost:$port and enables SSL
2024-10-12 20:00:54 +02:00
9ea6bada0a feat(dgn-web): Add a way to detect internal port clashes 2024-10-12 20:00:54 +02:00
f819acf9bc
feat(forgejo): 7 days sessions 2024-10-12 19:52:21 +02:00
8043f8d4ab
chore(metis): Update 2024-10-12 17:29:51 +02:00
bb4a24f9e9 feat: add cst1's member info 2024-10-11 14:53:13 +02:00
cafaa15ef3 fix(rights): add cst1 to lab adminGroup 2024-10-11 14:53:13 +02:00
54e2eeb6f3 feat(ssh): Add cst1's SSH key 2024-10-11 14:53:13 +02:00
aa3d83ca06
fix(scripts): Don't try to upload to the cache if no password is present 2024-10-11 14:53:00 +02:00
e37f56f85b
fix(dns): cachix.dgnum.eu is no longer in service 2024-10-11 01:45:41 +02:00
666 changed files with 40041 additions and 24657 deletions

Binary file not shown.

View file

@ -1,6 +0,0 @@
let
keys = import ../keys;
in
{
"admin-environment.age".publicKeys = keys.rootKeys;
}

1
.envrc
View file

@ -1 +1,2 @@
watch_file workflows/*
use nix

View file

@ -1,25 +1,23 @@
###
# This file was automatically generated with nix-actions.
jobs:
check_dns:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- name: Check the validity of the DNS configuration
run: nix-build meta/verify.nix -A dns
check_meta:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- name: Check the validity of meta options
run: nix-build meta/verify.nix -A meta
name: Check meta
on:
pull_request:
branches:
- main
- main
push:
paths:
- 'meta/*'
jobs:
check_meta:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Check the validity of meta options
run: nix-build meta/verify.nix -A meta
check_dns:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Check the validity of the DNS configuration
run: nix-build meta/verify.nix -A dns --no-out-link
- meta/*

18
.forgejo/workflows/check-workflows.yaml generated Normal file
View file

@ -0,0 +1,18 @@
###
# This file was automatically generated with nix-actions.
jobs:
check_workflows:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- name: Check that the workflows are up to date
run: "nix-shell -A check-workflows --run 'set -o pipefail\nset -o nounset\n
set -o errexit\n[ $(git status --porcelain | wc -l) -eq 0 ]'"
name: Check workflows
on:
pull_request:
branches:
- main
push:
paths:
- workflows/*

View file

@ -1,56 +0,0 @@
name: ds-fr update
on:
schedule:
- cron: "26 18 * * wed"
jobs:
npins_update:
runs-on: nix
steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.TEA_DGNUM_CHORES_TOKEN }}
- name: Update DS and open PR if necessary
run: |
# Fetch the latest release tag
VERSION=$(curl -L \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/demarches-simplifiees/demarches-simplifiees.fr/releases/latest \
| jq -r '.tag_name')
# Move to the ds-fr directory
cd machines/compute01/ds-fr/package
# Run the update script
./update.sh -v "$VERSION"
if [ ! -z "$(git diff --name-only)" ]; then
echo "[+] Changes detected, pushing updates."
git switch -C ds-update
git add .
git config user.name "DGNum Chores"
git config user.email "tech@dgnum.eu"
git commit --message "chore(ds-fr): Update"
git push --set-upstream origin ds-update --force
# Connect to the server with the cli
tea login add \
-n dgnum-chores \
-t '${{ secrets.TEA_DGNUM_CHORES_TOKEN }}' \
-u https://git.dgnum.eu
# Create a pull request if needed
# i.e. no PR with the same title exists
if [ -z "$(tea pr ls -f='title,author' -o simple | grep 'chore(ds-fr): Update dgnum-chores')" ]; then
tea pr create \
--description "Automatic ds-fr update" \
--title "chore(ds-fr): Update" \
--head ds-update
fi
fi

511
.forgejo/workflows/eval-nodes.yaml generated Normal file
View file

@ -0,0 +1,511 @@
###
# This file was automatically generated with nix-actions.
jobs:
Jaccess01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: Jaccess01
NIX_SHOW_STATS: 1
name: Eval Jaccess01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build Jaccess01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache Jaccess01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
Jaccess04:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: Jaccess04
NIX_SHOW_STATS: 1
name: Eval Jaccess04
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build Jaccess04
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache Jaccess04
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
ap01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: ap01
NIX_SHOW_STATS: 1
name: Eval ap01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build ap01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache ap01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
bridge01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: bridge01
NIX_SHOW_STATS: 1
name: Eval bridge01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build bridge01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache bridge01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
build01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: build01
NIX_SHOW_STATS: 1
name: Eval build01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build build01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache build01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
cof02:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: cof02
NIX_SHOW_STATS: 1
name: Eval cof02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build cof02
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache cof02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
compute01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: compute01
NIX_SHOW_STATS: 1
name: Eval compute01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build compute01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache compute01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
geo01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: geo01
NIX_SHOW_STATS: 1
name: Eval geo01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build geo01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache geo01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
geo02:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: geo02
NIX_SHOW_STATS: 1
name: Eval geo02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build geo02
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache geo02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
hypervisor01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: hypervisor01
NIX_SHOW_STATS: 1
name: Eval hypervisor01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build hypervisor01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache hypervisor01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
hypervisor02:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: hypervisor02
NIX_SHOW_STATS: 1
name: Eval hypervisor02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build hypervisor02
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache hypervisor02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
hypervisor03:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: hypervisor03
NIX_SHOW_STATS: 1
name: Eval hypervisor03
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build hypervisor03
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache hypervisor03
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
iso:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: iso
NIX_SHOW_STATS: 1
name: Eval iso
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build iso
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache iso
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
krz01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: krz01
NIX_SHOW_STATS: 1
name: Eval krz01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build krz01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache krz01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
lab-router01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: lab-router01
NIX_SHOW_STATS: 1
name: Eval lab-router01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build lab-router01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache lab-router01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
netcore01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: netcore01
NIX_SHOW_STATS: 1
name: Eval netcore01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build netcore01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache netcore01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
netcore02:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: netcore02
NIX_SHOW_STATS: 1
name: Eval netcore02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build netcore02
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache netcore02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
rescue01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: rescue01
NIX_SHOW_STATS: 1
name: Eval rescue01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build rescue01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache rescue01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
storage01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: storage01
NIX_SHOW_STATS: 1
name: Eval storage01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build storage01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache storage01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
tower01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: tower01
NIX_SHOW_STATS: 1
name: Eval tower01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build tower01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache tower01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
vault01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: vault01
NIX_SHOW_STATS: 1
name: Eval vault01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build vault01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache vault01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
web01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: web01
NIX_SHOW_STATS: 1
name: Eval web01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build web01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache web01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
web02:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: web02
NIX_SHOW_STATS: 1
name: Eval web02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build web02
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache web02
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
web03:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: web03
NIX_SHOW_STATS: 1
name: Eval web03
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build web03
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache web03
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
zulip01:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
BUILD_NODE: zulip01
NIX_SHOW_STATS: 1
name: Eval zulip01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nDRV=$(instantiate-node)\necho \"DRV=$DRV\" >> $GITHUB_ENV\n'"
- name: Build zulip01
run: "STORE_PATH=\"$(nix-store --realise \"$DRV\")\"\necho \"STORE_PATH=$STORE_PATH\"\
\ >> $GITHUB_ENV\n"
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Cache zulip01
run: "nix-shell -A eval-nodes --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npush-to-cache \"$STORE_PATH\"\n'"
name: Build all the nodes
on:
pull_request:
branches:
- main
push:
branches:
- main

22
.forgejo/workflows/eval-shell.yaml generated Normal file
View file

@ -0,0 +1,22 @@
###
# This file was automatically generated with nix-actions.
jobs:
build-shell:
runs-on: nix-infra
steps:
- uses: actions/checkout@v3
- env:
STORE_ENDPOINT: https://snix-store.dgnum.eu/infra.signing/
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
STORE_USER: admin
name: Build and cache shell
run: "nix-shell -A eval-shell --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nnix-build-and-cache -A devShell'"
name: Build the shell
on:
pull_request:
branches:
- main
push:
branches:
- main

View file

@ -1,200 +0,0 @@
name: build configuration
on:
pull_request:
types: [opened, synchronize, edited, reopened]
branches:
- main
push:
branches:
- main
jobs:
build_and_cache_krz01:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "krz01"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_krz01
path: paths.txt
build_and_cache_compute01:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "compute01"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_compute01
path: paths.txt
build_and_cache_storage01:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "storage01"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_storage01
path: paths.txt
build_and_cache_rescue01:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "rescue01"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_rescue01
path: paths.txt
build_and_cache_geo01:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "geo01"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_geo01
path: paths.txt
build_and_cache_geo02:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "geo02"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_geo02
path: paths.txt
build_and_cache_vault01:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "vault01"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_vault01
path: paths.txt
build_and_cache_web01:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "web01"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_web01
path: paths.txt
build_and_cache_web02:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "web02"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_web02
path: paths.txt
build_and_cache_bridge01:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Build and cache the node
run: nix-shell --run cache-node
env:
STORE_ENDPOINT: "https://tvix-store.dgnum.eu/infra-signing/"
STORE_USER: "admin"
STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
BUILD_NODE: "bridge01"
- uses: actions/upload-artifact@v3
if: always()
with:
name: outputs_web02
path: paths.txt

View file

@ -1,11 +0,0 @@
name: lint
on: [push, pull_request]
jobs:
check:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Run pre-commit on all files
run: nix-shell --run 'pre-commit run --all-files --hook-stage pre-push --show-diff-on-failure' -A shells.pre-commit ./.

21
.forgejo/workflows/lon-update.yaml generated Normal file
View file

@ -0,0 +1,21 @@
###
# This file was automatically generated with nix-actions.
jobs:
update:
runs-on: nix
steps:
- uses: actions/checkout@v4
with:
token: ${{ secrets.TEA_DGNUM_CHORES_TOKEN }}
- env:
LON_LABELS: bot
LON_LIST_COMMITS: true
LON_TOKEN: ${{ secrets.TEA_DGNUM_CHORES_TOKEN }}
LON_USER_EMAIL: admins+lon-bot@dgnum.eu
LON_USER_NAME: DGNum [bot]
run: "nix-shell -A lon-update --run 'set -o pipefail\nset -o nounset\nset -o
errexit\nlon bot forgejo'"
name: Update dependencies
on:
schedule:
- cron: 0 6 * * 3

View file

@ -1,58 +0,0 @@
name: npins update
on:
schedule:
# Run at 11 o'clock every wednesday
- cron: "25 15 * * *"
jobs:
npins_update:
runs-on: nix
steps:
# - name: Install applications
# run: apt-get update && apt-get install sudo
#
- uses: actions/checkout@v3
with:
depth: 0
token: ${{ secrets.TEA_DGNUM_CHORES_TOKEN }}
#
# - uses: https://github.com/cachix/install-nix-action@v22
# with:
# nix_path: nixpkgs=channel:nixos-unstable
# - name: Install tea
# run: |
# nix-env -f '<nixpkgs>' -i tea
- name: Update dependencies and open PR if necessary
run: |
npins update
if [ ! -z "$(git diff --name-only)" ]; then
echo "[+] Changes detected, pushing updates."
git switch -C npins-update
git add npins
git config user.name "DGNum Chores"
git config user.email "tech@dgnum.eu"
git commit --message "chore(npins): Update"
git push --set-upstream origin npins-update --force
# Connect to the server with the cli
tea login add \
-n dgnum-chores \
-t '${{ secrets.TEA_DGNUM_CHORES_TOKEN }}' \
-u https://git.dgnum.eu
# Create a pull request if needed
# i.e. no PR with the same title exists
if [ -z "$(tea pr ls -f='title,author' -o simple | grep 'chore(npins): Update dgnum-chores')" ]; then
tea pr create \
--description "Automatic npins update" \
--title "chore(npins): Update" \
--head npins-update
fi
fi

17
.forgejo/workflows/pre-commit.yaml generated Normal file
View file

@ -0,0 +1,17 @@
###
# This file was automatically generated with nix-actions.
jobs:
pre-commit:
runs-on: nix
steps:
- uses: actions/checkout@v3
- name: Check stage pre-commit
run: "nix-shell -A pre-commit --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npre-commit run --all-files --hook-stage pre-commit --show-diff-on-failure'"
- name: Check stage pre-push
run: "nix-shell -A pre-commit --run 'set -o pipefail\nset -o nounset\nset -o
errexit\npre-commit run --all-files --hook-stage pre-push --show-diff-on-failure'"
name: Run pre-commit on all files
on:
- push
- pull_request

10
.gitattributes vendored Normal file
View file

@ -0,0 +1,10 @@
# SPDX-FileCopyrightText: 2025 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
/.forgejo/workflows/*.yaml linguist-generated
/LICENSES/* linguist-vendored
/REUSE.toml linguist-generated
lon.lock linguist-generated
/LICENSES/LicenseRef-Reserved.txt !linguist-vendored
/machines/nixos/vault01/monitoring/mibs/* linguist-vendored

6
.gitignore vendored
View file

@ -9,9 +9,3 @@ result-*
*.qcow2
.gcroots
.pre-commit-config.yaml
# Ignore Terraform configuration file
config.tf.json
# Ignore Terraform stuff
.terraform

38
.terraform.lock.hcl generated
View file

@ -1,38 +0,0 @@
# This file is maintained automatically by "tofu init".
# Manual edits may be lost in future updates.
provider "registry.opentofu.org/numtide/secret" {
version = "1.2.1"
constraints = "~> 1.2.1"
hashes = [
"h1:t2z3CjxVsXjKb3g59WGkLtvDIR4NzLU7UFEcyAgF2C0=",
"zh:17cbc7f3b90ee2b3ae5adfc3bd9cb70166a5ffbd8e642e64afa7cb0e32a34bae",
"zh:5d66ce2aea25fc3c12cec6fc569b8ff314df6d773b9c3449983a4e9cde8347c7",
"zh:67d02e96bf0d07f2fcf16ce9427a7a26f53e695676405d0c2b815808f950411d",
"zh:77c3c05681ce199e6b0e2e5a2dfe418f61ae8863d527e7a7d47a9699d912683b",
"zh:7f37e633b4f94ba9f347cfe68d44f80fe066188feb954b13ee0f621caae4121d",
"zh:ea16bbe494c6ddd0af7bbea9554474c387517db4e7f0d15513bb29ff893871bc",
]
}
provider "registry.opentofu.org/raitobezarius/garage" {
version = "1.0.3"
constraints = "~> 1.0.3"
hashes = [
"h1:QKbZcU7u9OG1t/h4S3+pXS3sOUfVMmfLTiYh5L5j1rE=",
"zh:04f220a2baf4bd1bae07888a1c311cacd6076c209de83adbe573525fc50f2ea4",
"zh:078938d5fa07e024d779c664823427af28935bbeb77e0ff940bac3e7bc41f1e8",
"zh:2dd58a2d82094a1b07ff1b6de57e4a0d96e1f20abecd4f70a6469079b46b76d9",
"zh:325da7a74b1c84f934b38134d7c419253292aeed6f6836a2fb37f42d13a8ff67",
"zh:3ca9230ef87e70691b24fd83d40bb5b6a08f0b91ab26cbb2e692f92155b6d179",
"zh:45ef683a18a5053c93c691d08f3903fd4918467dfa056b1c274207de8a6aeb74",
"zh:4c9ee6c34b07c209c5daf1e9ff182f828667e54a90a683bc11cdcea86e4f8ef7",
"zh:5f0bb6524b2fffa606e0e3585af93dfc31b611c7abf55e4371ae5fc36e85972c",
"zh:7a3495dc211164c7d4042769c20d7111c767d0fd5908742e0766281c70d7d184",
"zh:7ce79867cdd4b1f7028da811cd5cb271a46820c79c0328a1221dd3bb6215c631",
"zh:93278861ee6bcb64e23bd1268f79b02035fba4fca0a98607a98f46abf8dfdf83",
"zh:937e681beea8b0dd899557f2a194c8128bd8810417ff04954bc9958ff826e980",
"zh:cae6e1598dd32f23f3900c41e50a6ece7d9456dbd033d855bb238ac21539d67b",
"zh:f6f7556ba7d5578604290170a709e00140be6d7f8a510a20bce49a9a23d75e5f",
]
}

View file

@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2024 Maurice Debray <maurice.debray@dgnum.eu>
SPDX-License-Identifier: EUPL-1.2
-->
# Contribuer
Quelques éléments à savoir:

547
LICENSE
View file

@ -1,547 +0,0 @@
CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL
Version 2.1 du 2013-06-21
Avertissement
Ce contrat est une licence de logiciel libre issue d'une concertation
entre ses auteurs afin que le respect de deux grands principes préside à
sa rédaction:
* d'une part, le respect des principes de diffusion des logiciels
libres: accès au code source, droits étendus conférés aux utilisateurs,
* d'autre part, la désignation d'un droit applicable, le droit
français, auquel elle est conforme, tant au regard du droit de la
responsabilité civile que du droit de la propriété intellectuelle et
de la protection qu'il offre aux auteurs et titulaires des droits
patrimoniaux sur un logiciel.
Les auteurs de la licence CeCILL (Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre])
sont:
Commissariat à l'énergie atomique et aux énergies alternatives - CEA,
établissement public de recherche à caractère scientifique, technique et
industriel, dont le siège est situé 25 rue Leblanc, immeuble Le Ponant
D, 75015 Paris.
Centre National de la Recherche Scientifique - CNRS, établissement
public à caractère scientifique et technologique, dont le siège est
situé 3 rue Michel-Ange, 75794 Paris cedex 16.
Institut National de Recherche en Informatique et en Automatique -
Inria, établissement public à caractère scientifique et technologique,
dont le siège est situé Domaine de Voluceau, Rocquencourt, BP 105, 78153
Le Chesnay cedex.
Préambule
Ce contrat est une licence de logiciel libre dont l'objectif est de
conférer aux utilisateurs la liberté de modification et de
redistribution du logiciel régi par cette licence dans le cadre d'un
modèle de diffusion en logiciel libre.
L'exercice de ces libertés est assorti de certains devoirs à la charge
des utilisateurs afin de préserver ce statut au cours des
redistributions ultérieures.
L'accessibilité au code source et les droits de copie, de modification
et de redistribution qui en découlent ont pour contrepartie de n'offrir
aux utilisateurs qu'une garantie limitée et de ne faire peser sur
l'auteur du logiciel, le titulaire des droits patrimoniaux et les
concédants successifs qu'une responsabilité restreinte.
A cet égard l'attention de l'utilisateur est attirée sur les risques
associés au chargement, à l'utilisation, à la modification et/ou au
développement et à la reproduction du logiciel par l'utilisateur étant
donné sa spécificité de logiciel libre, qui peut le rendre complexe à
manipuler et qui le réserve donc à des développeurs ou des
professionnels avertis possédant des connaissances informatiques
approfondies. Les utilisateurs sont donc invités à charger et tester
l'adéquation du logiciel à leurs besoins dans des conditions permettant
d'assurer la sécurité de leurs systèmes et/ou de leurs données et, plus
généralement, à l'utiliser et l'exploiter dans les mêmes conditions de
sécurité. Ce contrat peut être reproduit et diffusé librement, sous
réserve de le conserver en l'état, sans ajout ni suppression de clauses.
Ce contrat est susceptible de s'appliquer à tout logiciel dont le
titulaire des droits patrimoniaux décide de soumettre l'exploitation aux
dispositions qu'il contient.
Une liste de questions fréquemment posées se trouve sur le site web
officiel de la famille des licences CeCILL
(http://www.cecill.info/index.fr.html) pour toute clarification qui
serait nécessaire.
Article 1 - DEFINITIONS
Dans ce contrat, les termes suivants, lorsqu'ils seront écrits avec une
lettre capitale, auront la signification suivante:
Contrat: désigne le présent contrat de licence, ses éventuelles versions
postérieures et annexes.
Logiciel: désigne le logiciel sous sa forme de Code Objet et/ou de Code
Source et le cas échéant sa documentation, dans leur état au moment de
l'acceptation du Contrat par le Licencié.
Logiciel Initial: désigne le Logiciel sous sa forme de Code Source et
éventuellement de Code Objet et le cas échéant sa documentation, dans
leur état au moment de leur première diffusion sous les termes du Contrat.
Logiciel Modifié: désigne le Logiciel modifié par au moins une
Contribution.
Code Source: désigne l'ensemble des instructions et des lignes de
programme du Logiciel et auquel l'accès est nécessaire en vue de
modifier le Logiciel.
Code Objet: désigne les fichiers binaires issus de la compilation du
Code Source.
Titulaire: désigne le ou les détenteurs des droits patrimoniaux d'auteur
sur le Logiciel Initial.
Licencié: désigne le ou les utilisateurs du Logiciel ayant accepté le
Contrat.
Contributeur: désigne le Licencié auteur d'au moins une Contribution.
Concédant: désigne le Titulaire ou toute personne physique ou morale
distribuant le Logiciel sous le Contrat.
Contribution: désigne l'ensemble des modifications, corrections,
traductions, adaptations et/ou nouvelles fonctionnalités intégrées dans
le Logiciel par tout Contributeur, ainsi que tout Module Interne.
Module: désigne un ensemble de fichiers sources y compris leur
documentation qui permet de réaliser des fonctionnalités ou services
supplémentaires à ceux fournis par le Logiciel.
Module Externe: désigne tout Module, non dérivé du Logiciel, tel que ce
Module et le Logiciel s'exécutent dans des espaces d'adressage
différents, l'un appelant l'autre au moment de leur exécution.
Module Interne: désigne tout Module lié au Logiciel de telle sorte
qu'ils s'exécutent dans le même espace d'adressage.
GNU GPL: désigne la GNU General Public License dans sa version 2 ou
toute version ultérieure, telle que publiée par Free Software Foundation
Inc.
GNU Affero GPL: désigne la GNU Affero General Public License dans sa
version 3 ou toute version ultérieure, telle que publiée par Free
Software Foundation Inc.
EUPL: désigne la Licence Publique de l'Union européenne dans sa version
1.1 ou toute version ultérieure, telle que publiée par la Commission
Européenne.
Parties: désigne collectivement le Licencié et le Concédant.
Ces termes s'entendent au singulier comme au pluriel.
Article 2 - OBJET
Le Contrat a pour objet la concession par le Concédant au Licencié d'une
licence non exclusive, cessible et mondiale du Logiciel telle que
définie ci-après à l'article 5 <#etendue> pour toute la durée de
protection des droits portant sur ce Logiciel.
Article 3 - ACCEPTATION
3.1 L'acceptation par le Licencié des termes du Contrat est réputée
acquise du fait du premier des faits suivants:
* (i) le chargement du Logiciel par tout moyen notamment par
téléchargement à partir d'un serveur distant ou par chargement à
partir d'un support physique;
* (ii) le premier exercice par le Licencié de l'un quelconque des
droits concédés par le Contrat.
3.2 Un exemplaire du Contrat, contenant notamment un avertissement
relatif aux spécificités du Logiciel, à la restriction de garantie et à
la limitation à un usage par des utilisateurs expérimentés a été mis à
disposition du Licencié préalablement à son acceptation telle que
définie à l'article 3.1 <#acceptation-acquise> ci dessus et le Licencié
reconnaît en avoir pris connaissance.
Article 4 - ENTREE EN VIGUEUR ET DUREE
4.1 ENTREE EN VIGUEUR
Le Contrat entre en vigueur à la date de son acceptation par le Licencié
telle que définie en 3.1 <#acceptation-acquise>.
4.2 DUREE
Le Contrat produira ses effets pendant toute la durée légale de
protection des droits patrimoniaux portant sur le Logiciel.
Article 5 - ETENDUE DES DROITS CONCEDES
Le Concédant concède au Licencié, qui accepte, les droits suivants sur
le Logiciel pour toutes destinations et pour la durée du Contrat dans
les conditions ci-après détaillées.
Par ailleurs, si le Concédant détient ou venait à détenir un ou
plusieurs brevets d'invention protégeant tout ou partie des
fonctionnalités du Logiciel ou de ses composants, il s'engage à ne pas
opposer les éventuels droits conférés par ces brevets aux Licenciés
successifs qui utiliseraient, exploiteraient ou modifieraient le
Logiciel. En cas de cession de ces brevets, le Concédant s'engage à
faire reprendre les obligations du présent alinéa aux cessionnaires.
5.1 DROIT D'UTILISATION
Le Licencié est autorisé à utiliser le Logiciel, sans restriction quant
aux domaines d'application, étant ci-après précisé que cela comporte:
1.
la reproduction permanente ou provisoire du Logiciel en tout ou
partie par tout moyen et sous toute forme.
2.
le chargement, l'affichage, l'exécution, ou le stockage du Logiciel
sur tout support.
3.
la possibilité d'en observer, d'en étudier, ou d'en tester le
fonctionnement afin de déterminer les idées et principes qui sont à
la base de n'importe quel élément de ce Logiciel; et ceci, lorsque
le Licencié effectue toute opération de chargement, d'affichage,
d'exécution, de transmission ou de stockage du Logiciel qu'il est en
droit d'effectuer en vertu du Contrat.
5.2 DROIT D'APPORTER DES CONTRIBUTIONS
Le droit d'apporter des Contributions comporte le droit de traduire,
d'adapter, d'arranger ou d'apporter toute autre modification au Logiciel
et le droit de reproduire le logiciel en résultant.
Le Licencié est autorisé à apporter toute Contribution au Logiciel sous
réserve de mentionner, de façon explicite, son nom en tant qu'auteur de
cette Contribution et la date de création de celle-ci.
5.3 DROIT DE DISTRIBUTION
Le droit de distribution comporte notamment le droit de diffuser, de
transmettre et de communiquer le Logiciel au public sur tout support et
par tout moyen ainsi que le droit de mettre sur le marché à titre
onéreux ou gratuit, un ou des exemplaires du Logiciel par tout procédé.
Le Licencié est autorisé à distribuer des copies du Logiciel, modifié ou
non, à des tiers dans les conditions ci-après détaillées.
5.3.1 DISTRIBUTION DU LOGICIEL SANS MODIFICATION
Le Licencié est autorisé à distribuer des copies conformes du Logiciel,
sous forme de Code Source ou de Code Objet, à condition que cette
distribution respecte les dispositions du Contrat dans leur totalité et
soit accompagnée:
1.
d'un exemplaire du Contrat,
2.
d'un avertissement relatif à la restriction de garantie et de
responsabilité du Concédant telle que prévue aux articles 8
<#responsabilite> et 9 <#garantie>,
et que, dans le cas où seul le Code Objet du Logiciel est redistribué,
le Licencié permette un accès effectif au Code Source complet du
Logiciel pour une durée d'au moins 3 ans à compter de la distribution du
logiciel, étant entendu que le coût additionnel d'acquisition du Code
Source ne devra pas excéder le simple coût de transfert des données.
5.3.2 DISTRIBUTION DU LOGICIEL MODIFIE
Lorsque le Licencié apporte une Contribution au Logiciel, les conditions
de distribution du Logiciel Modifié en résultant sont alors soumises à
l'intégralité des dispositions du Contrat.
Le Licencié est autorisé à distribuer le Logiciel Modifié, sous forme de
code source ou de code objet, à condition que cette distribution
respecte les dispositions du Contrat dans leur totalité et soit
accompagnée:
1.
d'un exemplaire du Contrat,
2.
d'un avertissement relatif à la restriction de garantie et de
responsabilité du Concédant telle que prévue aux articles 8
<#responsabilite> et 9 <#garantie>,
et, dans le cas où seul le code objet du Logiciel Modifié est redistribué,
3.
d'une note précisant les conditions d'accès effectif au code source
complet du Logiciel Modifié, pendant une période d'au moins 3 ans à
compter de la distribution du Logiciel Modifié, étant entendu que le
coût additionnel d'acquisition du code source ne devra pas excéder
le simple coût de transfert des données.
5.3.3 DISTRIBUTION DES MODULES EXTERNES
Lorsque le Licencié a développé un Module Externe les conditions du
Contrat ne s'appliquent pas à ce Module Externe, qui peut être distribué
sous un contrat de licence différent.
5.3.4 COMPATIBILITE AVEC D'AUTRES LICENCES
Le Licencié peut inclure un code soumis aux dispositions d'une des
versions de la licence GNU GPL, GNU Affero GPL et/ou EUPL dans le
Logiciel modifié ou non et distribuer l'ensemble sous les conditions de
la même version de la licence GNU GPL, GNU Affero GPL et/ou EUPL.
Le Licencié peut inclure le Logiciel modifié ou non dans un code soumis
aux dispositions d'une des versions de la licence GNU GPL, GNU Affero
GPL et/ou EUPL et distribuer l'ensemble sous les conditions de la même
version de la licence GNU GPL, GNU Affero GPL et/ou EUPL.
Article 6 - PROPRIETE INTELLECTUELLE
6.1 SUR LE LOGICIEL INITIAL
Le Titulaire est détenteur des droits patrimoniaux sur le Logiciel
Initial. Toute utilisation du Logiciel Initial est soumise au respect
des conditions dans lesquelles le Titulaire a choisi de diffuser son
oeuvre et nul autre n'a la faculté de modifier les conditions de
diffusion de ce Logiciel Initial.
Le Titulaire s'engage à ce que le Logiciel Initial reste au moins régi
par le Contrat et ce, pour la durée visée à l'article 4.2 <#duree>.
6.2 SUR LES CONTRIBUTIONS
Le Licencié qui a développé une Contribution est titulaire sur celle-ci
des droits de propriété intellectuelle dans les conditions définies par
la législation applicable.
6.3 SUR LES MODULES EXTERNES
Le Licencié qui a développé un Module Externe est titulaire sur celui-ci
des droits de propriété intellectuelle dans les conditions définies par
la législation applicable et reste libre du choix du contrat régissant
sa diffusion.
6.4 DISPOSITIONS COMMUNES
Le Licencié s'engage expressément:
1.
à ne pas supprimer ou modifier de quelque manière que ce soit les
mentions de propriété intellectuelle apposées sur le Logiciel;
2.
à reproduire à l'identique lesdites mentions de propriété
intellectuelle sur les copies du Logiciel modifié ou non.
Le Licencié s'engage à ne pas porter atteinte, directement ou
indirectement, aux droits de propriété intellectuelle du Titulaire et/ou
des Contributeurs sur le Logiciel et à prendre, le cas échéant, à
l'égard de son personnel toutes les mesures nécessaires pour assurer le
respect des dits droits de propriété intellectuelle du Titulaire et/ou
des Contributeurs.
Article 7 - SERVICES ASSOCIES
7.1 Le Contrat n'oblige en aucun cas le Concédant à la réalisation de
prestations d'assistance technique ou de maintenance du Logiciel.
Cependant le Concédant reste libre de proposer ce type de services. Les
termes et conditions d'une telle assistance technique et/ou d'une telle
maintenance seront alors déterminés dans un acte séparé. Ces actes de
maintenance et/ou assistance technique n'engageront que la seule
responsabilité du Concédant qui les propose.
7.2 De même, tout Concédant est libre de proposer, sous sa seule
responsabilité, à ses licenciés une garantie, qui n'engagera que lui,
lors de la redistribution du Logiciel et/ou du Logiciel Modifié et ce,
dans les conditions qu'il souhaite. Cette garantie et les modalités
financières de son application feront l'objet d'un acte séparé entre le
Concédant et le Licencié.
Article 8 - RESPONSABILITE
8.1 Sous réserve des dispositions de l'article 8.2
<#limite-responsabilite>, le Licencié a la faculté, sous réserve de
prouver la faute du Concédant concerné, de solliciter la réparation du
préjudice direct qu'il subirait du fait du Logiciel et dont il apportera
la preuve.
8.2 La responsabilité du Concédant est limitée aux engagements pris en
application du Contrat et ne saurait être engagée en raison notamment:
(i) des dommages dus à l'inexécution, totale ou partielle, de ses
obligations par le Licencié, (ii) des dommages directs ou indirects
découlant de l'utilisation ou des performances du Logiciel subis par le
Licencié et (iii) plus généralement d'un quelconque dommage indirect. En
particulier, les Parties conviennent expressément que tout préjudice
financier ou commercial (par exemple perte de données, perte de
bénéfices, perte d'exploitation, perte de clientèle ou de commandes,
manque à gagner, trouble commercial quelconque) ou toute action dirigée
contre le Licencié par un tiers, constitue un dommage indirect et
n'ouvre pas droit à réparation par le Concédant.
Article 9 - GARANTIE
9.1 Le Licencié reconnaît que l'état actuel des connaissances
scientifiques et techniques au moment de la mise en circulation du
Logiciel ne permet pas d'en tester et d'en vérifier toutes les
utilisations ni de détecter l'existence d'éventuels défauts. L'attention
du Licencié a été attirée sur ce point sur les risques associés au
chargement, à l'utilisation, la modification et/ou au développement et à
la reproduction du Logiciel qui sont réservés à des utilisateurs avertis.
Il relève de la responsabilité du Licencié de contrôler, par tous
moyens, l'adéquation du produit à ses besoins, son bon fonctionnement et
de s'assurer qu'il ne causera pas de dommages aux personnes et aux biens.
9.2 Le Concédant déclare de bonne foi être en droit de concéder
l'ensemble des droits attachés au Logiciel (comprenant notamment les
droits visés à l'article 5 <#etendue>).
9.3 Le Licencié reconnaît que le Logiciel est fourni "en l'état" par le
Concédant sans autre garantie, expresse ou tacite, que celle prévue à
l'article 9.2 <#bonne-foi> et notamment sans aucune garantie sur sa
valeur commerciale, son caractère sécurisé, innovant ou pertinent.
En particulier, le Concédant ne garantit pas que le Logiciel est exempt
d'erreur, qu'il fonctionnera sans interruption, qu'il sera compatible
avec l'équipement du Licencié et sa configuration logicielle ni qu'il
remplira les besoins du Licencié.
9.4 Le Concédant ne garantit pas, de manière expresse ou tacite, que le
Logiciel ne porte pas atteinte à un quelconque droit de propriété
intellectuelle d'un tiers portant sur un brevet, un logiciel ou sur tout
autre droit de propriété. Ainsi, le Concédant exclut toute garantie au
profit du Licencié contre les actions en contrefaçon qui pourraient être
diligentées au titre de l'utilisation, de la modification, et de la
redistribution du Logiciel. Néanmoins, si de telles actions sont
exercées contre le Licencié, le Concédant lui apportera son expertise
technique et juridique pour sa défense. Cette expertise technique et
juridique est déterminée au cas par cas entre le Concédant concerné et
le Licencié dans le cadre d'un protocole d'accord. Le Concédant dégage
toute responsabilité quant à l'utilisation de la dénomination du
Logiciel par le Licencié. Aucune garantie n'est apportée quant à
l'existence de droits antérieurs sur le nom du Logiciel et sur
l'existence d'une marque.
Article 10 - RESILIATION
10.1 En cas de manquement par le Licencié aux obligations mises à sa
charge par le Contrat, le Concédant pourra résilier de plein droit le
Contrat trente (30) jours après notification adressée au Licencié et
restée sans effet.
10.2 Le Licencié dont le Contrat est résilié n'est plus autorisé à
utiliser, modifier ou distribuer le Logiciel. Cependant, toutes les
licences qu'il aura concédées antérieurement à la résiliation du Contrat
resteront valides sous réserve qu'elles aient été effectuées en
conformité avec le Contrat.
Article 11 - DISPOSITIONS DIVERSES
11.1 CAUSE EXTERIEURE
Aucune des Parties ne sera responsable d'un retard ou d'une défaillance
d'exécution du Contrat qui serait dû à un cas de force majeure, un cas
fortuit ou une cause extérieure, telle que, notamment, le mauvais
fonctionnement ou les interruptions du réseau électrique ou de
télécommunication, la paralysie du réseau liée à une attaque
informatique, l'intervention des autorités gouvernementales, les
catastrophes naturelles, les dégâts des eaux, les tremblements de terre,
le feu, les explosions, les grèves et les conflits sociaux, l'état de
guerre...
11.2 Le fait, par l'une ou l'autre des Parties, d'omettre en une ou
plusieurs occasions de se prévaloir d'une ou plusieurs dispositions du
Contrat, ne pourra en aucun cas impliquer renonciation par la Partie
intéressée à s'en prévaloir ultérieurement.
11.3 Le Contrat annule et remplace toute convention antérieure, écrite
ou orale, entre les Parties sur le même objet et constitue l'accord
entier entre les Parties sur cet objet. Aucune addition ou modification
aux termes du Contrat n'aura d'effet à l'égard des Parties à moins
d'être faite par écrit et signée par leurs représentants dûment habilités.
11.4 Dans l'hypothèse où une ou plusieurs des dispositions du Contrat
s'avèrerait contraire à une loi ou à un texte applicable, existants ou
futurs, cette loi ou ce texte prévaudrait, et les Parties feraient les
amendements nécessaires pour se conformer à cette loi ou à ce texte.
Toutes les autres dispositions resteront en vigueur. De même, la
nullité, pour quelque raison que ce soit, d'une des dispositions du
Contrat ne saurait entraîner la nullité de l'ensemble du Contrat.
11.5 LANGUE
Le Contrat est rédigé en langue française et en langue anglaise, ces
deux versions faisant également foi.
Article 12 - NOUVELLES VERSIONS DU CONTRAT
12.1 Toute personne est autorisée à copier et distribuer des copies de
ce Contrat.
12.2 Afin d'en préserver la cohérence, le texte du Contrat est protégé
et ne peut être modifié que par les auteurs de la licence, lesquels se
réservent le droit de publier périodiquement des mises à jour ou de
nouvelles versions du Contrat, qui posséderont chacune un numéro
distinct. Ces versions ultérieures seront susceptibles de prendre en
compte de nouvelles problématiques rencontrées par les logiciels libres.
12.3 Tout Logiciel diffusé sous une version donnée du Contrat ne pourra
faire l'objet d'une diffusion ultérieure que sous la même version du
Contrat ou une version postérieure, sous réserve des dispositions de
l'article 5.3.4 <#compatibilite>.
Article 13 - LOI APPLICABLE ET COMPETENCE TERRITORIALE
13.1 Le Contrat est régi par la loi française. Les Parties conviennent
de tenter de régler à l'amiable les différends ou litiges qui
viendraient à se produire par suite ou à l'occasion du Contrat.
13.2 A défaut d'accord amiable dans un délai de deux (2) mois à compter
de leur survenance et sauf situation relevant d'une procédure d'urgence,
les différends ou litiges seront portés par la Partie la plus diligente
devant les Tribunaux compétents de Paris.

155
LICENSES/CC-BY-NC-ND-4.0.txt vendored Normal file
View file

@ -0,0 +1,155 @@
Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International
Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
Using Creative Commons Public Licenses
Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors.
Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensors permission is not necessary for any reasonfor example, because of any applicable exception or limitation to copyrightthen that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License
By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
Section 1 Definitions.
a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
b. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
c. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
d. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
e. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
f. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
g. Licensor means the individual(s) or entity(ies) granting rights under this Public License.
h. NonCommercial means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.
i. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
j. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
k. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
Section 2 Scope.
a. License grant.
1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and
B. produce and reproduce, but not Share, Adapted Material for NonCommercial purposes only.
2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
3. Term. The term of this Public License is specified in Section 6(a).
4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
5. Downstream recipients.
A. Offer from the Licensor Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
B. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
b. Other rights.
1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
2. Patent and trademark rights are not licensed under this Public License.
3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.
Section 3 License Conditions.
Your exercise of the Licensed Rights is expressly made subject to the following conditions.
a. Attribution.
1. If You Share the Licensed Material, You must:
A. retain the following if it is supplied by the Licensor with the Licensed Material:
i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
ii. a copyright notice;
iii. a notice that refers to this Public License;
iv. a notice that refers to the disclaimer of warranties;
v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
Section 4 Sui Generis Database Rights.
Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only and provided You do not Share Adapted Material;
b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
Section 5 Disclaimer of Warranties and Limitation of Liability.
a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
Section 6 Term and Termination.
a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
2. upon express reinstatement by the Licensor.
For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
Section 7 Other Terms and Conditions.
a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
Section 8 Interpretation.
a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
Creative Commons may be contacted at creativecommons.org.

121
LICENSES/CC0-1.0.txt vendored Normal file
View file

@ -0,0 +1,121 @@
Creative Commons Legal Code
CC0 1.0 Universal
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
HEREUNDER.
Statement of Purpose
The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator
and subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").
Certain owners wish to permanently relinquish those rights to a Work for
the purpose of contributing to a commons of creative, cultural and
scientific works ("Commons") that the public can reliably and without fear
of later claims of infringement build upon, modify, incorporate in other
works, reuse and redistribute as freely as possible in any form whatsoever
and for any purposes, including without limitation commercial purposes.
These owners may contribute to the Commons to promote the ideal of a free
culture and the further production of creative, cultural and scientific
works, or to gain reputation or greater distribution for their Work in
part through the use and efforts of others.
For these and/or other purposes and motivations, and without any
expectation of additional consideration or compensation, the person
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
is an owner of Copyright and Related Rights in the Work, voluntarily
elects to apply CC0 to the Work and publicly distribute the Work under its
terms, with knowledge of his or her Copyright and Related Rights in the
Work and the meaning and intended legal effect of CC0 on those rights.
1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not
limited to, the following:
i. the right to reproduce, adapt, distribute, perform, display,
communicate, and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or
likeness depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work,
subject to the limitations in paragraph 4(a), below;
v. rights protecting the extraction, dissemination, use and reuse of data
in a Work;
vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation
thereof, including any amended or successor version of such
directive); and
vii. other similar, equivalent or corresponding rights throughout the
world based on applicable law or treaty, and any national
implementations thereof.
2. Waiver. To the greatest extent permitted by, but not in contravention
of, applicable law, Affirmer hereby overtly, fully, permanently,
irrevocably and unconditionally waives, abandons, and surrenders all of
Affirmer's Copyright and Related Rights and associated claims and causes
of action, whether now known or unknown (including existing as well as
future claims and causes of action), in the Work (i) in all territories
worldwide, (ii) for the maximum duration provided by applicable law or
treaty (including future time extensions), (iii) in any current or future
medium and for any number of copies, and (iv) for any purpose whatsoever,
including without limitation commercial, advertising or promotional
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
member of the public at large and to the detriment of Affirmer's heirs and
successors, fully intending that such Waiver shall not be subject to
revocation, rescission, cancellation, termination, or any other legal or
equitable action to disrupt the quiet enjoyment of the Work by the public
as contemplated by Affirmer's express Statement of Purpose.
3. Public License Fallback. Should any part of the Waiver for any reason
be judged legally invalid or ineffective under applicable law, then the
Waiver shall be preserved to the maximum extent permitted taking into
account Affirmer's express Statement of Purpose. In addition, to the
extent the Waiver is so judged Affirmer hereby grants to each affected
person a royalty-free, non transferable, non sublicensable, non exclusive,
irrevocable and unconditional license to exercise Affirmer's Copyright and
Related Rights in the Work (i) in all territories worldwide, (ii) for the
maximum duration provided by applicable law or treaty (including future
time extensions), (iii) in any current or future medium and for any number
of copies, and (iv) for any purpose whatsoever, including without
limitation commercial, advertising or promotional purposes (the
"License"). The License shall be deemed effective as of the date CC0 was
applied by Affirmer to the Work. Should any part of the License for any
reason be judged legally invalid or ineffective under applicable law, such
partial invalidity or ineffectiveness shall not invalidate the remainder
of the License, and in such case Affirmer hereby affirms that he or she
will not (i) exercise any of his or her remaining Copyright and Related
Rights in the Work or (ii) assert any associated claims and causes of
action with respect to the Work, in either case contrary to Affirmer's
express Statement of Purpose.
4. Limitations and Disclaimers.
a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or
warranties of any kind concerning the Work, express, implied,
statutory or otherwise, including without limitation warranties of
title, merchantability, fitness for a particular purpose, non
infringement, or the absence of latent or other defects, accuracy, or
the present or absence of errors, whether or not discoverable, all to
the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without
limitation any person's Copyright and Related Rights in the Work.
Further, Affirmer disclaims responsibility for obtaining any necessary
consents, permissions or other rights required for any use of the
Work.
d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.

190
LICENSES/EUPL-1.2.txt vendored Normal file
View file

@ -0,0 +1,190 @@
EUROPEAN UNION PUBLIC LICENCE v. 1.2
EUPL © the European Union 2007, 2016
This European Union Public Licence (the EUPL) applies to the Work (as defined below) which is provided under the
terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such
use is covered by a right of the copyright holder of the Work).
The Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following
notice immediately following the copyright notice for the Work:
Licensed under the EUPL
or has expressed by any other means his willingness to license under the EUPL.
1.Definitions
In this Licence, the following terms have the following meaning:
The Licence:this Licence.
The Original Work:the work or software distributed or communicated by the Licensor under this Licence, available
as Source Code and also as Executable Code as the case may be.
Derivative Works:the works or software that could be created by the Licensee, based upon the Original Work or
modifications thereof. This Licence does not define the extent of modification or dependence on the Original Work
required in order to classify a work as a Derivative Work; this extent is determined by copyright law applicable in
the country mentioned in Article 15.
The Work:the Original Work or its Derivative Works.
The Source Code:the human-readable form of the Work which is the most convenient for people to study and
modify.
The Executable Code:any code which has generally been compiled and which is meant to be interpreted by
a computer as a program.
The Licensor:the natural or legal person that distributes or communicates the Work under the Licence.
Contributor(s):any natural or legal person who modifies the Work under the Licence, or otherwise contributes to
the creation of a Derivative Work.
The Licensee or You:any natural or legal person who makes any usage of the Work under the terms of the
Licence.
Distribution or Communication:any act of selling, giving, lending, renting, distributing, communicating,
transmitting, or otherwise making available, online or offline, copies of the Work or providing access to its essential
functionalities at the disposal of any other natural or legal person.
2.Scope of the rights granted by the Licence
The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, sublicensable licence to do the following, for
the duration of copyright vested in the Original Work:
— use the Work in any circumstance and for all usage,
— reproduce the Work,
— modify the Work, and make Derivative Works based upon the Work,
— communicate to the public, including the right to make available or display the Work or copies thereof to the public
and perform publicly, as the case may be, the Work,
— distribute the Work or copies thereof,
— lend and rent the Work or copies thereof,
— sublicense rights in the Work or copies thereof.
Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the
applicable law permits so.
In the countries where moral rights apply, the Licensor waives his right to exercise his moral right to the extent allowed
by law in order to make effective the licence of the economic rights here above listed.
The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to any patents held by the Licensor, to the
extent necessary to make use of the rights granted on the Work under this Licence.
3.Communication of the Source Code
The Licensor may provide the Work either in its Source Code form, or as Executable Code. If the Work is provided as
Executable Code, the Licensor provides in addition a machine-readable copy of the Source Code of the Work along with
each copy of the Work that the Licensor distributes or indicates, in a notice following the copyright notice attached to
the Work, a repository where the Source Code is easily and freely accessible for as long as the Licensor continues to
distribute or communicate the Work.
4.Limitations on copyright
Nothing in this Licence is intended to deprive the Licensee of the benefits from any exception or limitation to the
exclusive rights of the rights owners in the Work, of the exhaustion of those rights or of other applicable limitations
thereto.
5.Obligations of the Licensee
The grant of the rights mentioned above is subject to some restrictions and obligations imposed on the Licensee. Those
obligations are the following:
Attribution right: The Licensee shall keep intact all copyright, patent or trademarks notices and all notices that refer to
the Licence and to the disclaimer of warranties. The Licensee must include a copy of such notices and a copy of the
Licence with every copy of the Work he/she distributes or communicates. The Licensee must cause any Derivative Work
to carry prominent notices stating that the Work has been modified and the date of modification.
Copyleft clause: If the Licensee distributes or communicates copies of the Original Works or Derivative Works, this
Distribution or Communication will be done under the terms of this Licence or of a later version of this Licence unless
the Original Work is expressly distributed only under this version of the Licence — for example by communicating
EUPL v. 1.2 only. The Licensee (becoming Licensor) cannot offer or impose any additional terms or conditions on the
Work or Derivative Work that alter or restrict the terms of the Licence.
Compatibility clause: If the Licensee Distributes or Communicates Derivative Works or copies thereof based upon both
the Work and another work licensed under a Compatible Licence, this Distribution or Communication can be done
under the terms of this Compatible Licence. For the sake of this clause, Compatible Licence refers to the licences listed
in the appendix attached to this Licence. Should the Licensee's obligations under the Compatible Licence conflict with
his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail.
Provision of Source Code: When distributing or communicating copies of the Work, the Licensee will provide
a machine-readable copy of the Source Code or indicate a repository where this Source will be easily and freely available
for as long as the Licensee continues to distribute or communicate the Work.
Legal Protection: This Licence does not grant permission to use the trade names, trademarks, service marks, or names
of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and
reproducing the content of the copyright notice.
6.Chain of Authorship
The original Licensor warrants that the copyright in the Original Work granted hereunder is owned by him/her or
licensed to him/her and that he/she has the power and authority to grant the Licence.
Each Contributor warrants that the copyright in the modifications he/she brings to the Work are owned by him/her or
licensed to him/her and that he/she has the power and authority to grant the Licence.
Each time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions
to the Work, under the terms of this Licence.
7.Disclaimer of Warranty
The Work is a work in progress, which is continuously improved by numerous Contributors. It is not a finished work
and may therefore contain defects or bugs inherent to this type of development.
For the above reason, the Work is provided under the Licence on an as is basis and without warranties of any kind
concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or
errors, accuracy, non-infringement of intellectual property rights other than copyright as stated in Article 6 of this
Licence.
This disclaimer of warranty is an essential part of the Licence and a condition for the grant of any rights to the Work.
8.Disclaimer of Liability
Except in the cases of wilful misconduct or damages directly caused to natural persons, the Licensor will in no event be
liable for any direct or indirect, material or moral, damages of any kind, arising out of the Licence or of the use of the
Work, including without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, loss
of data or any commercial damage, even if the Licensor has been advised of the possibility of such damage. However,
the Licensor will be liable under statutory product liability laws as far such laws apply to the Work.
9.Additional agreements
While distributing the Work, You may choose to conclude an additional agreement, defining obligations or services
consistent with this Licence. However, if accepting obligations, You may act only on your own behalf and on your sole
responsibility, not on behalf of the original Licensor or any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against such Contributor by
the fact You have accepted any warranty or additional liability.
10.Acceptance of the Licence
The provisions of this Licence can be accepted by clicking on an icon I agree placed under the bottom of a window
displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of
applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms
and conditions.
Similarly, you irrevocably accept this Licence and all of its terms and conditions by exercising any rights granted to You
by Article 2 of this Licence, such as the use of the Work, the creation by You of a Derivative Work or the Distribution
or Communication by You of the Work or copies thereof.
11.Information to the public
In case of any Distribution or Communication of the Work by means of electronic communication by You (for example,
by offering to download the Work from a remote location) the distribution channel or media (for example, a website)
must at least provide to the public the information requested by the applicable law regarding the Licensor, the Licence
and the way it may be accessible, concluded, stored and reproduced by the Licensee.
12.Termination of the Licence
The Licence and the rights granted hereunder will terminate automatically upon any breach by the Licensee of the terms
of the Licence.
Such a termination will not terminate the licences of any person who has received the Work from the Licensee under
the Licence, provided such persons remain in full compliance with the Licence.
13.Miscellaneous
Without prejudice of Article 9 above, the Licence represents the complete agreement between the Parties as to the
Work.
If any provision of the Licence is invalid or unenforceable under applicable law, this will not affect the validity or
enforceability of the Licence as a whole. Such provision will be construed or reformed so as necessary to make it valid
and enforceable.
The European Commission may publish other linguistic versions or new versions of this Licence or updated versions of
the Appendix, so far this is required and reasonable, without reducing the scope of the rights granted by the Licence.
New versions of the Licence will be published with a unique version number.
All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take
advantage of the linguistic version of their choice.
14.Jurisdiction
Without prejudice to specific agreement between parties,
— any litigation resulting from the interpretation of this License, arising between the European Union institutions,
bodies, offices or agencies, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court of Justice
of the European Union, as laid down in article 272 of the Treaty on the Functioning of the European Union,
— any litigation arising between other parties and resulting from the interpretation of this License, will be subject to
the exclusive jurisdiction of the competent court where the Licensor resides or conducts its primary business.
15.Applicable Law
Without prejudice to specific agreement between parties,
— this Licence shall be governed by the law of the European Union Member State where the Licensor has his seat,
resides or has his registered office,
— this licence shall be governed by Belgian law if the Licensor has no seat, residence or registered office inside
a European Union Member State.
Appendix
Compatible Licences according to Article 5 EUPL are:
— GNU General Public License (GPL) v. 2, v. 3
— GNU Affero General Public License (AGPL) v. 3
— Open Software License (OSL) v. 2.1, v. 3.0
— Eclipse Public License (EPL) v. 1.0
— CeCILL v. 2.0, v. 2.1
— Mozilla Public Licence (MPL) v. 2
— GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
— Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for works other than software
— European Union Public Licence (EUPL) v. 1.1, v. 1.2
— Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong Reciprocity (LiLiQ-R+).
The European Commission may update this Appendix to later versions of the above licences without producing
a new version of the EUPL, as long as they provide the rights granted in Article 2 of this Licence and protect the
covered Source Code from exclusive appropriation.
All other changes or additions to this Appendix require the production of a new EUPL version.

View file

@ -0,0 +1 @@
All rights reserved.

9
LICENSES/MIT.txt vendored Normal file
View file

@ -0,0 +1,9 @@
MIT License
Copyright (c) <year> <copyright holders>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View file

@ -1,3 +1,10 @@
<!--
SPDX-FileCopyrightText: 2024 Maurice Debray <maurice.debray@dgnum.eu>
SPDX-FileCopyrightText: 2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>
SPDX-License-Identifier: EUPL-1.2
-->
# ❄️ infrastructure
The dgnum infrastructure.
@ -91,7 +98,7 @@ The general metadata is declared in `meta/nodes.nix`, the main values to declare
Create the directory `secrets` in the configuration folder, and add a `secrets.nix` file containing :
```nix
(import ../../../keys).mkSecrets [ "host02" ] [
(import ../../../keys.nix).mkSecrets [ "host02" ] [
# List of secrets for host02
]
```

78
REUSE.toml generated Normal file
View file

@ -0,0 +1,78 @@
version = 1
[[annotations]]
SPDX-FileCopyrightText = "NONE"
SPDX-License-Identifier = "CC0-1.0"
path = ["**/.envrc", "**/Cargo.lock", "**/_hardware-configuration.nix", ".gitignore", "REUSE.toml", "shell.nix", "**/lon.lock", "**/lon.nix", "patches/nixpkgs/403844.patch", "patches/colmena/0001-*", "pkgs/by-name/docuseal/rubyEnv/*", "pkgs/by-name/docuseal/deps.json", "pkgs/by-name/docuseal/yarn.lock"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "La Délégation Générale Numérique <contact@dgnum.eu>"
SPDX-License-Identifier = "EUPL-1.2"
path = [".forgejo/workflows/*"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "La Délégation Générale Numérique <contact@dgnum.eu>"
SPDX-License-Identifier = "CC-BY-NC-ND-4.0"
path = ["machines/**/secrets/*", "modules/nixos/dgn-backups/keys/*", "modules/nixos/dgn-netbox-agent/secrets/netbox-agent", "modules/nixos/dgn-notify/mail", "modules/nixos/dgn-notify/ntfy-sh-systemd_passwd", "modules/nixos/dgn-forgejo-runners/forgejo_runners-token_file", "modules/nixos/dgn-records/__arkheon-token_file", "modules/nixos/dgn-s3/garage-*_file"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>"
SPDX-License-Identifier = "EUPL-1.2"
path = ["machines/nixos/compute01/ds-fr/01-smtp-tls.patch", "machines/nixos/compute01/stirling-pdf/*.patch", "machines/nixos/vault01/k-radius/packages/01-python_path.patch", "machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch", "machines/nixos/vault01/k-radius/packages/03-set-log-level.patch", "machines/nixos/web01/crabfit/*.patch", "machines/nixos/web02/cas-eleves/01-pytest-cas.patch", "patches/lix/01-disable-installChecks.patch", "patches/lix/02-fetchGit-locked.patch", "patches/nixpkgs/01-pretalx-environment-file.patch", "patches/nixpkgs/03-crabfit-karla.patch", "patches/nixpkgs/05-netbird-relay.patch", "patches/cas-eleves/01-ldap-settings.patch"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = ["2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>", "2024 Maurice Debray <maurice.debray@dgnum.eu>"]
SPDX-License-Identifier = "EUPL-1.2"
path = ["patches/nixpkgs/07-kanidm-groups-module.patch", "patches/nixpkgs/08-kanidm-groups-pkgs.patch", "patches/nixpkgs/07-25.05-kanidm-groups-module.patch", "patches/nixpkgs/08-25.05-kanidm-groups-pkgs.patch"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "2024 Maurice Debray <maurice.debray@dgnum.eu>"
SPDX-License-Identifier = "EUPL-1.2"
path = ["patches/nixpkgs/06-netbox-qrcode.patch"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "2024 Lubin Bailly <lubin.bailly@dgnum.eu>"
SPDX-License-Identifier = "EUPL-1.2"
path = ["modules/nixos/extranix/0001-revert-don-t-parse-md-in-js.patch", "modules/nixos/extranix/0002-chore-remove-useless-dependencies.patch", "modules/nixos/extranix/0003-feat-separate-HTML-description-of-MD-description.patch", "modules/nixos/extranix/0004-fix-indentation-of-ul.patch", "modules/nixos/extranix/0005-feat-match-all-substring-by-default.patch", "patches/nixpkgs/02-action-validator.patch", "machines/nixos/vault01/k-radius/packages/04-request-dgsi-vlan.patch", "patches/nixpkgs/06-netbird-dashboard.patch"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = ["2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>", "2025 Lubin Bailly <lubin.bailly@dgnum.eu>"]
SPDX-License-Identifier = "EUPL-1.2"
path = ["patches/nixpkgs/09-rename-autocreate-to-verify_bucket_exists.patch"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "2024 Ryan Lahfa <ryan.lahfa@dgnum.eu>"
SPDX-License-Identifier = "EUPL-1.2"
path = ["machines/nixos/krz01/ollama/all-nvcc-arch.patch", "machines/nixos/krz01/ollama/K80-support.patch", "machines/nixos/krz01/ollama/disable-git.patch", "machines/nixos/krz01/ollama/no-weird-microarch.patch", "machines/nixos/krz01/whisper/all-nvcc-arch.patch", "machines/nixos/krz01/whisper/no-weird-microarch.patch"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "La Délégation Générale Numérique <contact@dgnum.eu>"
SPDX-License-Identifier = "MIT"
path = "lib/colmena/*"
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "The [forgejo](https://codeberg.org/forgejo/forgejo) contributors"
SPDX-License-Identifier = "GPL-3.0-or-later"
path = "machines/nixos/compute01/extranix/static-data/images/forgejo.png"
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = "La Délégation Générale Numérique <contact@dgnum.eu>"
SPDX-License-Identifier = "LicenseRef-Reserved"
path = ["machines/nixos/compute01/extranix/static-data/images/dgnum.png", "machines/nixos/compute01/extranix/static-data/images/favicon.ico", "machines/nixos/compute01/extranix/static-data/images/favicon.png"]
precedence = "closest"
[[annotations]]
SPDX-FileCopyrightText = ["Exide Electronics 1992-98", "Powerware Corporation 1999-2004", "Eaton Corporation (2005-)"]
SPDX-License-Identifier = "LicenseRef-Reserved"
path = ["machines/nixos/vault01/monitoring/mibs/*"]
precedence = "closest"

35
bootstrap.nix Normal file
View file

@ -0,0 +1,35 @@
# SPDX-FileCopyrightText: 2024 Ryan Lahfa <ryan.lahfa@dgnum.eu>
# SPDX-FileCopyrightText: 2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>
# SPDX-FileContributor: Maurice Debray <maurice.debray@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
let
unpatchedSources = import ./lon.nix;
pkgs = import unpatchedSources.nixos-unstable { overlays = [ ]; };
patch = (import ./lib/nix-patches { patchFile = ./patches; }).base {
inherit pkgs;
};
sources = builtins.mapAttrs (
k: src:
patch.applyPatches {
inherit src;
name = k;
}
) unpatchedSources;
overlays.lib = _: lib: { extra = import ./lib/nix-lib { inherit lib; }; };
in
{
inherit overlays sources unpatchedSources;
root = ./.;
pkgs = pkgs // {
lib = pkgs.lib.extend overlays.lib;
};
}

6
cz.toml Normal file
View file

@ -0,0 +1,6 @@
# SPDX-FileCopyrightText: 2024 Maurice Debray <maurice.debray@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
[tool.commitizen]
allowed_prefixes = [ "lon", "Merge", "Revert", "Pull request", "fixup!", "squash!" ]

View file

@ -1,47 +1,37 @@
/*
Copyright :
- Maurice Debray <maurice.debray@dgnum.eu> 2023
- Tom Hubrecht <tom.hubrecht@dgnum.eu> 2023
# SPDX-FileCopyrightText: 2024 Maurice Debray <maurice.debray@dgnum.eu>
# SPDX-FileCopyrightText: 2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
Ce logiciel est un programme informatique servant à déployer des
configurations de serveurs via NixOS.
Ce logiciel est régi par la licence CeCILL soumise au droit français et
respectant les principes de diffusion des logiciels libres. Vous pouvez
utiliser, modifier et/ou redistribuer ce programme sous les conditions
de la licence CeCILL telle que diffusée par le CEA, le CNRS et l'INRIA
sur le site "http://www.cecill.info".
En contrepartie de l'accessibilité au code source et des droits de copie,
de modification et de redistribution accordés par cette licence, il n'est
offert aux utilisateurs qu'une garantie limitée. Pour les mêmes raisons,
seule une responsabilité restreinte pèse sur l'auteur du programme, le
titulaire des droits patrimoniaux et les concédants successifs.
A cet égard l'attention de l'utilisateur est attirée sur les risques
associés au chargement, à l'utilisation, à la modification et/ou au
développement et à la reproduction du logiciel par l'utilisateur étant
donné sa spécificité de logiciel libre, qui peut le rendre complexe à
manipuler et qui le réserve donc à des développeurs et des professionnels
avertis possédant des connaissances informatiques approfondies. Les
utilisateurs sont donc invités à charger et tester l'adéquation du
logiciel à leurs besoins dans des conditions permettant d'assurer la
sécurité de leurs systèmes et ou de leurs données et, plus généralement,
à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.
Le fait que vous puissiez accéder à cet en-tête signifie que vous avez
pris connaissance de la licence CeCILL, et que vous en avez accepté les
termes.
*/
let
bootstrap = import ./bootstrap.nix;
in
{
sources ? import ./npins,
pkgs ? import sources.nixpkgs { },
nix-pkgs ? import sources.nix-pkgs { inherit pkgs; },
sources ? bootstrap.sources,
pkgs ? import sources.nixos-unstable {
overlays = [
(self: super: {
lib = super.lib.extend bootstrap.overlays.lib;
lon = self.callPackage (sources.lon + "/nix/packages/lon.nix") { };
})
];
},
}:
let
git-checks = (import (builtins.storePath sources.git-hooks)).run {
inherit (pkgs.lib)
isFunction
mapAttrs
mapAttrs'
nameValuePair
removeSuffix
;
nix-reuse = import sources.nix-reuse { inherit pkgs; };
nix-actions = import sources.nix-actions { inherit pkgs; };
git-checks = (import sources.git-hooks).run {
src = ./.;
hooks = {
@ -50,7 +40,6 @@ let
stages = [ "pre-push" ];
settings.ignore = [
"**/lon.nix"
"**/npins"
];
};
@ -62,88 +51,238 @@ let
nixfmt-rfc-style = {
enable = true;
stages = [ "pre-push" ];
package = pkgs.nixfmt-rfc-style;
};
reuse = nix-reuse.hook { };
commitizen.enable = true;
};
};
terranixConfig = import "${sources.terranix}/core" {
inherit pkgs;
strip_nulls = true;
terranix_config.imports = [ ./terranix ];
reuse = nix-reuse.install {
defaultLicense = "EUPL-1.2";
defaultCopyright = "La Délégation Générale Numérique <contact@dgnum.eu>";
downloadLicenses = true;
generatedPaths = [
"**/.envrc"
"**/Cargo.lock"
"**/_hardware-configuration.nix"
".gitignore"
"REUSE.toml"
"shell.nix"
"**/lon.lock"
"**/lon.nix"
"patches/nixpkgs/403844.patch"
# Commit revert
"patches/colmena/0001-*"
# Docuseal
"pkgs/by-name/docuseal/rubyEnv/*"
"pkgs/by-name/docuseal/deps.json"
"pkgs/by-name/docuseal/yarn.lock"
];
annotations = [
# Auto-generated workflow files using nix-actions
{ path = [ ".forgejo/workflows/*" ]; }
# Secrets
{
path = [
"machines/**/secrets/*"
"modules/nixos/dgn-backups/keys/*"
"modules/nixos/dgn-netbox-agent/secrets/netbox-agent"
"modules/nixos/dgn-notify/mail"
"modules/nixos/dgn-notify/ntfy-sh-systemd_passwd"
"modules/nixos/dgn-forgejo-runners/forgejo_runners-token_file"
"modules/nixos/dgn-records/__arkheon-token_file"
"modules/nixos/dgn-s3/garage-*_file"
];
license = "CC-BY-NC-ND-4.0";
}
# Patches
{
path = [
"machines/nixos/compute01/ds-fr/01-smtp-tls.patch"
"machines/nixos/compute01/stirling-pdf/*.patch"
"machines/nixos/vault01/k-radius/packages/01-python_path.patch"
"machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch"
"machines/nixos/vault01/k-radius/packages/03-set-log-level.patch"
"machines/nixos/web01/crabfit/*.patch"
"machines/nixos/web02/cas-eleves/01-pytest-cas.patch"
"patches/lix/01-disable-installChecks.patch"
"patches/lix/02-fetchGit-locked.patch"
"patches/nixpkgs/01-pretalx-environment-file.patch"
"patches/nixpkgs/03-crabfit-karla.patch"
"patches/nixpkgs/05-netbird-relay.patch"
"patches/cas-eleves/01-ldap-settings.patch"
];
copyright = "2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>";
}
{
path = [
"patches/nixpkgs/07-kanidm-groups-module.patch"
"patches/nixpkgs/08-kanidm-groups-pkgs.patch"
"patches/nixpkgs/07-25.05-kanidm-groups-module.patch"
"patches/nixpkgs/08-25.05-kanidm-groups-pkgs.patch"
];
copyright = [
"2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>"
"2024 Maurice Debray <maurice.debray@dgnum.eu>"
];
}
{
path = [ "patches/nixpkgs/06-netbox-qrcode.patch" ];
copyright = "2024 Maurice Debray <maurice.debray@dgnum.eu>";
}
{
path = [
"modules/nixos/extranix/0001-revert-don-t-parse-md-in-js.patch"
"modules/nixos/extranix/0002-chore-remove-useless-dependencies.patch"
"modules/nixos/extranix/0003-feat-separate-HTML-description-of-MD-description.patch"
"modules/nixos/extranix/0004-fix-indentation-of-ul.patch"
"modules/nixos/extranix/0005-feat-match-all-substring-by-default.patch"
"patches/nixpkgs/02-action-validator.patch"
"machines/nixos/vault01/k-radius/packages/04-request-dgsi-vlan.patch"
"patches/nixpkgs/06-netbird-dashboard.patch"
];
copyright = "2024 Lubin Bailly <lubin.bailly@dgnum.eu>";
}
{
path = [
"patches/nixpkgs/09-rename-autocreate-to-verify_bucket_exists.patch"
];
copyright = [
"2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>"
"2025 Lubin Bailly <lubin.bailly@dgnum.eu>"
];
}
{
path = [
"machines/nixos/krz01/ollama/all-nvcc-arch.patch"
"machines/nixos/krz01/ollama/K80-support.patch"
"machines/nixos/krz01/ollama/disable-git.patch"
"machines/nixos/krz01/ollama/no-weird-microarch.patch"
"machines/nixos/krz01/whisper/all-nvcc-arch.patch"
"machines/nixos/krz01/whisper/no-weird-microarch.patch"
];
copyright = "2024 Ryan Lahfa <ryan.lahfa@dgnum.eu>";
}
# colmena wrapper
{
path = "lib/colmena/*";
license = "MIT";
}
# images
{
path = "machines/nixos/compute01/extranix/static-data/images/forgejo.png";
license = "GPL-3.0-or-later";
copyright = "The [forgejo](https://codeberg.org/forgejo/forgejo) contributors";
}
{
path = [
"machines/nixos/compute01/extranix/static-data/images/dgnum.png"
"machines/nixos/compute01/extranix/static-data/images/favicon.ico"
"machines/nixos/compute01/extranix/static-data/images/favicon.png"
];
license = "LicenseRef-Reserved";
}
# MIBs
{
path = [
"machines/nixos/vault01/monitoring/mibs/*"
];
copyright = [
"Exide Electronics 1992-98"
"Powerware Corporation 1999-2004"
"Eaton Corporation (2005-)"
];
license = "LicenseRef-Reserved";
}
];
};
terranixConfigFile = (pkgs.formats.json { }).generate "config.tf.json" terranixConfig.config;
workflows = nix-actions.install {
src = ./.;
workflows = mapAttrs' (
name: _:
nameValuePair (removeSuffix ".nix" name) (
let
w = import ./workflows/${name};
args = {
inherit nix-actions;
inherit (pkgs) lib;
};
in
if (isFunction w) then (w args) else w
)
) (builtins.readDir ./workflows);
};
scripts = import ./scripts { inherit pkgs sources; };
in
{
inherit terranixConfigFile terranixConfig;
nodes = builtins.mapAttrs (
host: { site, ... }: "${host}.${site}.infra.dgnum.eu"
) (import ./meta/nodes.nix);
) (import ./meta/nodes/nixos.nix).nodes;
dns = import ./meta/dns.nix;
mkCacheSettings = import ./machines/storage01/tvix-cache/cache-settings.nix;
mkCacheSettings = import ./machines/nixos/storage01/snix-cache/cache-settings.nix {
inherit (pkgs) lib;
};
shells = {
default = pkgs.mkShell {
name = "dgnum-infra";
devShell = pkgs.mkShell {
name = "dgnum-infra";
packages = [
(pkgs.writeShellScriptBin "tf" ''
set -eo pipefail
ln -snf ${terranixConfigFile} config.tf.json
exec ${pkgs.lib.getExe pkgs.opentofu} "$@"
'')
(pkgs.writeShellScriptBin "decryptAndSourceEnvironment" ''
set -eo pipefail
packages =
[
pkgs.lon
# TODO: don't hardcode me.
SECRET_FILE=".credentials/admin-environment.age"
IDENTITIES=()
for identity in [ "$HOME/.ssh/id_ed25519" "$HOME/.ssh/id_rsa" ]; do
test -r "$identity" || continue
IDENTITIES+=(-i)
IDENTITIES+=("$identity")
done
# SSO testing
pkgs.kanidm
pkgs.freeradius
pkgs.picocom # for serial access
test "''${#IDENTITIES[@]}" -eq 0 && echo "[agenix-shell] WARNING: no readable identities found!"
test -f "$SECRET_FILE" || echo "[agenix-shell] WARNING: encrypted environment file $SECRET_FILE not found!"
export eval $(${pkgs.lib.getExe pkgs.rage} --decrypt "''${IDENTITIES[@]}" -o - $SECRET_FILE)
echo "[agenix-shell] Repository-wide secrets loaded in the environment."
'')
(pkgs.nixos-generators.overrideAttrs (_: {
version = "1.8.0-unstable";
src = builtins.storePath sources.nixos-generators;
}))
pkgs.npins
pkgs.rage
(pkgs.callPackage ./lib/colmena { inherit (nix-pkgs) colmena; })
(pkgs.callPackage ./lib/colmena {
colmena = pkgs.callPackage "${sources.colmena}/package.nix" { };
})
(pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { })
(pkgs.callPackage "${sources.lon}/nix/packages/lon.nix" { })
]
++ git-checks.enabledPackages
++ (builtins.attrValues scripts);
] ++ (import ./scripts { inherit pkgs; });
shellHook = builtins.concatStringsSep "\n" [
git-checks.shellHook
reuse.shellHook
workflows.shellHook
];
shellHook = ''
${git-checks.shellHook}
# If we want to export these environments, we need to source it, not call it.
source $(which decryptAndSourceEnvironment)
'';
preferLocalBuild = true;
preferLocalBuild = true;
};
###
# Alternative shells
pre-commit = pkgs.mkShell {
name = "pre-commit-shell";
shellHook = ''
${git-checks.shellHook}
'';
passthru = mapAttrs (name: value: pkgs.mkShell (value // { inherit name; })) {
pre-commit.shellHook = git-checks.shellHook;
check-workflows.shellHook = workflows.shellHook;
eval-nodes.packages = [
scripts.instantiate-node
scripts.push-to-cache
];
eval-shell.packages = [ scripts.nix-build-and-cache ];
lon-update.packages = [ pkgs.lon ];
};
};
}

274
hive.nix
View file

@ -1,113 +1,231 @@
# SPDX-FileCopyrightText: 2024 Ryan Lahfa <ryan.lahfa@dgnum.eu>
# SPDX-FileCopyrightText: 2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>
# SPDX-FileContributor: Maurice Debray <maurice.debray@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
# TODO: change comments to ### \n # [text] \n #
let
sources' = import ./npins;
### Init some tooling
# Patch sources directly
sources = builtins.mapAttrs (patch.base { pkgs = import sources'.nixos-unstable { }; })
.applyPatches' sources';
bootstrap = import ./bootstrap.nix;
nix-lib = import ./lib/nix-lib;
inherit (bootstrap.pkgs) lib;
inherit (lib.extra) mapSingleFuse;
patch = import ./lib/nix-patches { patchFile = ./patches; };
inherit (bootstrap) sources;
nodes' = import ./meta/nodes.nix;
nodes = builtins.attrNames nodes';
### Let's build meta
metadata = (import ./meta) lib;
mkNode = node: {
# Import the base configuration for each node
imports = [ ./machines/${node}/_configuration.nix ];
};
nodes = builtins.attrNames metadata.nodes;
### Nixpkgs instanciation
nixpkgs' = import ./meta/nixpkgs.nix;
# All supported nixpkgs versions, instanciated
nixpkgs = nix-lib.mapSingleFuse mkNixpkgs nixpkgs'.supported;
# Build up the nixpkgs configuration for Liminix embedded systems
mkLiminixConfig =
system: _:
(import "${sources.liminix}/devices/${system}").system
// {
overlays = [ (import "${sources.liminix}/overlay.nix") ];
config = {
allowUnsupportedSystem = true; # mipsel
permittedInsecurePackages = [
"python-2.7.18.8" # Python < 3.x is needed for kernel backports.
];
};
};
# Build up the arguments to instantiate a nixpkgs given a system and a version.
mkNixpkgsConfig =
system:
{
nixos = _: { config.allowUnfree = true; }; # TODO: add nix-pkgs overlay here
zyxel-nwa50ax = mkLiminixConfig system;
netconf = _: { };
}
.${system} or (throw "Unknown system: ${system} for nixpkgs configuration instantiation");
# Instanciates the required nixpkgs version
mkSystemNixpkgs =
system: version: import sources."nixos-${version}" (mkNixpkgsConfig system version);
# All supported nixpkgs versions × systems, instanciated
nixpkgs = mapSingleFuse (s: mapSingleFuse (mkSystemNixpkgs s) nixpkgs'.versions) nixpkgs'.systems;
# Get the configured nixos version for the node,
# defaulting to the one defined in meta/nixpkgs
version = node: nodes'.${node}.nixpkgs or nixpkgs'.default;
version = node: metadata.nodes.${node}.nixpkgs.version;
system = node: metadata.nodes.${node}.nixpkgs.system;
category = node: nixpkgs'.categories.${system node};
# Builds a patched version of nixpkgs, only as the source
mkNixpkgs' =
v:
patch.mkNixpkgsSrc rec {
src = sources'.${name};
name = "nixos-${v}";
};
nodePkgs = node: nixpkgs.${system node}.${version node};
# Instanciates the required nixpkgs version
mkNixpkgs = version: import (mkNixpkgs' version) { };
###
##########
# Function to create arguments based on the node
#
mkArgs = node: rec {
lib = nixpkgs.${version node}.lib // {
extra = nix-lib;
};
lib = sourcePkgs.lib.extend bootstrap.overlays.lib;
meta = (import ./meta) lib;
sourcePkgs = nodePkgs node;
meta = metadata;
nodeMeta = meta.nodes.${node};
nodeMeta = metadata.nodes.${node};
nodePath = "machines/${category node}/${node}";
};
##########
# Module for each node (quite empty since almost everything is in the default module)
#
mkNode = node: {
deployment.systemType = system node;
};
in
{
meta = {
nodeNixpkgs = nix-lib.mapSingleFuse (n: nixpkgs.${version n}) nodes;
nixpkgs = import nixpkgs.nixos.unstable.path;
nodeNixpkgs = mapSingleFuse nodePkgs nodes;
specialArgs = {
inherit nixpkgs sources;
inherit bootstrap nixpkgs sources;
dgn-keys = import ./keys;
dgn-keys = import ./lib/keys {
meta = metadata;
inherit lib;
};
};
nodeSpecialArgs = nix-lib.mapSingleFuse mkArgs nodes;
nodeSpecialArgs = mapSingleFuse mkArgs nodes;
};
defaults =
{
pkgs,
name,
nodeMeta,
...
}:
{
# Import the default modules
imports = [
./modules
(import "${sources.lix-module}/module.nix" {
lix = pkgs.applyPatches {
name = "lix-2.90.patched";
src = sources.lix;
patches = [ ./patches/00-disable-installChecks-lix.patch ];
};
registry = {
zyxel-nwa50ax = {
evalConfig =
args:
(import "${sources.liminix}/lib/eval-config.nix" {
nixpkgs = args.specialArgs.sourcePkgs.path;
})
];
args;
# Include default secrets
age-secrets.sources = [ ./machines/${name}/secrets ];
# Deployment config is specified in meta.nodes.${node}.deployment
inherit (nodeMeta) deployment;
nix = {
# Set NIX_PATH to the patched version of nixpkgs
nixPath = [ "nixpkgs=${mkNixpkgs' (version name)}" ];
optimise.automatic = true;
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
defaults =
{ name, nodePath, ... }:
{
# Import the default modules
imports = [
# Import the base configuration for each node
./${nodePath}/_configuration.nix
./modules/generic
./modules/${category name}
];
# It's impure, but who cares?
# Can Flakes even do that? :)
nixpkgs.buildPlatform = builtins.currentSystem;
};
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# Use the stateVersion declared in the metadata
system = {
inherit (nodeMeta) stateVersion;
};
};
netconf = {
evalConfig = nixpkgs.nixos.unstable.lib.evalModules;
defaults =
{
name,
nodeMeta,
nodePath,
...
}:
{
_module.args = {
pkgs = nixpkgs.nixos.unstable;
};
# Import the default modules
imports = [
# Import the base configuration for each node
./${nodePath}.nix
./modules/netconf
./lib/netconf-junos
"${sources.nixos-unstable}/nixos/modules/misc/assertions.nix"
];
system.host-name = name;
inherit (nodeMeta) deployment;
};
};
nixos = {
evalConfig = args: import "${args.specialArgs.sourcePkgs.path}/nixos/lib/eval-config.nix" args;
defaults =
{
lib,
name,
nodes,
nodeMeta,
nodePath,
meta,
sourcePkgs,
...
}:
{
# Import the default modules
imports = [
# Import the base configuration for each node
./${nodePath}/_configuration.nix
./modules/generic
(import "${sources.lix-module}/module.nix" { inherit (sources) lix; })
./modules/${category name}
];
_module.args.serverNodes = lib.filterAttrs (
name: _: meta.nodes.${name}.nixpkgs.system == "nixos"
) nodes;
# Include default secrets
age-secrets.sources = [ ./${nodePath}/secrets ];
# Deployment config is specified in meta.nodes.${node}.deployment
inherit (nodeMeta) deployment;
# Set NIX_PATH to the patched version of nixpkgs
environment.etc.nixpkgs.source = builtins.storePath sourcePkgs.path;
nix.nixPath = [ "nixpkgs=/etc/nixpkgs" ];
nix = {
optimise.automatic = true;
gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 7d";
};
settings = {
extra-experimental-features = [ "nix-command" ];
} // ((import ./. { pkgs = sourcePkgs; }).mkCacheSettings [ "infra" ]);
};
# Allow unfree packages
nixpkgs = {
config.allowUnfree = true;
overlays = [
(self: _: {
lix-diff = self.callPackage (sources.lix-diff + "/package.nix") { };
})
];
};
# Use the stateVersion declared in the metadata
system = {
inherit (nodeMeta) stateVersion;
};
};
};
};
}
// (nix-lib.mapSingleFuse mkNode nodes)
// (mapSingleFuse mkNode nodes)

View file

@ -1,5 +0,0 @@
#!/usr/bin/env bash
NIXPKGS=$(nix-build --no-out-link nixpkgs.nix)
nixos-generate -c configuration.nix -I NIX_PATH="$NIXPKGS" -f install-iso

View file

@ -1,38 +0,0 @@
{ lib, pkgs, ... }:
let
dgn-keys = import ../keys;
dgn-members = (import ../meta lib).organization.groups.root;
in
{
imports = [ ./dgn-install ];
boot = {
blacklistedKernelModules = [ "snd_pcsp" ];
kernelPackages = pkgs.linuxPackages_latest;
tmp.cleanOnBoot = true;
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
supportedFilesystems = [
"exfat"
"zfs"
"bcachefs"
];
swraid.enable = lib.mkForce false;
};
console.keyMap = "fr";
services = {
openssh.enable = true;
};
users.users.root.openssh.authorizedKeys.keys = dgn-keys.getKeys dgn-members;
}

View file

@ -1 +0,0 @@
Script pour installer automatiquement NixOS sur les machines de la DGNum

View file

@ -1,20 +0,0 @@
{ pkgs, ... }:
let
installScript = pkgs.writeShellApplication {
name = "dgn-install";
runtimeInputs = with pkgs; [
coreutils
gnused
nixos-install-tools
zfs
];
text = builtins.readFile ./dgn-install.sh;
};
in
{
environment.systemPackages = [ installScript ];
}

View file

@ -1,149 +0,0 @@
bootDevice=
rootDevice=
domain="par01.infra.dgnum.eu"
hostname="dgn0x"
hasZFS=
while [ "$#" -gt 0 ]; do
i="$1"
shift 1
case "$i" in
--root)
rootDevice="$1"
shift 1
;;
--boot)
bootDevice="$1"
shift 1
;;
--swap)
swapDevice="$1"
shift 1
;;
--domain)
domain="$1"
shift 1
;;
--hostname)
hostname="$1"
shift 1
;;
--with-zfs)
hasZFS="1"
;;
*)
echo "$0: unknown option \`$i'"
exit 1
;;
esac
done
if [ -z "$bootDevice" ]; then
echo "Missing boot partition"
exit 1
fi
if [ -z "$rootDevice" ]; then
echo "Missing root partition"
exit 1
fi
# Mount the partitions to where they should be
mount "$rootDevice" /mnt
mkdir /mnt/boot
mount "$bootDevice" /mnt/boot
if [ -n "$swapDevice" ]; then
swapon "$swapDevice"
fi
# Generate configration
nixos-generate-config --root /mnt
NIX="/mnt/etc/nixos/"
# Setup our own files
mv $NIX/configuration.nix $NIX/base-configuration.nix
cat <<EOF > $NIX/dgnum-server.nix
{ ... }: {
services.nscd.enableNsncd = false;
programs.bash.promptInit = ''
# Provide a nice prompt if the terminal supports it.
if [ "\$TERM" != "dumb" ] || [ -n "\$INSIDE_EMACS" ]; then
PROMPT_COLOR="1;31m"
((UID)) && PROMPT_COLOR="1;32m"
if [ -n "\$INSIDE_EMACS" ] || [ "\$TERM" = "eterm" ] || [ "\$TERM" = "eterm-color" ]; then
# Emacs term mode doesn't support xterm title escape sequence (\e]0;)
PS1="\n\[\033[\$PROMPT_COLOR\][\u@\$(hostname -f):\w]\\\$\[\033[0m\] "
else
PS1="\n\[\033[\$PROMPT_COLOR\][\[\e]0;\u@\H: \w\a\]\u@\$(hostname -f):\w]\\\$\[\033[0m\] "
fi
if test "\$TERM" = "xterm"; then
PS1="\[\033]2;\$(hostname -f):\u:\w\007\]\$PS1"
fi
fi
'';
}
EOF
cat <<EOF > $NIX/configuration.nix
{ pkgs, ... }: {
imports = [
./base-configuration.nix
./dgnum-server.nix
$(if [ -n "$hasZFS" ]; then echo './zfs.nix'; fi)
];
boot.tmp.cleanOnBoot = true;
console.keyMap = "fr";
time.timeZone = "Europe/Paris";
environment.systemPackages = with pkgs; [
vim
wget
kitty.terminfo
];
networking = {
hostName = "$hostname";
domain = "$domain";
};
# Activate SSH and set the keys
services.openssh = {
enable = true;
settings.PasswordAuthentication = false;
};
users.users.root.openssh.authorizedKeys.keyFiles = [ ./rootKeys ];
}
EOF
if [ -n "$hasZFS" ]; then
cat <<EOF > $NIX/zfs.nix
{ ... }: {
boot = {
supportedFilesystems = [ "zfs" ];
zfs.forceImportRoot = false;
zfs.extraPools = [
$(zpool list -Ho name | sed 's/^/"/;s/$/"/')
];
};
networking.hostId = "$(head -c4 /dev/urandom | od -A none -t x4 | sed 's/ //')";
}
EOF
fi
# Copy the keys
cp /etc/ssh/authorized_keys.d/root $NIX/rootKeys
# Perform the installation
nixos-install

View file

@ -1,9 +0,0 @@
let
version = (import ../meta/nixpkgs.nix).default;
nixpkgs = (import ../npins)."nixos-${version}";
in
(import nixpkgs { }).srcOnly {
name = "nixpkgs-for-iso";
src = nixpkgs;
}

13
keys.nix Normal file
View file

@ -0,0 +1,13 @@
# SPDX-FileCopyrightText: 2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
let
bootstrap = import ./bootstrap.nix;
inherit (bootstrap.pkgs) lib;
meta = import ./meta lib;
in
import ./lib/keys { inherit meta lib; }

View file

@ -1,80 +0,0 @@
let
_sources = import ../npins;
meta = import ../meta (import _sources.nixpkgs { }).lib;
getAttr = flip builtins.getAttr;
inherit (import ../lib/nix-lib) flip setDefault unique;
in
rec {
# WARNING: When updating this list, make sure that the nodes and members are alphabetically sorted
# If not, you will face an angry maintainer
_keys = {
# SSH keys of the nodes
bridge01 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP5bS3iBXz8wycBnTvI5Qi79WLu0h4IVv/EOdKYbP5y7" ];
compute01 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/YluSVS+4h3oV8CIUj0OmquyJXju8aEQy0Jz210vTu" ];
geo01 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEl6Pubbau+usQkemymoSKrTBbrX8JU5m5qpZbhNx8p4" ];
geo02 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFNXaCS0/Nsu5npqQk1TP6wMHCVIOaj4pblp2tIg6Ket" ];
krz01 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP4o65gWOgNrxbSd3kiQIGZUM+YD6kuZOQtblvzUGsfB" ];
rescue01 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEJa02Annu8o7ggPjTH/9ttotdNGyghlWfU9E8pnuLUf" ];
storage01 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA0s+rPcEcfWCqZ4B2oJiWT/60awOI8ijL1rtDM2glXZ" ];
vault01 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJA6VA7LENvTRlKdcrqt8DxDOPvX3bg3Gjy9mNkdFEW" ];
web01 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPR+lewuJ/zhCyizJGJOH1UaAB699ItNKEaeuoK57LY5" ];
web02 = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID+QDE+GgZs6zONHvzRW15BzGJNW69k2BFZgB/Zh/tLX" ];
# SSH keys of the DGNum members
catvayor = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAA16foz+XzwKwyIR4wFgNIAE3Y7AfXyEsUZFVVz8Rie catvayor@katvayor"
];
ecoppens = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIGmU7yEOCGuGNt4PlQbzd0Cms1RePpo8yEA7Ij/+TdA" ];
gdd = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICE7TN5NQKGojNGIeTFiHjLHTDQGT8i05JFqX/zLW2zc"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFbkPWWZzOBaRdx4+7xQUgxDwuncSl2fxAeVuYfVUPZ"
];
jemagius = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOoxmou5OU74GgpIUkhVt6GiB+O9Jy4ge0TwK5MDFJ2F"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxQX0JLRah3GfIOkua4ZhEJhp5Ykv55RO0SPrSUwCBs5arnALg8gq12YLr09t4bzW/NA9/jn7flhh4S54l4RwBUhmV4JSQhGu71KGhfOj5ZBkDoSyYqzbu206DfZP5eQonSmjfP6XghcWOr/jlBzw9YAAQkFxsQgXEkr4kdn0ZXfZGz6b0t3YUjYIuDNbptFsGz2V9iQVy1vnxrjnLSfc25j4et8z729Vpy4M7oCaE6a6hgon4V1jhVbg43NAE5gu2eYFAPIzO3E7ZI8WjyLu1wtOBClk1f+HMen3Tr+SX2PXmpPGb+I2fAkbzu/C4X/M3+2bL1dYjxuvQhvvpAjxFwmdoXW4gWJ3J/FRiFrKsiAY0rYC+yi8SfacJWCv4EEcV/yQ4gYwpmU9xImLaro6w5cOHGCqrzYqjZc4Wi6AWFGeBSNzNs9PXLgMRWeUyiIDOFnSep2ebZeVjTB16m+o/YDEhE10uX9kCCx3Dy/41iJ1ps7V4JWGFsr0Fqaz8mu8="
];
luj = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDMBW7rTtfZL9wtrpCVgariKdpN60/VeAzXkh9w3MwbO julien@enigma"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGa+7n7kNzb86pTqaMn554KiPrkHRGeTJ0asY1NjSbpr julien@tower"
];
mdebray = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpwF+XD3HgX64kqD42pcEZRNYAWoO4YNiOm5KO4tH6o maurice@polaris"
];
raito = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcEkYM1r8QVNM/G5CxJInEdoBCWjEHHDdHlzDYNSUIdHHsn04QY+XI67AdMCm8w30GZnLUIj5RiJEWXREUApby0GrfxGGcy8otforygfgtmuUKAUEHdU2MMwrQI7RtTZ8oQ0USRGuqvmegxz3l5caVU7qGvBllJ4NUHXrkZSja2/51vq80RF4MKkDGiz7xUTixI2UcBwQBCA/kQedKV9G28EH+1XfvePqmMivZjl+7VyHsgUVj9eRGA1XWFw59UPZG8a7VkxO/Eb3K9NF297HUAcFMcbY6cPFi9AaBgu3VC4eetDnoN/+xT1owiHi7BReQhGAy/6cdf7C/my5ehZwD"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE0xMwWedkKosax9+7D2OlnMxFL/eV4CvFZLsbLptpXr"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiXXYkhRh+s7ixZ8rvG8ntIqd6FELQ9hh7HoaHQJRPU"
];
thubrecht = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+EZXYziiaynJX99EW8KesnmRTZMof3BoIs3mdEl8L3"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHL4M4HKjs4cjRAYRk9pmmI8U0R4+T/jQh6Fxp/i1Eoy"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPM1jpXR7BWQa7Sed7ii3SbvIPRRlKb3G91qC0vOwfJn"
];
};
getKeys = ls: builtins.concatLists (builtins.map (getAttr _keys) ls);
mkSecrets =
nodes: setDefault { publicKeys = unique (rootKeys ++ (builtins.concatMap getNodeKeys' nodes)); };
getNodeKeys' =
node:
let
names = builtins.foldl' (names: group: names ++ meta.organization.groups.${group}) (
meta.nodes.${node}.admins ++ [ node ]
) meta.nodes.${node}.adminGroups;
in
unique (getKeys names);
getNodeKeys = node: rootKeys ++ getNodeKeys' node;
# List of keys for the root group
rootKeys = getKeys meta.organization.groups.root;
# List of 'machine' keys
machineKeys = rootKeys ++ (getKeys (builtins.attrNames meta.nodes));
}

View file

@ -28,4 +28,4 @@ if [[ $1 == 'apply' ]]; then
doChecks
fi
exec @colmena@ "$@"
exec @colmena@ --nix-option nix-path "" "$@"

58
lib/keys/default.nix Normal file
View file

@ -0,0 +1,58 @@
# SPDX-FileCopyrightText: 2024 Ryan Lahfa <ryan.lahfa@dgnum.eu>
# SPDX-FileCopyrightText: 2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>
# SPDX-FileContributor: Maurice Debray <maurice.debray@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{ meta, lib }:
let
inherit (lib.extra) setDefault;
getAttr = lib.flip builtins.getAttr;
in
rec {
_memberKeys = builtins.mapAttrs (_: v: v.sshKeys) meta.organization.members;
_ageKeys = builtins.mapAttrs (_: v: v.ageSshKeys) meta.organization.members;
_builderKeys = builtins.mapAttrs (_: v: v.builderKeys) meta.organization.members;
_nodeKeys = builtins.mapAttrs (_: v: v.sshKeys) meta.nodes;
# Get keys of the users
getMemberKeys = name: builtins.concatLists (builtins.map (getAttr _memberKeys) name);
# Get age-keys of the users
getAgeKeys = name: builtins.concatLists (builtins.map (getAttr _ageKeys) name);
# Get builder keys of the users
getBuilderKeys = getAttr _builderKeys;
# Get keys of the ssh server
getNodeKeys = name: builtins.concatLists (builtins.map (getAttr _nodeKeys) name);
# List of keys for the root group
rootKeys = getMemberKeys meta.organization.groups.root;
# List of keys for the root group (for age encryption and decryption)
rootAgeKeys = getAgeKeys meta.organization.groups.root;
# All admins for a node
getNodeAdmins = node: meta.organization.groups.root ++ meta.nodes.${node}.admins;
# All keys needed for secret encryption
getSecretKeys = node: lib.unique (getAgeKeys (getNodeAdmins node) ++ getNodeKeys [ node ]);
# List of keys for all machines wide secrets
machineKeys = rootAgeKeys ++ (getNodeKeys (builtins.attrNames meta.nodes));
mkSecrets = nodes: setDefault { publicKeys = lib.unique (builtins.concatMap getSecretKeys nodes); };
mkRootSecrets = setDefault { publicKeys = lib.unique rootAgeKeys; };
machineKeysBySystem =
system:
rootAgeKeys
++ (getNodeKeys (
builtins.attrNames (lib.filterAttrs (_: v: v.nixpkgs.system == system) meta.nodes)
));
}

View file

@ -0,0 +1,141 @@
# SPDX-FileCopyrightText: 2025 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{ config, lib, ... }:
let
inherit (lib)
concatImapStringsSep
concatMapAttrsStringSep
concatMapStrings
mkOption
;
inherit (lib.types)
attrsOf
ints
listOf
str
submodule
;
in
{
options = {
access.address-assignment.pool = mkOption {
type = attrsOf (
submodule (
{ name, config, ... }:
{
options = {
family.inet = {
network = mkOption {
type = str;
description = ''
Network where this pool is located.
'';
};
ranges = mkOption {
type = listOf (submodule {
options = {
low = mkOption {
type = str;
description = ''
Lowest IP of this range.
'';
};
high = mkOption {
type = str;
description = ''
Highest IP of this range.
'';
};
};
});
description = ''
IP ranges in this pool.
'';
};
dhcp-attributes = {
maximum-lease-time = mkOption {
type = ints.unsigned;
description = ''
Maximum lease time for leases in this pool.
'';
};
name-server = mkOption {
type = listOf str;
default = [ ];
description = ''
DNS servers to propose.
'';
};
router = mkOption {
type = listOf str;
default = [ ];
description = ''
Router IP for default route.
'';
};
};
};
xml = mkOption {
type = str;
readOnly = true;
visible = false;
};
};
config.xml =
let
inet-cfg = config.family.inet;
in
''
<pool>
<name>${name}</name>
<family>
<inet>
<network>${inet-cfg.network}</network>
${concatImapStringsSep "\n" (
idx:
{ low, high }:
''
<range>
<name>${name}-${toString idx}</name>
<low>${low}</low>
<high>${high}</high>
</range>
''
) inet-cfg.ranges}
<dhcp-attributes>
<maximum-lease-time>${toString inet-cfg.dhcp-attributes.maximum-lease-time}</maximum-lease-time>
${concatMapStrings (
dns: "<name-server><name>${dns}</name></name-server>"
) inet-cfg.dhcp-attributes.name-server}
${concatMapStrings (
router: "<router><name>${router}</name></router>"
) inet-cfg.dhcp-attributes.router}
</dhcp-attributes>
</inet>
</family>
</pool>
'';
}
)
);
default = { };
description = ''
Address pools for DHCP configuration.
'';
};
netconf.xmls.access = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.netconf.xmls.access = ''
<access operation="replace">
<address-assignment>
${concatMapAttrsStringSep "\n" (_: pool: pool.xml) config.access.address-assignment.pool}
</address-assignment>
</access>
'';
}

View file

@ -0,0 +1,126 @@
# SPDX-FileCopyrightText: 2024 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{
config,
lib,
pkgs,
name,
...
}:
let
inherit (lib) mapAttrs mkOption;
inherit (lib.types)
attrs
attrsOf
bool
str
submodule
package
;
mandatory.options = {
supportPoE = mkOption {
type = bool;
example = true;
description = ''
Whether this interface supports PoE.
'';
};
};
in
{
imports = [
./access.nix
./interfaces.nix
./poe.nix
./protocols.nix
./system.nix
./vlans.nix
./routing-options.nix
./snmp.nix
];
options = {
# Hack because of this https://git.dgnum.eu/DGNum/colmena/src/commit/71b1b660f2cda2e34e134d0028cafbd56bb22008/src/nix/hive/eval.nix#L166 which defines nixpkgs option but we don't have it here. What about liminix ?
nixpkgs = mkOption {
type = attrs;
default = { };
visible = false;
};
netconf = {
xmls.configuration = mkOption {
type = str;
readOnly = true;
description = ''
The full configuration to send to a JunOS.
'';
};
mandatoryInterfaces = mkOption {
type = attrsOf (submodule mandatory);
example = {
"ge-0/0/0" = {
supportPoE = true;
};
"ge-0/0/1" = {
supportPoE = true;
};
"xe-0/0/0" = {
supportPoE = false;
};
};
description = ''
JunOS require some interfaces to always be configured (even if they are disabled),
which correspond to physical interfaces of the switch. They have to be declared here
with some information about it (only if it supports PoE for now).
'';
};
rpc = mkOption {
type = package;
readOnly = true;
description = ''
The final rpc xml to send via netconf.
'';
};
};
};
config = {
interfaces =
let
mkIntf = _: _: { };
in
mapAttrs mkIntf config.netconf.mandatoryInterfaces;
netconf = {
xmls.configuration = with config.netconf.xmls; ''
<configuration>
${system}
${interfaces}
${protocols}
${vlans}
${poe}
${access}
${routing-options}
${snmp}
</configuration>
'';
rpc = pkgs.writeText "${name}.rpc" ''
<rpc>
<edit-config>
<config>
${config.netconf.xmls.configuration}
</config>
<target>
<candidate/>
</target>
</edit-config>
</rpc>
<rpc>
<commit/>
</rpc>
'';
};
};
}

View file

@ -0,0 +1,189 @@
# SPDX-FileCopyrightText: 2024 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{ config, lib, ... }:
let
inherit (lib)
mapAttrsToList
mkEnableOption
mkOption
optionalString
;
inherit (lib.types)
attrsOf
either
enum
ints
listOf
str
submodule
;
interface =
{ name, config, ... }:
let
intf_cfg = config;
unit =
{ name, config, ... }:
{
options = {
enable = mkEnableOption "this logical interface" // {
default = true;
example = false;
};
description = mkOption {
type = str;
default = intf_cfg.description + "." + name;
description = ''
Descriptive name of this interface unit.
'';
};
family = {
ethernet-switching = {
enable = mkEnableOption "the ethernet switching on this logical interface";
interface-mode = mkOption {
type = enum [
"trunk"
"access"
];
description = ''
Mode of operation for vlan addressing of this interface.
"trunk" means that the traffic is tagged, "access" means the
traffic is tagged by the switch.
'';
};
vlans = mkOption {
type = listOf (either str ints.unsigned);
default = [ ];
description = ''
Vlans that can be used on this interface.
Only one ID should be here for "access" mode of operation.
'';
};
};
#TODO : DHCP
inet = {
enable = mkEnableOption "the IPv4 configuration of this logical interface";
addresses = mkOption {
type = listOf str;
default = [ ];
description = ''
ipv4 addresses of this interface.
'';
};
};
inet6 = {
enable = mkEnableOption "the IPv6 configuration of this logical interface";
addresses = mkOption {
type = listOf str;
default = [ ];
description = ''
ipv6 addresses of this interface.
'';
};
};
};
xml = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.xml =
let
members = map (
vlan: "<members>${builtins.toString vlan}</members>"
) config.family.ethernet-switching.vlans;
eth = optionalString config.family.ethernet-switching.enable ''
<ethernet-switching>
<interface-mode>${config.family.ethernet-switching.interface-mode}</interface-mode>
<vlan>${builtins.concatStringsSep "" members}</vlan>
<storm-control><profile-name>default</profile-name></storm-control>
</ethernet-switching>
'';
addr4 = map (addr: "<address><name>${addr}</name></address>") config.family.inet.addresses;
inet = optionalString config.family.inet.enable ''
<inet>
${builtins.concatStringsSep "" addr4}
</inet>
'';
addr6 = map (addr: "<address><name>${addr}</name></address>") config.family.inet6.addresses;
inet6 = optionalString config.family.inet6.enable ''
<inet6>
${builtins.concatStringsSep "" addr6}
</inet6>
'';
in
''
<unit>
<name>${name}</name>
${optionalString (!config.enable) "<disable/>"}
${optionalString config.enable "<description>${config.description}</description>"}
<family>
${eth}${inet}${inet6}
</family>
</unit>'';
};
in
{
options = {
enable = mkEnableOption "this physical interface";
unit = mkOption {
type = attrsOf (submodule unit);
default = { };
description = ''
Configuration of the logical interfaces on this physical interface.
'';
};
description = mkOption {
type = str;
default = name;
description = ''
Descriptive name of this interface.
'';
};
xml = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.xml =
let
units = mapAttrsToList (_: unit: unit.xml) config.unit;
in
''
<interface>
<name>${name}</name>
${optionalString config.enable "<description>${config.description}</description>"}
${optionalString (!config.enable) "<disable/>"}
${builtins.concatStringsSep "" units}
</interface>
'';
};
in
{
options = {
interfaces = mkOption {
type = attrsOf (submodule interface);
description = ''
The interfaces configuration.
'';
};
netconf.xmls.interfaces = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.netconf.xmls.interfaces = ''
<interfaces operation="replace">
${builtins.concatStringsSep "" (mapAttrsToList (_: intf: intf.xml) config.interfaces)}
</interfaces>
'';
}

53
lib/netconf-junos/poe.nix Normal file
View file

@ -0,0 +1,53 @@
# SPDX-FileCopyrightText: 2024 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{ config, lib, ... }:
let
inherit (lib)
mapAttrsToList
mkEnableOption
mkOption
optionalString
;
inherit (lib.types) attrsOf str submodule;
interface-module =
{ name, config, ... }:
{
options = {
enable = mkEnableOption "the PoE for this interface";
xml = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.xml = ''
<interface><name>${name}</name>${optionalString (!config.enable) "<disable/>"}</interface>
'';
};
in
{
options = {
poe.interfaces = mkOption {
type = attrsOf (submodule interface-module);
default = { };
description = ''
PoE configuration of interfaces.
'';
};
netconf.xmls.poe = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.netconf.xmls.poe = ''
<poe operation="replace">
${builtins.concatStringsSep "" (mapAttrsToList (_: intf: intf.xml) config.poe.interfaces)}
</poe>
'';
}

View file

@ -0,0 +1,37 @@
# SPDX-FileCopyrightText: 2024 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{ config, lib, ... }:
let
inherit (lib) concatMapStringsSep mkOption;
inherit (lib.types) listOf str;
in
{
options = {
protocols.rstp = mkOption {
type = listOf str;
description = ''
List of interfaces on which Rapid Spanning Tree Protocol should be enabled.
'';
};
netconf.xmls.protocols = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.netconf.xmls.protocols = ''
<protocols>
<rstp operation="replace">
${concatMapStringsSep "" (
intf: "<interface><name>${intf}</name></interface>"
) config.protocols.rstp}
</rstp>
</protocols>
'';
}

View file

@ -0,0 +1,59 @@
# SPDX-FileCopyrightText: 2025 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{ config, lib, ... }:
let
inherit (lib)
concatMapStringsSep
mkOption
;
inherit (lib.types)
str
listOf
submodule
;
in
{
options = {
routing-options.static.route = mkOption {
type = listOf (submodule {
options = {
destination = mkOption {
type = str;
description = ''
Destination network.
'';
};
next-hop = mkOption {
type = str;
description = ''
Gateway for this network.
'';
};
};
});
default = [ ];
description = ''
Static routes.
'';
};
netconf.xmls.routing-options = mkOption {
type = str;
readOnly = true;
visible = false;
};
};
config.netconf.xmls.routing-options = ''
<routing-options operation="replace">
<static>
${concatMapStringsSep "\n" (route: ''
<route>
<name>${route.destination}</name>
<next-hop>${route.next-hop}</next-hop>
</route>
'') config.routing-options.static.route}
</static>
</routing-options>
'';
}

View file

@ -0,0 +1,80 @@
# SPDX-FileCopyrightText: 2025 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{ lib, config, ... }:
let
inherit (lib)
concatMapAttrsStringSep
mkOption
optionalString
;
inherit (lib.types)
attrsOf
bool
enum
str
submodule
;
in
{
options = {
snmp = {
filter-interfaces.all-internal-interfaces = mkOption {
type = bool;
default = false;
description = ''
Whether to filter internal interfaces.
'';
};
community = mkOption {
type = attrsOf (
submodule (
{ name, config, ... }:
{
options = {
authorization = mkOption {
type = enum [
"read-only"
"read-write"
];
description = ''
Authorization type.
'';
};
xml = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.xml = ''
<community>
<name>${name}</name>
<authorization>${config.authorization}</authorization>
</community>
'';
}
)
);
default = { };
description = ''
Communities for SNMPv2 access.
'';
};
};
netconf.xmls.snmp = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.netconf.xmls.snmp = ''
<snmp operation="replace">
<filter-interfaces>
${optionalString config.snmp.filter-interfaces.all-internal-interfaces "<all-internal-interfaces/>"}
</filter-interfaces>
${concatMapAttrsStringSep "" (_: comm: comm.xml) config.snmp.community}
</snmp>
'';
}

View file

@ -0,0 +1,128 @@
# SPDX-FileCopyrightText: 2024 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{ config, lib, ... }:
let
inherit (lib)
concatMapAttrsStringSep
concatMapStrings
concatStrings
concatStringsSep
filter
hasPrefix
length
mkOption
optionalString
splitString
;
inherit (lib.types)
attrsOf
enum
listOf
port
str
submodule
;
in
{
options = {
system = {
host-name = mkOption {
type = str;
description = "The hostname of the switch.";
};
root-authentication = {
hashedPasswd = mkOption {
type = str;
description = "Hashed password for root.";
};
ssh-keys = mkOption {
type = listOf str;
description = "ssh keys for root user.";
default = [ ];
};
};
services = {
ssh.root-login = mkOption {
type = enum [
"allow"
"deny"
"deny-password"
];
description = "Login policy to use for root.";
};
netconf.port = mkOption {
type = port;
description = "Port to use for netconf.";
default = 830;
};
dhcp-local-server.group = mkOption {
type = attrsOf (submodule {
options.interfaces = mkOption {
type = listOf str;
description = ''
Interfaces managed by this group.
'';
};
});
default = { };
description = ''
Groups of configuration for DHCP server.
'';
};
};
};
netconf.xmls.system = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.netconf.xmls.system =
let
ssh-keys1 = map (splitString " ") config.system.root-authentication.ssh-keys;
ssh-keys2 = map (key: if length key < 3 then key ++ [ "foo@bar" ] else key) ssh-keys1;
ssh-keys = map (concatStringsSep " ") ssh-keys2;
edsca = map (key: "<ssh-edsca><name>${key}</name></ssh-edsca>") (
filter (hasPrefix "ssh-edsca ") ssh-keys
);
rsa = map (key: "<ssh-rsa><name>${key}</name></ssh-rsa>") (filter (hasPrefix "ssh-rsa ") ssh-keys);
ed25519 = map (key: "<ssh-ed25519><name>${key}</name></ssh-ed25519>") (
filter (hasPrefix "ssh-ed25519 ") ssh-keys
);
dhcp-local = optionalString (config.system.services.dhcp-local-server.group != { }) ''
<dhcp-local-server>
${concatMapAttrsStringSep "\n" (name: cfg: ''
<group>
<name>${name}</name>
<interface>
${concatMapStrings (intf: "<name>${intf}</name>") cfg.interfaces}
</interface>
</group>
'') config.system.services.dhcp-local-server.group}
</dhcp-local-server>
'';
in
''
<system>
<host-name operation="replace">${config.system.host-name}</host-name>
<root-authentication operation="replace">
<encrypted-password>${config.system.root-authentication.hashedPasswd}</encrypted-password>
${concatStrings (edsca ++ rsa ++ ed25519)}
</root-authentication>
<services operation="replace">
<ssh><root-login>${config.system.services.ssh.root-login}</root-login></ssh>
<netconf>
<ssh><port>${toString config.system.services.netconf.port}</port></ssh>
<rfc-compliant/><yang-compliant/>
</netconf>
${dhcp-local}
</services>
</system>
'';
}

135
lib/netconf-junos/vlans.nix Normal file
View file

@ -0,0 +1,135 @@
# SPDX-FileCopyrightText: 2024 Lubin Bailly <lubin.bailly@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
{ config, lib, ... }:
let
inherit (lib)
assertMsg
concatStringsSep
mapAttrsToList
mkOption
optionalString
;
inherit (lib.types)
attrsOf
either
ints
listOf
nullOr
str
submodule
unspecified
;
vlan =
{ name, config, ... }:
{
options = {
id = mkOption {
type = nullOr ints.unsigned;
default = null;
description = ''
The ID of this vlan, `null` means no ID.
Incompatible with vlans.${name}.id-list.
'';
};
id-list = mkOption {
type =
let
range_type =
{ config, ... }:
{
config.__toString = _: "${toString config.begin}-${toString config.end}";
options = {
begin = mkOption {
type = ints.unsigned;
visible = false;
};
end = mkOption {
type = ints.unsigned;
visible = false;
};
__toString = mkOption {
visible = false;
internal = true;
readOnly = true;
type = unspecified;
};
};
};
in
listOf (either ints.unsigned (submodule range_type));
default = [ ];
example = [
42
{
begin = 100;
end = 200;
}
];
description = ''
List of IDs or IDs range to classify as this vlan.
Incompatible with vlans.${name}.id.
'';
};
l3-interface = mkOption {
type = nullOr str;
default = null;
example = "irb.0";
description = ''
Switch's logical interface to connect directly to this vlan.
This allows to communicate with the switch from a vlan without
having a cable looping back on it's management interface.
'';
};
xml = mkOption {
type = str;
readOnly = true;
visible = false;
};
};
config.xml =
let
id = optionalString (config.id != null) "<vlan-id>${toString config.id}</vlan-id>";
id-list = concatStringsSep "" (
map (vlan: "<vlan-id-list>${toString vlan}</vlan-id-list>") config.id-list
);
l3-intf = optionalString (
config.l3-interface != null
) "<l3-interface>${config.l3-interface}</l3-interface>";
in
assert assertMsg (
config.id == null || config.id-list == [ ]
) "vlans.${name}.id and vlans.${name}.id-list are incompatible.";
''
<vlan>
<name>${name}</name>
${id}${id-list}${l3-intf}
</vlan>
'';
};
in
{
options = {
vlans = mkOption {
type = attrsOf (submodule vlan);
description = ''
Named vlans configuration. Allows to name vlans inside interface configuration,
instead of just using their IDs.
'';
};
netconf.xmls.vlans = mkOption {
type = str;
visible = false;
readOnly = true;
};
};
config.netconf.xmls.vlans = ''
<vlans operation="replace">
${builtins.concatStringsSep "" (mapAttrsToList (_: vlan: vlan.xml) config.vlans)}
</vlans>
'';
}

View file

@ -1,49 +1,20 @@
# Copyright Tom Hubrecht, (2023)
# SPDX-FileCopyrightText: 2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>
#
# Tom Hubrecht <tom@hubrecht.ovh>
#
# This software is governed by the CeCILL license under French law and
# abiding by the rules of distribution of free software. You can use,
# modify and/ or redistribute the software under the terms of the CeCILL
# license as circulated by CEA, CNRS and INRIA at the following URL
# "http://www.cecill.info".
#
# As a counterpart to the access to the source code and rights to copy,
# modify and redistribute granted by the license, users are provided only
# with a limited warranty and the software's author, the holder of the
# economic rights, and the successive licensors have only limited
# liability.
#
# In this respect, the user's attention is drawn to the risks associated
# with loading, using, modifying and/or developing or reproducing the
# software by the user in light of its specific status of free software,
# that may mean that it is complicated to manipulate, and that also
# therefore means that it is reserved for developers and experienced
# professionals having in-depth computer knowledge. Users are therefore
# encouraged to load and test the software's suitability as regards their
# requirements in conditions enabling the security of their systems and/or
# data to be ensured and, more generally, to use and operate it in the
# same conditions as regards security.
#
# The fact that you are presently reading this means that you have had
# knowledge of the CeCILL license and that you accept its terms.
# SPDX-License-Identifier: EUPL-1.2
{ lib }:
let
# Reimplement optional functions
_optional =
default: b: value:
if b then value else default;
inherit (lib)
optionals
optionalString
listToAttrs
nameValuePair
recursiveUpdate
;
in
rec {
inherit (import ./nixpkgs.nix)
flip
hasPrefix
recursiveUpdate
splitString
unique
;
/*
Fuses a list of attribute sets into a single attribute set.
@ -77,6 +48,24 @@ rec {
attrsList:
fuseAttrs (builtins.map f attrsList);
/*
Generate an `attrsList` of given size with the generator before fusing
the resulting list of attribute sets.
Type: (Int -> attrs) -> Int -> attrs
Example:
f = s: { "a${toString s}" = s + s; }
genFuse f 3
=> { a0 = 0; a1 = 2; a2 = 4; }
*/
genFuse =
# Int -> attrs
f:
# Int
size:
fuseAttrs (builtins.genList f size);
/*
Equivalent of lib.singleton but for an attribute set.
@ -107,6 +96,11 @@ rec {
*/
mapSingleFuse = f: mapFuse (x: singleAttr x (f x));
# Like genAttrs but allows configuring the name
genAttrs' =
names: f: g:
listToAttrs (map (n: nameValuePair (f n) (g n)) names);
/*
Creates a relative path as a string
@ -136,11 +130,8 @@ rec {
subAttrs = attrs: builtins.map (subAttr attrs);
optionalList = _optional [ ];
optionalList = optionals;
optionalAttrs = _optional { };
optionalString = _optional "";
/*
Same as fuseAttrs but using `lib.recursiveUpdate` to merge attribute
sets together.
@ -190,8 +181,11 @@ rec {
recursiveFuse [
(enableModules enabledModules)
{ imports = mkImports root ([ "_hardware-configuration" ] ++ enabledServices); }
{
imports =
(extraConfig.imports or [ ]) ++ (mkImports root ([ "_hardware-configuration" ] ++ enabledServices));
}
extraConfig
(removeAttrs extraConfig [ "imports" ])
];
}

View file

@ -1,416 +0,0 @@
###
# Collection of nixpkgs library functions, those are necessary for defining our own lib
#
# They have been simplified and builtins are used in some places, instead of lib shims.
rec {
/**
Does the same as the update operator '//' except that attributes are
merged until the given predicate is verified. The predicate should
accept 3 arguments which are the path to reach the attribute, a part of
the first attribute set and a part of the second attribute set. When
the predicate is satisfied, the value of the first attribute set is
replaced by the value of the second attribute set.
# Inputs
`pred`
: Predicate, taking the path to the current attribute as a list of strings for attribute names, and the two values at that path from the original arguments.
`lhs`
: Left attribute set of the merge.
`rhs`
: Right attribute set of the merge.
# Type
```
recursiveUpdateUntil :: ( [ String ] -> AttrSet -> AttrSet -> Bool ) -> AttrSet -> AttrSet -> AttrSet
```
# Examples
:::{.example}
## `lib.attrsets.recursiveUpdateUntil` usage example
```nix
recursiveUpdateUntil (path: l: r: path == ["foo"]) {
# first attribute set
foo.bar = 1;
foo.baz = 2;
bar = 3;
} {
#second attribute set
foo.bar = 1;
foo.quz = 2;
baz = 4;
}
=> {
foo.bar = 1; # 'foo.*' from the second set
foo.quz = 2; #
bar = 3; # 'bar' from the first set
baz = 4; # 'baz' from the second set
}
```
:::
*/
recursiveUpdateUntil =
pred: lhs: rhs:
let
f =
attrPath:
builtins.zipAttrsWith (
n: values:
let
here = attrPath ++ [ n ];
in
if builtins.length values == 1 || pred here (builtins.elemAt values 1) (builtins.head values) then
builtins.head values
else
f here values
);
in
f [ ] [
rhs
lhs
];
/**
A recursive variant of the update operator //. The recursion
stops when one of the attribute values is not an attribute set,
in which case the right hand side value takes precedence over the
left hand side value.
# Inputs
`lhs`
: Left attribute set of the merge.
`rhs`
: Right attribute set of the merge.
# Type
```
recursiveUpdate :: AttrSet -> AttrSet -> AttrSet
```
# Examples
:::{.example}
## `lib.attrsets.recursiveUpdate` usage example
```nix
recursiveUpdate {
boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/hda";
} {
boot.loader.grub.device = "";
}
returns: {
boot.loader.grub.enable = true;
boot.loader.grub.device = "";
}
```
:::
*/
recursiveUpdate =
lhs: rhs:
recursiveUpdateUntil (
_: lhs: rhs:
!(builtins.isAttrs lhs && builtins.isAttrs rhs)
) lhs rhs;
/**
Determine whether a string has given prefix.
# Inputs
`pref`
: Prefix to check for
`str`
: Input string
# Type
```
hasPrefix :: string -> string -> bool
```
# Examples
:::{.example}
## `lib.strings.hasPrefix` usage example
```nix
hasPrefix "foo" "foobar"
=> true
hasPrefix "foo" "barfoo"
=> false
```
:::
*/
hasPrefix = pref: str: (builtins.substring 0 (builtins.stringLength pref) str == pref);
/**
Escape occurrence of the elements of `list` in `string` by
prefixing it with a backslash.
# Inputs
`list`
: 1\. Function argument
`string`
: 2\. Function argument
# Type
```
escape :: [string] -> string -> string
```
# Examples
:::{.example}
## `lib.strings.escape` usage example
```nix
escape ["(" ")"] "(foo)"
=> "\\(foo\\)"
```
:::
*/
escape = list: builtins.replaceStrings list (builtins.map (c: "\\${c}") list);
/**
Convert a string `s` to a list of characters (i.e. singleton strings).
This allows you to, e.g., map a function over each character. However,
note that this will likely be horribly inefficient; Nix is not a
general purpose programming language. Complex string manipulations
should, if appropriate, be done in a derivation.
Also note that Nix treats strings as a list of bytes and thus doesn't
handle unicode.
# Inputs
`s`
: 1\. Function argument
# Type
```
stringToCharacters :: string -> [string]
```
# Examples
:::{.example}
## `lib.strings.stringToCharacters` usage example
```nix
stringToCharacters ""
=> [ ]
stringToCharacters "abc"
=> [ "a" "b" "c" ]
stringToCharacters "🦄"
=> [ "<EFBFBD>" "<EFBFBD>" "<EFBFBD>" "<EFBFBD>" ]
```
:::
*/
stringToCharacters = s: builtins.genList (p: builtins.substring p 1 s) (builtins.stringLength s);
/**
Turn a string `s` into an exact regular expression
# Inputs
`s`
: 1\. Function argument
# Type
```
escapeRegex :: string -> string
```
# Examples
:::{.example}
## `lib.strings.escapeRegex` usage example
```nix
escapeRegex "[^a-z]*"
=> "\\[\\^a-z]\\*"
```
:::
*/
escapeRegex = escape (stringToCharacters "\\[{()^$?*+|.");
/**
Appends string context from string like object `src` to `target`.
:::{.warning}
This is an implementation
detail of Nix and should be used carefully.
:::
Strings in Nix carry an invisible `context` which is a list of strings
representing store paths. If the string is later used in a derivation
attribute, the derivation will properly populate the inputDrvs and
inputSrcs.
# Inputs
`src`
: The string to take the context from. If the argument is not a string,
it will be implicitly converted to a string.
`target`
: The string to append the context to. If the argument is not a string,
it will be implicitly converted to a string.
# Type
```
addContextFrom :: string -> string -> string
```
# Examples
:::{.example}
## `lib.strings.addContextFrom` usage example
```nix
pkgs = import <nixpkgs> { };
addContextFrom pkgs.coreutils "bar"
=> "bar"
```
The context can be displayed using the `toString` function:
```nix
nix-repl> builtins.getContext (lib.strings.addContextFrom pkgs.coreutils "bar")
{
"/nix/store/m1s1d2dk2dqqlw3j90jl3cjy2cykbdxz-coreutils-9.5.drv" = { ... };
}
```
:::
*/
addContextFrom = src: target: builtins.substring 0 0 src + target;
/**
Cut a string with a separator and produces a list of strings which
were separated by this separator.
# Inputs
`sep`
: 1\. Function argument
`s`
: 2\. Function argument
# Type
```
splitString :: string -> string -> [string]
```
# Examples
:::{.example}
## `lib.strings.splitString` usage example
```nix
splitString "." "foo.bar.baz"
=> [ "foo" "bar" "baz" ]
splitString "/" "/usr/local/bin"
=> [ "" "usr" "local" "bin" ]
```
:::
*/
splitString =
sep: s:
let
splits = builtins.filter builtins.isString (
builtins.split (escapeRegex (builtins.toString sep)) (builtins.toString s)
);
in
builtins.map (addContextFrom s) splits;
/**
Remove duplicate elements from the `list`. O(n^2) complexity.
# Inputs
`list`
: Input list
# Type
```
unique :: [a] -> [a]
```
# Examples
:::{.example}
## `lib.lists.unique` usage example
```nix
unique [ 3 2 3 4 ]
=> [ 3 2 4 ]
```
:::
*/
unique = builtins.foldl' (acc: e: if builtins.elem e acc then acc else acc ++ [ e ]) [ ];
/**
Flip the order of the arguments of a binary function.
# Inputs
`f`
: 1\. Function argument
`a`
: 2\. Function argument
`b`
: 3\. Function argument
# Type
```
flip :: (a -> b -> c) -> (b -> a -> c)
```
# Examples
:::{.example}
## `lib.trivial.flip` usage example
```nix
flip concat [1] [2]
=> [ 2 1 ]
```
:::
*/
flip =
f: a: b:
f b a;
}

View file

@ -1,32 +1,7 @@
# Copyright Tom Hubrecht, (2023-2024)
# SPDX-FileCopyrightText: 2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>
#
# Tom Hubrecht <tom@hubrecht.ovh>
#
# This software is governed by the CeCILL license under French law and
# abiding by the rules of distribution of free software. You can use,
# modify and/ or redistribute the software under the terms of the CeCILL
# license as circulated by CEA, CNRS and INRIA at the following URL
# "http://www.cecill.info".
#
# As a counterpart to the access to the source code and rights to copy,
# modify and redistribute granted by the license, users are provided only
# with a limited warranty and the software's author, the holder of the
# economic rights, and the successive licensors have only limited
# liability.
#
# In this respect, the user's attention is drawn to the risks associated
# with loading, using, modifying and/or developing or reproducing the
# software by the user in light of its specific status of free software,
# that may mean that it is complicated to manipulate, and that also
# therefore means that it is reserved for developers and experienced
# professionals having in-depth computer knowledge. Users are therefore
# encouraged to load and test the software's suitability as regards their
# requirements in conditions enabling the security of their systems and/or
# data to be ensured and, more generally, to use and operate it in the
# same conditions as regards security.
#
# The fact that you are presently reading this means that you have had
# knowledge of the CeCILL license and that you accept its terms.
# SPDX-License-Identifier: EUPL-1.2
{
patchFile,
@ -39,12 +14,15 @@ rec {
{ pkgs }:
rec {
mkUrlPatch =
attrs:
{
hash ? null,
...
}@attrs:
pkgs.fetchpatch (
{
hash = pkgs.lib.fakeHash;
hash = if hash == null then pkgs.lib.fakeHash else hash;
}
// attrs
// (builtins.removeAttrs attrs [ "hash" ])
// (pkgs.lib.optionalAttrs (excludeGitHubManual && !(builtins.hasAttr "includes" attrs)) {
excludes = (attrs.excludes or [ ]) ++ [ "nixos/doc/manual/*" ];
})
@ -93,15 +71,31 @@ rec {
src,
name,
patches ? mkPatches name,
}:
if patches == [ ] then
prePatch ? null,
postPatch ? null,
...
}@args:
if patches == [ ] && prePatch == null && postPatch == null then
src
else
pkgs.applyPatches {
inherit patches src;
pkgs.stdenvNoCC.mkDerivation (
args
// {
name = "${name}-patched";
name = "${name}-patched";
};
inherit patches prePatch postPatch;
preferLocalBuild = true;
allowSubstitutes = true;
phases = [
"unpackPhase"
"patchPhase"
"installPhase"
];
installPhase = "cp -R . $out";
}
);
applyPatches' = name: src: applyPatches { inherit name src; };
};

325
lon.lock generated Normal file
View file

@ -0,0 +1,325 @@
{
"version": "1",
"sources": {
"agenix": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "ryantm",
"repo": "agenix",
"branch": "main",
"revision": "531beac616433bac6f9e2a19feb8e99a22a66baf",
"url": "https://github.com/ryantm/agenix/archive/531beac616433bac6f9e2a19feb8e99a22a66baf.tar.gz",
"hash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA="
},
"arkheon": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "RaitoBezarius",
"repo": "arkheon",
"branch": "main",
"revision": "a30fa6f0b3ed4becef7696df82d77bc53fa3d46b",
"url": "https://github.com/RaitoBezarius/arkheon/archive/a30fa6f0b3ed4becef7696df82d77bc53fa3d46b.tar.gz",
"hash": "sha256-C0EgAyC90A6wqCwiRUNFcn8YnwleNjXFRTMe/dZ9EWE="
},
"cas-eleves": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "bdbb2a6c772144813bd75316080f5fecd2c5cc9e",
"url": "https://git.dgnum.eu/DGNum/cas-eleves.git",
"hash": "sha256-kQDO331t2YsrDoVGHzftU6Y96VXfWNzgI7QmeBNCGTA=",
"lastModified": 1736030096,
"submodules": false
},
"cgroup-exporter": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "arianvp",
"repo": "cgroup-exporter",
"branch": "main",
"revision": "443dcf85b1623eb3098139cf3ed1df6f1e51d7cb",
"url": "https://github.com/arianvp/cgroup-exporter/archive/443dcf85b1623eb3098139cf3ed1df6f1e51d7cb.tar.gz",
"hash": "sha256-yzEWgzXI9ttPIQ56D2POkOjblBoq6ucATBvMOQHm8No="
},
"colmena": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "b5135dc8af1d7637b337cc2632990400221da577",
"url": "https://git.dgnum.eu/DGNum/colmena",
"hash": "sha256-7gg+K3PEYlN0sGPgDlmnM8zgDDIV505gNcwjFN61Qvk=",
"lastModified": 1746392348,
"submodules": false
},
"dgsi": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "5cf5a35e5e9a5e929ae0dba799de4dc1a8c03849",
"url": "https://git.dgnum.eu/DGNum/dgsi.git",
"hash": "sha256-ySX6y0XM7LLZO3O/9A8nDbfZQtseQfv5SoHhD0NPrE4=",
"lastModified": 1751549381,
"submodules": false
},
"disko": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "nix-community",
"repo": "disko",
"branch": "master",
"revision": "16b74a1e304197248a1bc663280f2548dbfcae3c",
"url": "https://github.com/nix-community/disko/archive/16b74a1e304197248a1bc663280f2548dbfcae3c.tar.gz",
"hash": "sha256-U/OQFplExOR1jazZY4KkaQkJqOl59xlh21HP9mI79Vc="
},
"dns.nix": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "nix-community",
"repo": "dns.nix",
"branch": "master",
"revision": "96e548ae8bd44883afc5bddb9dacd0502542276d",
"url": "https://github.com/nix-community/dns.nix/archive/96e548ae8bd44883afc5bddb9dacd0502542276d.tar.gz",
"hash": "sha256-qTbv8Pm9WWF63M5Fj0Od9E54/lsbMSQUBHw/s30eFok="
},
"git-hooks": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "cachix",
"repo": "git-hooks.nix",
"branch": "master",
"revision": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"url": "https://github.com/cachix/git-hooks.nix/archive/16ec914f6fb6f599ce988427d9d94efddf25fe6d.tar.gz",
"hash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg="
},
"kadenios": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "4fd9e3a2117f54c4184b02fd3aef31626fcad149",
"url": "https://git.dgnum.eu/DGNum/kadenios.git",
"hash": "sha256-32alJ/9M+Vaa+zSzmoMgB1+f2h4GYP3OiJ8odRMeCdw=",
"lastModified": 1720702967,
"submodules": false
},
"kat-pkgs": {
"type": "Git",
"fetchType": "git",
"branch": "master",
"revision": "55e9d7e48da3a816b7953dfa7da12f2ed8d4e840",
"url": "https://git.dgnum.eu/lbailly/kat-pkgs",
"hash": "sha256-K653c+Ry33NoD7U9RFijXv6Uvf8zb1FLeR3ShBl7eYA=",
"lastModified": 1750343083,
"submodules": false
},
"liminix": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "1322de1ee0cdb19fead79e12ab279ee0b575019a",
"url": "https://git.dgnum.eu/DGNum/liminix",
"hash": "sha256-k5QjFRwKK8Hw7bl6XwOHiwr7hmTtBMdOUWieNKM10x4=",
"lastModified": 1733703952,
"submodules": false
},
"linkal": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "JulienMalka",
"repo": "Linkal",
"branch": "main",
"revision": "085630bf369b68d2264baca020efc94c877d78e6",
"url": "https://github.com/JulienMalka/Linkal/archive/085630bf369b68d2264baca020efc94c877d78e6.tar.gz",
"hash": "sha256-nQ22VdXMO6M+rIsrPYHGmt7Zi7VWt9BeuF7WM+U2glQ="
},
"lix": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "29d9a88af6c8f2954e19744df745bd943ba50754",
"url": "https://git.lix.systems/lix-project/lix.git",
"hash": "sha256-G6AbzZckUSxXPplf4kgZTiSQnZJzJAs15uxkRqpjHx0=",
"lastModified": 1751798755,
"submodules": false
},
"lix-diff": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "tgirlcloud",
"repo": "lix-diff",
"branch": "main",
"revision": "548e54365e083aff84d67eb3cca0447ffbf87f1e",
"url": "https://github.com/tgirlcloud/lix-diff/archive/548e54365e083aff84d67eb3cca0447ffbf87f1e.tar.gz",
"hash": "sha256-gR4qa+OLob8BTX5BnI2Ec1QheqRp5TagWM7s9qzv/x4="
},
"lix-module": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f",
"url": "https://git.lix.systems/lix-project/nixos-module.git",
"hash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=",
"lastModified": 1751909859,
"submodules": false
},
"lon": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "nikstur",
"repo": "lon",
"branch": "main",
"revision": "c44e33ce55eed38a06fde43e69512380c4065441",
"url": "https://github.com/nikstur/lon/archive/c44e33ce55eed38a06fde43e69512380c4065441.tar.gz",
"hash": "sha256-bxu83mbdfAeDZYOnjZQYyjTs5WgZS8o6Q2irlzgbYs0="
},
"metis": {
"type": "Git",
"fetchType": "git",
"branch": "master",
"revision": "f8898110f4aa32c5384af605e727bfea9b0bd2de",
"url": "https://git.dgnum.eu/DGNum/metis",
"hash": "sha256-WrQCoe8h848nkQQfZnshsOdoY2NP5gAsl24hXpzDnR8=",
"lastModified": 1737730724,
"submodules": false
},
"microvm.nix": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "RaitoBezarius",
"repo": "microvm.nix",
"branch": "main",
"revision": "49899c9a4fdf75320785e79709bf1608c34caeb8",
"url": "https://github.com/RaitoBezarius/microvm.nix/archive/49899c9a4fdf75320785e79709bf1608c34caeb8.tar.gz",
"hash": "sha256-nn/kta8Od0T2k5+xQj+S2PNqOmxsDdHNaIv8eNtX5ms="
},
"nix-actions": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "06847b3256df402da0475dccb290832ec92a9f8c",
"url": "https://git.dgnum.eu/DGNum/nix-actions.git",
"hash": "sha256-2xOZdKiUfcriQFKG37vY96dgCJLndhLa7cGacq8+SA8=",
"lastModified": 1746294989,
"submodules": false
},
"nix-modules": {
"type": "Git",
"fetchType": "git",
"branch": "dgnum",
"revision": "fd4ba193ea3eda529ac27b43b206e9e3618b1975",
"url": "https://git.hubrecht.ovh/hubrecht/nix-modules",
"hash": "sha256-O/lMCM0qKkd+TBV43Fp9uG3aEbDSc2lI3a5TetNYs0w=",
"lastModified": 1749739595,
"submodules": false
},
"nix-pkgs": {
"type": "Git",
"fetchType": "git",
"branch": "dgnum",
"revision": "7a0e2e660b26ddd67bb8132beb6b13e3a69003a4",
"url": "https://git.hubrecht.ovh/hubrecht/nix-pkgs",
"hash": "sha256-1uzLfSTvB8UXN9zbzQr2cQXjARIXw1cBwPK6mA9GoXc=",
"lastModified": 1745005124,
"submodules": false
},
"nix-reuse": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "75befb3933b41e600d1806deb435a2e3d63a072f",
"url": "https://git.dgnum.eu/DGNum/nix-reuse",
"hash": "sha256-CacRRIV324nWlAsp3sFjW1LM4A0HumhyAEeNRaHOL9w=",
"lastModified": 1751393268,
"submodules": false
},
"nixos-24.05": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "NixOS",
"repo": "nixpkgs",
"branch": "nixos-24.05",
"revision": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"url": "https://github.com/NixOS/nixpkgs/archive/b134951a4c9f3c995fd7be05f3243f8ecd65d798.tar.gz",
"hash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8="
},
"nixos-24.11": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "NixOS",
"repo": "nixpkgs",
"branch": "nixos-24.11",
"revision": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
"url": "https://github.com/NixOS/nixpkgs/archive/50ab793786d9de88ee30ec4e4c24fb4236fc2674.tar.gz",
"hash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g="
},
"nixos-25.05": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "NixOS",
"repo": "nixpkgs",
"branch": "nixos-25.05",
"revision": "7a732ed41ca0dd64b4b71b563ab9805a80a7d693",
"url": "https://github.com/NixOS/nixpkgs/archive/7a732ed41ca0dd64b4b71b563ab9805a80a7d693.tar.gz",
"hash": "sha256-u7ubvtxdTnFPpV27AHpgoKn7qHuE7sgWgza/1oj5nzA="
},
"nixos-unstable": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "NixOS",
"repo": "nixpkgs",
"branch": "nixos-unstable",
"revision": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
"url": "https://github.com/NixOS/nixpkgs/archive/5c724ed1388e53cc231ed98330a60eb2f7be4be3.tar.gz",
"hash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4="
},
"proxmox-nixos": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "bfe830d4d3fc055b8d157313a3ec2fa69ded5d4e",
"url": "https://github.com/SaumonNet/proxmox-nixos.git",
"hash": "sha256-aNB6A0+azhP/Wt9fFQslHMeQHlTYoz8Y/1cI4XqzrP0=",
"lastModified": 1751538533,
"submodules": false
},
"signal-irc-bridge": {
"type": "Git",
"fetchType": "git",
"branch": "master",
"revision": "52a370b29ff2edbec63e192e782b934823263ef2",
"url": "https://git.dgnum.eu/mdebray/signal-irc-bridge",
"hash": "sha256-sR8v7bheOigZ08VAv/AX9wFNmMZQEUqEwX3V9wW68tc=",
"lastModified": 1744031004,
"submodules": false
},
"snix-cache": {
"type": "Git",
"fetchType": "git",
"branch": "main",
"revision": "f3d0a3146c64f8fe6bdb208b75cc680c96f524e1",
"url": "https://git.dgnum.eu/DGNum/snix-cache.git",
"hash": "sha256-D6NRGdsIwvXf9MxTR1gFreefBKM3giFh8ggTM6wsh8o=",
"lastModified": 1750061908,
"submodules": false
},
"stateless-uptime-kuma": {
"type": "Git",
"fetchType": "git",
"branch": "master",
"revision": "d378d1ce00c676fa22ef0808cf73f3e1c34e0191",
"url": "https://git.dgnum.eu/mdebray/stateless-uptime-kuma",
"hash": "sha256-Dq0Kk6inCrxsxRfpYJVDZ45pMW/OZ3AAecmgF+yIZQI=",
"lastModified": 1734436346,
"submodules": false
},
"wp4nix": {
"type": "Git",
"fetchType": "git",
"branch": "master",
"revision": "2fc9a0734168cab536e3129efa6397d6cd3ac89f",
"url": "https://git.helsinki.tools//helsinki-systems/wp4nix",
"hash": "sha256-abwqAZGsWuWqfxou8XlqedBvXsUw1/xanSgljLCJxdM=",
"lastModified": 1743397420,
"submodules": false
}
}
}

53
lon.nix Normal file
View file

@ -0,0 +1,53 @@
# Generated by lon. Do not modify!
let
lock = builtins.fromJSON (builtins.readFile ./lon.lock);
# Override with a path defined in an environment variable. If no variable is
# set, the original path is used.
overrideFromEnv =
name: path:
let
replacement = builtins.getEnv "LON_OVERRIDE_${name}";
in
if replacement == "" then
path
else
# this turns the string into an actual Nix path (for both absolute and
# relative paths)
if builtins.substring 0 1 replacement == "/" then
/. + replacement
else
/. + builtins.getEnv "PWD" + "/${replacement}";
fetchSource =
args@{ fetchType, ... }:
if fetchType == "git" then
builtins.fetchGit (
{
url = args.url;
ref = args.branch;
rev = args.revision;
narHash = args.hash;
submodules = args.submodules;
}
// (
if args ? lastModified then
{
inherit (args) lastModified;
shallow = true;
}
else
{ }
)
)
else if fetchType == "tarball" then
builtins.fetchTarball {
url = args.url;
sha256 = args.hash;
}
else
builtins.throw "Unsupported source type ${fetchType}";
in
builtins.mapAttrs (name: args: overrideFromEnv name (fetchSource args)) lock.sources

View file

@ -1,79 +0,0 @@
_:
{
networking = {
useNetworkd = true;
useDHCP = false;
nftables.enable = true;
firewall.allowedUDPPorts = [ 67 ];
};
systemd.network = {
networks = {
"10-eno1" = {
name = "eno1";
networkConfig = {
VLAN = [
"vlan-admin"
"vlan-uplink-oob"
];
LinkLocalAddressing = false;
LLDP = false;
EmitLLDP = false;
IPv6AcceptRA = false;
IPv6SendRA = false;
};
# address = [ "192.168.222.1/24" ];
};
"10-vlan-admin" = {
name = "vlan-admin";
# DHCP for the BMC
networkConfig.DHCPServer = "yes";
dhcpServerConfig = {
PoolOffset = 128;
EmitDNS = false;
EmitNTP = false;
EmitSIP = false;
EmitPOP3 = false;
EmitSMTP = false;
EmitLPR = false;
UplinkInterface = ":none";
};
address = [
"fd26:baf9:d250:8000::ffff/64"
"192.168.222.1/24"
];
};
"10-vlan-uplink-oob" = {
name = "vlan-uplink-oob";
networkConfig.DHCP = "ipv4";
};
};
netdevs = {
"10-vlan-admin" = {
netdevConfig = {
Name = "vlan-admin";
Kind = "vlan";
};
vlanConfig.Id = 3000;
};
"10-vlan-uplink-oob" = {
netdevConfig = {
Name = "vlan-uplink-oob";
Kind = "vlan";
};
vlanConfig.Id = 500;
};
};
};
}

View file

@ -1,3 +0,0 @@
(import ../../../keys).mkSecrets [ "bridg01" ] [
# List of secrets for bridge01
]

View file

@ -1,33 +0,0 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
initrd.availableKernelModules = [
"ahci"
"ehci_pci"
"megaraid_sas"
"usb_storage"
"usbhid"
"sd_mod"
"sr_mod"
];
kernelModules = [ "kvm-intel" ];
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/c83f6978-fd26-44a8-a86a-b0e971bb0c8c";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/55DB-056F";
fsType = "vfat";
};
swapDevices = [ { device = "/dev/disk/by-uuid/30547280-00e9-4ee1-8a07-d116590d9fbf"; } ];
}

View file

@ -1,28 +0,0 @@
{ config, sources, ... }:
{
nixpkgs.overlays = [ (import (sources.arkheon.outPath + "/overlay.nix")) ];
services.arkheon = {
enable = true;
pythonEnv =
(import sources.nixos-unstable {
overlays = [ (import (sources.arkheon.outPath + "/overlay.nix")) ];
}).python3.withPackages
(ps: [
ps.arkheon
ps.daphne
ps.psycopg2
]);
domain = "arkheon.dgnum.eu";
nginx = {
enableACME = true;
forceSSL = true;
};
envFile = config.age.secrets."arkheon-env_file".path;
};
}

View file

@ -1,421 +0,0 @@
# Copyright Tom Hubrecht, (2023)
#
# Tom Hubrecht <tom@hubrecht.ovh>
#
# This software is a computer program whose purpose is to configure
# machines and servers with NixOS.
#
# This software is governed by the CeCILL license under French law and
# abiding by the rules of distribution of free software. You can use,
# modify and/ or redistribute the software under the terms of the CeCILL
# license as circulated by CEA, CNRS and INRIA at the following URL
# "http://www.cecill.info".
#
# As a counterpart to the access to the source code and rights to copy,
# modify and redistribute granted by the license, users are provided only
# with a limited warranty and the software's author, the holder of the
# economic rights, and the successive licensors have only limited
# liability.
#
# In this respect, the user's attention is drawn to the risks associated
# with loading, using, modifying and/or developing or reproducing the
# software by the user in light of its specific status of free software,
# that may mean that it is complicated to manipulate, and that also
# therefore means that it is reserved for developers and experienced
# professionals having in-depth computer knowledge. Users are therefore
# encouraged to load and test the software's suitability as regards their
# requirements in conditions enabling the security of their systems and/or
# data to be ensured and, more generally, to use and operate it in the
# same conditions as regards security.
#
# The fact that you are presently reading this means that you have had
# knowledge of the CeCILL license and that you accept its terms.
{
config,
lib,
pkgs,
...
}:
let
inherit (lib)
mdDoc
mkDefault
mkEnableOption
mkIf
mkOption
optional
optionalString
types
;
cfg = config.services.demarches-simplifiees;
settingsFormat = pkgs.formats.keyValue { };
env = settingsFormat.generate "ds-fr-env" cfg.settings;
ds-fr = pkgs.writeShellScriptBin "ds-fr" ''
set -a
cd ${cfg.package}
${optionalString (cfg.secretFile != null) "source ${cfg.secretFile}"}
source ${env}
BIN="$1"
shift
SUDO="exec"
if [[ $USER != ${cfg.user} ]]; then
SUDO='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env'
fi
$SUDO ${cfg.package}/bin/$BIN "$@"
'';
in
{
options.services.demarches-simplifiees = {
enable = mkEnableOption "demarches-simplifiees.";
package = mkOption {
type = types.package;
default = pkgs.callPackage ./package { inherit (cfg) initialDeploymentDate dataDir logDir; };
};
user = mkOption {
type = types.str;
default = "ds-fr";
description = mdDoc "User account under which DS runs.";
};
group = mkOption {
type = types.str;
default = "ds-fr";
description = mdDoc "Group account under which DS runs.";
};
dataDir = mkOption {
type = types.str;
default = "/var/lib/ds-fr";
};
logDir = mkOption {
type = types.str;
default = "/var/log/ds-fr";
};
secretFile = mkOption {
type = types.nullOr types.path;
default = null;
};
settings = mkOption { inherit (settingsFormat) type; };
initialDeploymentDate = mkOption {
type = types.nullOr types.str;
default = null;
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ ds-fr ];
systemd.tmpfiles.rules = [
"f '${cfg.logDir}/production.log' 0640 ${cfg.user} ${cfg.group} - -"
"f '${cfg.dataDir}/.env' 0600 ${cfg.user} ${cfg.group} - -"
"d '${cfg.dataDir}/tmp' 0700 ${cfg.user} ${cfg.group} 10d -"
"d '${cfg.dataDir}/storage' 0700 ${cfg.user} ${cfg.group} - -"
];
systemd.services = {
ds-fr-setup = {
description = "Demarches Simplifiees setup";
wantedBy = [ "multi-user.target" ];
path = [
pkgs.bash
ds-fr
];
after = [ "postgresql.service" ];
serviceConfig = {
Type = "oneshot";
User = cfg.user;
Group = cfg.group;
EnvironmentFile = [ env ] ++ (optional (cfg.secretFile != null) cfg.secretFile);
StateDirectory = mkIf (cfg.dataDir == "/var/lib/ds-fr") "ds-fr";
LogsDirectory = mkIf (cfg.logDir == "/var/log/ds-fr") "ds-fr";
};
script = ''
[[ ! -f ${cfg.dataDir}/.initial-migration ]] \
&& ds-fr rails db:environment:set \
&& ds-fr rails db:schema:load \
&& ds-fr rails db:seed \
&& touch ${cfg.dataDir}/.initial-migration
ds-fr rake db:migrate
ds-fr rake after_party:run
'';
};
ds-fr-work = {
description = "Demarches Simplifiees work service";
wantedBy = [
"multi-user.target"
"ds-fr.service"
];
after = [
"network.target"
"ds-fr-setup.service"
];
requires = [ "ds-fr-setup.service" ];
serviceConfig = {
ExecStart = "${ds-fr}/bin/ds-fr rails jobs:work";
EnvironmentFile = [ env ] ++ (optional (cfg.secretFile != null) cfg.secretFile);
User = cfg.user;
Group = cfg.group;
StateDirectory = mkIf (cfg.dataDir == "/var/lib/ds-fr") "ds-fr";
LogsDirectory = mkIf (cfg.logDir == "/var/log/ds-fr") "ds-fr";
};
};
ds-fr = {
description = "Demarches Simplifiees web service";
wantedBy = [ "multi-user.target" ];
after = [
"network.target"
"ds-fr-setup.service"
];
requires = [ "ds-fr-setup.service" ];
path = [ pkgs.imagemagick ];
serviceConfig = {
ExecStart = "${ds-fr}/bin/ds-fr rails server";
Environment = [ "RAILS_QUEUE_ADAPTER=delayed_job" ];
EnvironmentFile = [ env ] ++ (optional (cfg.secretFile != null) cfg.secretFile);
User = cfg.user;
Group = cfg.group;
StateDirectory = mkIf (cfg.dataDir == "/var/lib/ds-fr") "ds-fr";
LogsDirectory = mkIf (cfg.logDir == "/var/log/ds-fr") "ds-fr";
};
};
};
services = {
demarches-simplifiees.settings =
(builtins.mapAttrs (_: mkDefault) {
RAILS_ENV = "production";
RAILS_ROOT = builtins.toString cfg.package;
# Application host name
#
# Examples:
# * For local development: localhost:3000
# * For preproduction: staging.ds.example.org
# * For production: ds.example.org
APP_HOST = "localhost:3000";
# Rails key for signing sensitive data
# See https://guides.rubyonrails.org/security.html
#
# For production you MUST generate a new key, and keep it secret.
# Secrets must be long and random. Use bin/rails secret to get new unique secrets.
# Secret key for One-Time-Password codes, used for 2-factors authentication
# OTP_SECRET_KEY = "";
# Protect access to the instance with a static login/password (useful for staging environments)
BASIC_AUTH_ENABLED = "disabled";
BASIC_AUTH_USERNAME = "";
BASIC_AUTH_PASSWORD = "";
# ActiveStorage service to use for attached files.
# Possible values:
# - "local": store files on the local filesystem
# - "amazon": store files remotely on an S3 storage service
# - "openstack": store files remotely on an OpenStack storage service
#
# (See config/storage.yml for the configuration of each service.)
ACTIVE_STORAGE_SERVICE = "local";
# Configuration for the OpenStack storage service (if enabled)
FOG_OPENSTACK_API_KEY = "";
FOG_OPENSTACK_USERNAME = "";
FOG_OPENSTACK_URL = "";
FOG_OPENSTACK_REGION = "";
DS_PROXY_URL = "";
# SAML
SAML_IDP_ENABLED = "disabled";
# External service: authentication through France Connect
FC_PARTICULIER_ID = "";
FC_PARTICULIER_SECRET = "";
FC_PARTICULIER_BASE_URL = "";
# External service: authentication through Agent Connect
AGENT_CONNECT_ID = "";
AGENT_CONNECT_SECRET = "";
AGENT_CONNECT_BASE_URL = "";
AGENT_CONNECT_JWKS = "";
AGENT_CONNECT_REDIRECT = "";
# External service: integration with HelpScout (optional)
HELPSCOUT_MAILBOX_ID = "";
HELPSCOUT_CLIENT_ID = "";
HELPSCOUT_CLIENT_SECRET = "";
HELPSCOUT_WEBHOOK_SECRET = "";
# External service: external supervision
SENTRY_ENABLED = "disabled";
SENTRY_CURRENT_ENV = "development";
SENTRY_DSN_RAILS = "";
SENTRY_DSN_JS = "";
# External service: Matomo web analytics
MATOMO_ENABLED = "disabled";
MATOMO_COOKIE_DOMAIN = "*.www.demarches-simplifiees.fr";
MATOMO_DOMAIN = "*.www.demarches-simplifiees.fr";
MATOMO_ID = "";
MATOMO_HOST = "matomo.example.org";
# Default SMTP Provider: Mailjet
MAILJET_API_KEY = "";
MAILJET_SECRET_KEY = "";
# Alternate SMTP Provider: SendInBlue/DoList
SENDINBLUE_CLIENT_KEY = "";
SENDINBLUE_SMTP_KEY = "";
SENDINBLUE_USER_NAME = "";
# SENDINBLUE_LOGIN_URL="https://app.sendinblue.com/account/saml/login/truc"
# Alternate SMTP Provider: Mailtrap (mail catcher for staging environments)
# When enabled, all emails will be sent using this provider
MAILTRAP_ENABLED = "disabled";
MAILTRAP_USERNAME = "";
MAILTRAP_PASSWORD = "";
# Alternative SMTP Provider: Mailcatcher (Catches mail and serves it through a dream.)
# When enabled, all emails will be sent using this provider
MAILCATCHER_ENABLED = "disabled";
MAILCATCHER_HOST = "";
MAILCATCHER_PORT = "";
# External service: live chat for admins (specific to démarches-simplifiées.fr)
CRISP_ENABLED = "disabled";
CRISP_CLIENT_KEY = "";
# API Entreprise credentials
# https://api.gouv.fr/api/api-entreprise.html
API_ENTREPRISE_KEY = "";
# External service: CRM for following admin accounts pipeline (specific to démarches-simplifiées.fr)
PIPEDRIVE_KEY = "";
# Networks bypassing the email login token that verifies new devices, and rack-attack throttling
TRUSTED_NETWORKS = "";
# External service: mesuring performance of the Rails app (specific to démarches-simplifiées.fr)
SKYLIGHT_AUTHENTICATION_KEY = "";
# "sXaot-fKhBlkI8qaSirQyuZbrpv5sVFoOturQ0pFEh0";
# Enable or disable Lograge logs
LOGRAGE_ENABLED = "disabled";
# Logs source for Lograge
#
# Examples:
# * For local development: tps_local
# * For preproduction: tps_staging
# * For production: tps_prod
LOGRAGE_SOURCE = "tps_prod";
# External service: timestamping a daily archive of dossiers status changes
UNIVERSIGN_API_URL = "https://ws.universign.eu/tsa/post/";
UNIVERSIGN_USERPWD = "";
# External service: API Geo / Adresse
API_ADRESSE_URL = "https://api-adresse.data.gouv.fr";
API_GEO_URL = "https://geo.api.gouv.fr";
# External service: API Education
API_EDUCATION_URL = "https://data.education.gouv.fr/api/records/1.0";
# Encryption key for sensitive columns in the database
ENCRYPTION_SERVICE_SALT = "";
# ActiveRecord encryption keys. Generate them with bin/rails db:encryption:init (you can omit deterministic_key)
AR_ENCRYPTION_PRIMARY_KEY = "";
AR_ENCRYPTION_KEY_DERIVATION_SALT = "";
# Salt for invisible_captcha session data.
# Must be the same value for all app instances behind a load-balancer.
INVISIBLE_CAPTCHA_SECRET = "kikooloool";
# Clamav antivirus usage
CLAMAV_ENABLED = "disabled";
# Siret number used for API Entreprise, by default we use SIRET from dinum
API_ENTREPRISE_DEFAULT_SIRET = "put_your_own_siret";
})
// {
# Database credentials
DB_DATABASE = "ds-fr";
DB_USERNAME = cfg.user;
DB_PASSWORD = "";
DB_HOST = "/run/postgresql";
DB_POOL = "";
# Log on stdout
RAILS_LOG_TO_STDOUT = true;
};
postgresql = {
enable = true;
ensureDatabases = [ "ds-fr" ];
ensureUsers = optional (cfg.user == "ds-fr") {
name = "ds-fr";
ensureDBOwnership = true;
};
extraPlugins = with config.services.postgresql.package.pkgs; [ postgis ];
};
nginx = {
enable = true;
virtualHosts.${cfg.settings.APP_HOST} = {
enableACME = true;
forceSSL = true;
root = "${cfg.package}/public/";
locations."/".tryFiles = "$uri @proxy";
locations."@proxy" = {
proxyPass = "http://127.0.0.1:3000";
};
};
};
};
users.users = mkIf (cfg.user == "ds-fr") {
ds-fr = {
inherit (cfg) group;
isSystemUser = true;
home = cfg.package;
};
};
users.groups.${cfg.group} = { };
};
}

View file

@ -1,179 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
git,
bun,
nodejs,
ruby_3_2,
bundlerEnv,
logDir ? "/var/log/ds-fr",
dataDir ? "/var/lib/ds-fr",
initialDeploymentDate ? "17941030",
}:
let
inherit (lib) getExe;
# Head of the DGNum repo
dgn-id = "f270f1cdd09e643a9c666c94df1841234430de49";
pname = "ds-fr";
meta = import ./meta.nix;
inherit (meta) version;
src = fetchFromGitHub {
owner = "demarches-simplifiees";
repo = "demarches-simplifiees.fr";
rev = version;
hash = meta.src-hash;
};
rubyEnv = bundlerEnv {
name = "env-${pname}";
gemdir = ./rubyEnv;
ruby = ruby_3_2;
gemset = (import ./rubyEnv/gemset.nix) // {
bundler = {
groups = [ "default" ];
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "deeQ3fNwcSiGSO/yeB2yoTniRq2gHW8WueprXoPX6Jk=";
type = "gem";
};
version = "2.3.11";
};
};
};
node_modules = stdenv.mkDerivation {
pname = "${pname}-node_modules";
inherit src version;
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
"GIT_PROXY_COMMAND"
"SOCKS_SERVER"
];
nativeBuildInputs = [ bun ];
dontConfigure = true;
buildPhase = ''
bun install --no-progress --frozen-lockfile --ignore-scripts
rm -r node_modules/.cache
# Remove inconsistent file
rm node_modules/.bin/grunt
'';
installPhase = ''
mv node_modules $out
'';
dontFixup = true;
outputHash = meta.deps-hash or lib.fakeHash;
outputHashAlgo = "sha256";
outputHashMode = "recursive";
};
dsModules = stdenv.mkDerivation {
pname = "${pname}-modules";
inherit src version;
buildInputs = [ rubyEnv ];
nativeBuildInputs = [
bun
nodejs
rubyEnv.wrappedRuby
];
RAILS_ENV = "production";
NODE_ENV = "dev";
patches = [
# Disable functionnalities as we only precompile assets
./patches/build.patch
];
postPatch = ''
${getExe git} apply -p1 < ${builtins.fetchurl "https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${dgn-id}.patch"}
'';
OTP_SECRET_KEY = "precompile_placeholder";
SECRET_KEY_BASE = "precompile_placeholder";
APP_HOST = "precompile_placeholder";
buildPhase = ''
cp -R ${node_modules} node_modules
chmod u+w -R node_modules
patchShebangs node_modules
patchShebangs bin/
bin/rake assets:precompile
'';
installPhase = ''
mkdir -p $out/public
cp -r public/* $out/public
'';
};
in
stdenv.mkDerivation {
name = "demarches-simplifiees.fr-${version}";
inherit src;
buildInputs = [ rubyEnv ];
propagatedBuildInputs = [ rubyEnv.wrappedRuby ];
patches = [
./patches/replay_routing_engine_for_a_cloned_procedure.patch
./patches/smtp_settings.patch
./patches/garage.patch
];
postPatch = ''
${getExe git} apply -p1 < ${builtins.fetchurl "https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${dgn-id}.patch"}
'';
buildPhase = ''
rm -rf public
ln -s ${dsModules}/public/ public
patchShebangs bin/
rm -rf log storage
ln -s ${logDir} log
ln -s ${dataDir}/tmp tmp
ln -s ${dataDir}/storage storage
for f in $(ls lib/tasks/deployment/); do
[[ ! ${initialDeploymentDate} < $f ]] \
&& rm lib/tasks/deployment/$f;
done;
echo "Removed unused data migrations"
'';
installPhase = ''
mkdir -p $out
cp -r * $out/
'';
passthru = {
inherit rubyEnv;
ruby = rubyEnv.wrappedRuby;
};
meta = with lib; {
description = "Dématérialiser et simplifier les démarches administratives";
homepage = "https://github.com/demarches-simplifiees/demarches-simplifiees.fr";
license = licenses.agpl3Only;
maintainers = with maintainers; [ thubrecht ];
};
}

View file

@ -1,5 +0,0 @@
{
version = "2024-04-24-01";
src-hash = "sha256-+FjthJZb1KqqFttFmXr/FN5qaFcY9RGTKAqhdLGVFSg=";
deps-hash = "sha256-Vj8WCB+LSHJM67qbsZ5CPc+jK1KWO1MXnSFp/LH0Ow8=";
}

View file

@ -1,42 +0,0 @@
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 16d8c8e84..6262b8782 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -118,7 +118,7 @@ Rails.application.configure do
# the I18n.default_locale when a translation cannot be found).
config.i18n.fallbacks = true
- config.active_storage.service = ENV.fetch("ACTIVE_STORAGE_SERVICE").to_sym
+ config.active_storage.service = ENV.fetch("ACTIVE_STORAGE_SERVICE", 'local').to_sym
# Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify
@@ -174,5 +174,5 @@ Rails.application.configure do
# The Content-Security-Policy is NOT in Report-Only mode
config.content_security_policy_report_only = false
- config.lograge.enabled = ENV['LOGRAGE_ENABLED'] == 'enabled'
+ config.lograge.enabled = ENV.fetch('LOGRAGE_ENABLED', 'disabled') == 'enabled'
end
diff --git a/config/initializers/mailcatcher.rb b/config/initializers/mailcatcher.rb
index 8b931f704..dbeceb4ec 100644
--- a/config/initializers/mailcatcher.rb
+++ b/config/initializers/mailcatcher.rb
@@ -1,4 +1,4 @@
-if ENV.fetch('MAILCATCHER_ENABLED') == 'enabled'
+if ENV.fetch('MAILCATCHER_ENABLED', 'disabled') == 'enabled'
ActiveSupport.on_load(:action_mailer) do
module Mailcatcher
class SMTP < ::Mail::SMTP; end
diff --git a/config/initializers/mailtrap.rb b/config/initializers/mailtrap.rb
index 6d1faa04b..658673ed1 100644
--- a/config/initializers/mailtrap.rb
+++ b/config/initializers/mailtrap.rb
@@ -1,4 +1,4 @@
-if ENV.fetch('MAILTRAP_ENABLED') == 'enabled'
+if ENV.fetch('MAILTRAP_ENABLED', 'disabled') == 'enabled'
ActiveSupport.on_load(:action_mailer) do
module Mailtrap
class SMTP < ::Mail::SMTP; end

View file

@ -1,16 +0,0 @@
diff --git a/config/storage.yml b/config/storage.yml
index d2b2d241f..1b2744504 100644
--- a/config/storage.yml
+++ b/config/storage.yml
@@ -19,3 +19,11 @@ amazon:
secret_access_key: <%= ENV.fetch("S3_SECRET_ACCESS_KEY", "") %>
region: <%= ENV.fetch("S3_REGION", "") %>
bucket: <%= ENV.fetch("S3_BUCKET", "") %>
+garage:
+ service: S3
+ access_key_id: <%= ENV.fetch("S3_ACCESS_KEY_ID", "") %>
+ secret_access_key: <%= ENV.fetch("S3_SECRET_ACCESS_KEY", "") %>
+ region: <%= ENV.fetch("S3_REGION", "garage") %>
+ bucket: <%= ENV.fetch("S3_BUCKET", "") %>
+ endpoint: <%= ENV.fetch("S3_ENDPOINT", "") %>
+ force_path_style: <%= ENV.fetch("S3_FORCE_PATH_STYLE", "").present? %>

View file

@ -1,35 +0,0 @@
diff --git a/lib/tasks/deployment/20230613114744_replay_routing_engine_for_a_cloned_procedure.rake b/lib/tasks/deployment/20230613114744_replay_routing_engine_for_a_cloned_procedure.rake
index 9d4f3a284..04d62a63b 100644
--- a/lib/tasks/deployment/20230613114744_replay_routing_engine_for_a_cloned_procedure.rake
+++ b/lib/tasks/deployment/20230613114744_replay_routing_engine_for_a_cloned_procedure.rake
@@ -4,18 +4,18 @@ namespace :after_party do
puts "Running deploy task 'replay_routing_engine_for_a_cloned_procedure'"
# Put your task implementation HERE.
- dossiers = Procedure
- .find(76266)
- .dossiers
- .en_construction
-
- progress = ProgressReport.new(dossiers.count)
-
- dossiers.find_each do |dossier|
- RoutingEngine.compute(dossier)
- progress.inc
- end
- progress.finish
+ # dossiers = Procedure
+ # .find(76266)
+ # .dossiers
+ # .en_construction
+ #
+ # progress = ProgressReport.new(dossiers.count)
+ #
+ # dossiers.find_each do |dossier|
+ # RoutingEngine.compute(dossier)
+ # progress.inc
+ # end
+ # progress.finish
# Update task as completed. If you remove the line below, the task will
# run with every deploy (or every time you call after_party:run).

View file

@ -1,14 +0,0 @@
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 16d8c8e84..e0326d26d 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -86,7 +86,8 @@ Rails.application.configure do
user_name: ENV.fetch("SMTP_USER"),
password: ENV.fetch("SMTP_PASS"),
authentication: ENV.fetch("SMTP_AUTHENTICATION"),
- enable_starttls_auto: ENV.fetch("SMTP_TLS").present?
+ enable_starttls_auto: ENV.fetch("SMTP_TLS").present?,
+ ssl: ENV.fetch("SMTP_SSL").present?
}
elsif ENV['SENDMAIL_ENABLED'] == 'enabled'
config.action_mailer.delivery_method = :sendmail

View file

@ -1,12 +0,0 @@
diff --git a/app/controllers/concerns/uninterlace_png_concern.rb b/app/controllers/concerns/uninterlace_png_concern.rb
index 8e9d06251..0870357c6 100644
--- a/app/controllers/concerns/uninterlace_png_concern.rb
+++ b/app/controllers/concerns/uninterlace_png_concern.rb
@@ -14,6 +14,6 @@ module UninterlacePngConcern
def interlaced?(png_path)
png = MiniMagick::Image.open(png_path)
- png.data["interlace"] != "None"
+ png.details["interlace"] != "None"
end
end

View file

@ -1,160 +0,0 @@
source 'https://rubygems.org'
gem 'rails', '~> 7.0.8' # allows update to security fixes at any time
gem 'aasm'
gem 'acsv'
gem 'active_model_serializers'
gem 'activestorage-openstack'
gem 'active_storage_validations'
gem 'addressable'
gem 'administrate'
gem 'administrate-field-enum' # Allow using Field::Enum in administrate
gem 'after_commit_everywhere'
gem 'after_party'
gem 'ancestry'
gem 'anchored'
gem 'bcrypt'
gem 'bootsnap', '>= 1.4.4', require: false # Reduces boot times through caching; required in config/boot.rb
gem 'browser'
gem 'charlock_holmes'
gem 'chartkick'
gem 'chunky_png'
gem 'clamav-client', require: 'clamav/client'
gem 'daemons'
gem 'deep_cloneable' # Enable deep clone of active record models
gem 'delayed_cron_job', require: false # Cron jobs
gem 'delayed_job_active_record'
gem 'delayed_job_web'
gem 'devise'
gem 'devise-i18n'
gem 'devise-two-factor'
gem 'discard'
gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded before rails
gem 'dry-monads'
gem 'faraday-jwt'
gem 'flipper'
gem 'flipper-active_record'
gem 'flipper-active_support_cache_store'
gem 'flipper-ui'
gem 'fugit'
gem 'geocoder'
gem 'geo_coord', require: "geo/coord"
gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch', git: 'https://github.com/demarches-simplifiees/reliable-fetch.git'
gem 'gon'
gem 'graphql', '2.0.24'
gem 'graphql-batch', '0.5.1'
gem 'graphql-rails_logger'
gem 'groupdate'
gem 'haml-rails'
gem 'hashie'
gem 'http_accept_language'
gem 'i18n_data'
gem 'i18n-tasks', require: false
gem 'iban-tools'
gem 'image_processing'
gem 'invisible_captcha'
gem 'json_schemer'
gem 'jwt'
gem 'kaminari'
gem 'kredis'
gem 'listen' # Required by ActiveSupport::EventedFileUpdateChecker
gem 'lograge'
gem 'logstash-event'
gem 'maintenance_tasks'
gem 'matrix' # needed by prawn and not default in ruby 3.1
gem 'mini_magick'
gem 'net-imap', require: false # See https://github.com/mikel/mail/pull/1439
gem 'net-pop', require: false # same
gem 'net-smtp', require: false # same
gem 'openid_connect'
gem 'parsby'
gem 'pg'
gem 'phonelib'
gem 'prawn-rails' # PDF Generation
gem 'premailer-rails'
gem 'puma' # Use Puma as the app server
gem 'pundit'
gem 'rack-attack'
gem 'rails-i18n' # Locales par défaut
gem 'rails-pg-extras'
gem 'rake-progressbar', require: false
gem 'redcarpet'
gem 'redis'
gem 'rexml' # add missing gem due to ruby3 (https://github.com/Shopify/bootsnap/issues/325)
gem 'rqrcode'
gem 'saml_idp'
gem 'sassc-rails' # Use SCSS for stylesheets
gem 'sentry-delayed_job'
gem 'sentry-rails'
gem 'sentry-ruby'
gem 'sentry-sidekiq'
gem 'sib-api-v3-sdk'
gem 'sidekiq'
gem 'sidekiq-cron'
gem 'skylight'
gem 'spreadsheet_architect'
gem 'strong_migrations' # lint database migrations
gem 'sys-proctable'
gem 'turbo-rails'
gem 'typhoeus'
gem 'ulid-ruby', require: 'ulid'
gem 'view_component'
gem 'vite_rails'
gem 'warden'
gem 'webrick', require: false
gem 'yabeda-graphql'
gem 'yabeda-prometheus'
gem 'yabeda-puma-plugin'
gem 'yabeda-rails'
gem 'yabeda-sidekiq'
gem 'zipline'
gem 'zxcvbn-ruby', require: 'zxcvbn'
group :test do
gem 'axe-core-rspec' # accessibility rspec matchers
gem 'capybara' # Integration testing
gem 'capybara-email' # Access emails during integration tests
gem 'capybara-screenshot' # Save a dump of the page when an integration test fails
gem 'factory_bot'
gem 'launchy'
gem 'rack_session_access'
gem 'rails-controller-testing'
gem 'rspec_junit_formatter'
gem 'rspec-retry'
gem 'selenium-devtools'
gem 'selenium-webdriver'
gem 'shoulda-matchers', require: false
gem 'simplecov', require: false
gem 'simplecov-cobertura', require: false
gem 'timecop'
gem 'vcr'
gem 'webmock'
end
group :development do
gem 'benchmark-ips', require: false
gem 'brakeman', require: false
gem 'haml-lint'
gem 'letter_opener_web'
gem 'memory_profiler'
gem 'rack-mini-profiler'
gem 'rails-erd', require: false # generates `doc/database_models.pdf`
gem 'rubocop', require: false
gem 'rubocop-performance', require: false
gem 'rubocop-rails', require: false
gem 'rubocop-rspec', require: false
gem 'scss_lint', require: false
gem 'stackprof'
gem 'web-console'
end
group :development, :test do
gem 'graphql-schema_comparator'
gem 'irb'
gem 'mina', require: false # Deploy
gem 'rspec-rails'
gem 'simple_xlsx_reader'
gem 'spring' # Spring speeds up development by keeping your application running in the background
gem 'spring-commands-rspec'
end

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,66 +0,0 @@
#!/usr/bin/env bash
version=
gitArgs=
while [ "$#" -gt 0 ]; do
i="$1"
shift 1
case "$i" in
--version | -v)
version="$1"
shift 1
;;
--git-args)
gitArgs="$gitArgs $1"
shift 1
;;
*)
echo "$0: unknown option \`$i'"
exit 1
;;
esac
done
# Create a working environment
CWD=$(pwd)
TMP=$(mktemp -d)
cd "$TMP" || exit 1
# Fetch the latest source or the required version
gitUrl="https://github.com/demarches-simplifiees/demarches-simplifiees.fr.git"
if [ -n "$version" ]; then
git clone --depth 1 --branch "$version" $gitUrl .
else
git clone --depth 1 $gitUrl .
version="$(git rev-parse HEAD)"
fi
# Generate gemset.nix
nix-shell -p bundix --run "bundix -l" >/dev/null
# Copy the new files
cp gemset.nix Gemfile Gemfile.lock "$CWD/rubyEnv/"
# Print the new source details
SRC_HASH=$(nix-shell -p nurl --run "nurl --hash $gitUrl $version")
# Switch to bun
nix-shell -p bun --run "bun install --frozen-lockfile --no-cache --no-progress --ignore-scripts"
DEPS_HASH=$(nix-hash --sri --type sha256 node_modules)
cat <<EOF >"$CWD/meta.nix"
{
version = "$version";
src-hash = "$SRC_HASH";
deps-hash = "$DEPS_HASH";
}
EOF
nix-shell -p nixfmt-rfc-style --run "nixfmt $CWD"
rm -rf "$TMP"

View file

@ -1,103 +0,0 @@
{
config,
lib,
nixpkgs,
...
}:
let
inherit (lib) escapeRegex concatStringsSep;
domain = "sso.dgnum.eu";
cert = config.security.acme.certs.${domain};
allowedDomains = builtins.map escapeRegex (
(builtins.map (s: "${s}.dgnum.eu") [
# DGNum subdomains
"cloud"
"git"
"videos"
"social"
"demarches"
"netbird"
])
++ [
# Extra domains
"netbird-beta.hubrecht.ovh"
]
);
in
{
services.kanidm = {
enableServer = true;
package = nixpkgs.unstable.kanidm;
serverSettings = {
inherit domain;
origin = "https://${domain}";
bindaddress = "127.0.0.1:8443";
ldapbindaddress = "0.0.0.0:636";
trust_x_forward_for = true;
tls_chain = "${cert.directory}/fullchain.pem";
tls_key = "${cert.directory}/key.pem";
};
};
users.users.kanidm.extraGroups = [ cert.group ];
services.nginx = {
enable = true;
virtualHosts.${domain} = {
enableACME = true;
forceSSL = true;
locations."/" = {
proxyPass = "https://127.0.0.1:8443";
extraConfig = ''
if ( $request_method !~ ^(GET|POST|HEAD|OPTIONS|PUT|PATCH|DELETE)$ ) {
return 444;
}
set $origin $http_origin;
if ($origin !~ '^https?://(${concatStringsSep "|" allowedDomains})$') {
set $origin 'https://${domain}';
}
proxy_hide_header Access-Control-Allow-Origin;
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Origin' "$origin" always;
add_header 'Access-Control-Allow-Methods' 'GET, POST, PATCH, PUT, DELETE, OPTIONS' always;
add_header 'Access-Control-Allow-Headers' 'Content-Type, Accept, Authorization' always;
add_header 'Access-Control-Allow-Credentials' 'true' always;
add_header Access-Control-Max-Age 1728000;
add_header Content-Type 'text/plain charset=UTF-8';
add_header Content-Length 0;
return 204;
}
if ($request_method ~ '(GET|POST|PATCH|PUT|DELETE)') {
add_header Access-Control-Allow-Origin "$origin" always;
add_header Access-Control-Allow-Methods 'GET, POST, PATCH, PUT, DELETE, OPTIONS' always;
add_header Access-Control-Allow-Headers 'Content-Type, Accept, Authorization' always;
add_header Access-Control-Allow-Credentials true always;
}
'';
};
};
};
networking.firewall.allowedTCPPorts = [ 636 ];
networking.firewall.allowedUDPPorts = [ 636 ];
dgn-backups.jobs.kanidm.settings.paths = [ "/var/lib/kanidm" ];
}

View file

@ -1,4 +0,0 @@
(import ../../../../keys).mkSecrets [ "compute01" ] [
"kanidm-password_admin"
"kanidm-password_idm_admin"
]

View file

@ -1,39 +0,0 @@
{ config, pkgs, ... }:
let
host = "nms.dgnum.eu";
in
{
imports = [ ./module.nix ];
services.librenms = {
enable = true;
package =
(pkgs.librenms.override { inherit (config.services.librenms) dataDir logDir; }).overrideAttrs
(old: {
patches = (old.patches or [ ]) ++ [ ./kanidm.patch ];
vendorHash = "sha256-2RgtMXQp4fTE+WloO36rtfytO4Sh2q0plt8WkWxEGHI=";
});
hostname = host;
settings = { };
database = {
createLocally = true;
passwordFile = config.age.secrets."librenms-database_password_file".path;
};
environmentFile = config.age.secrets."librenms-environment_file".path;
nginx = {
serverName = host;
enableACME = true;
forceSSL = true;
};
};
age-secrets.autoMatch = [ "librenms" ];
}

View file

@ -1,101 +0,0 @@
diff --git a/composer.json b/composer.json
index 13571c07c..dbe810a57 100644
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,12 @@
"snmp",
"distributed"
],
+ "repositories": [
+ {
+ "type": "vcs",
+ "url": "https://github.com/Tom-Hubrecht/Kanidm"
+ }
+ ],
"homepage": "https://www.librenms.org/",
"license": "GPL-3.0-or-later",
"require": {
@@ -49,6 +55,7 @@
"phpmailer/phpmailer": "~6.0",
"predis/predis": "^2.0",
"silber/bouncer": "^1.0",
+ "socialiteproviders/kanidm": "^0.1.4",
"socialiteproviders/manager": "^4.3",
"spatie/laravel-ignition": "^2.0",
"symfony/yaml": "^6.2",
diff --git a/composer.lock b/composer.lock
index b26090101..aa1fd3cef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "21dbcfec63eafb1ae9172473314a57f8",
+ "content-hash": "16c250180b65a1f71acd5653914d7037",
"packages": [
{
"name": "amenadiel/jpgraph",
@@ -5244,6 +5244,55 @@
},
"time": "2023-02-10T16:47:25+00:00"
},
+ {
+ "name": "socialiteproviders/kanidm",
+ "version": "v0.1.4",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Tom-Hubrecht/Kanidm.git",
+ "reference": "b87d75b8342e00c46ef1c29c42e92b629bb206b1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Tom-Hubrecht/Kanidm/zipball/b87d75b8342e00c46ef1c29c42e92b629bb206b1",
+ "reference": "b87d75b8342e00c46ef1c29c42e92b629bb206b1",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "php": "^8.0",
+ "socialiteproviders/manager": "^4.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "SocialiteProviders\\Kanidm\\": ""
+ }
+ },
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Tom Hubrecht",
+ "email": "tom@hubrecht.ovh"
+ }
+ ],
+ "description": "Kanidm OAuth2 Provider for Laravel Socialite",
+ "keywords": [
+ "kanidm",
+ "laravel",
+ "oauth",
+ "provider",
+ "socialite"
+ ],
+ "support": {
+ "issues": "https://github.com/socialiteproviders/providers/issues",
+ "source": "https://github.com/socialiteproviders/providers",
+ "docs": "https://socialiteproviders.com/kanidm"
+ },
+ "time": "2024-02-18T14:12:08+00:00"
+ },
{
"name": "socialiteproviders/manager",
"version": "v4.3.0",
@@ -13357,5 +13406,5 @@
"ext-zlib": "*"
},
"platform-dev": [],
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.6.0"
}

View file

@ -1,682 +0,0 @@
{
config,
lib,
pkgs,
modulesPath,
...
}:
let
inherit (lib)
literalExpression
mkEnableOption
mkOption
recursiveUpdate
types
;
cfg = config.services.librenms;
settingsFormat = pkgs.formats.json { };
configJson = settingsFormat.generate "librenms-config.json" cfg.settings;
inherit (cfg) package;
phpOptions = ''
log_errors = on
post_max_size = 100M
upload_max_filesize = 100M
date.timezone = "${config.time.timeZone}"
'';
phpIni =
pkgs.runCommand "php.ini"
{
inherit (package) phpPackage;
inherit phpOptions;
preferLocalBuild = true;
passAsFile = [ "phpOptions" ];
}
''
cat $phpPackage/etc/php.ini $phpOptionsPath > $out
'';
artisanWrapper = pkgs.writeShellScriptBin "librenms-artisan" ''
cd ${package}
sudo=exec
if [[ "$USER" != ${cfg.user} ]]; then
sudo='exec /run/wrappers/bin/sudo -u ${cfg.user}'
fi
$sudo ${package}/artisan $*
'';
lnmsWrapper = pkgs.writeShellScriptBin "lnms" ''
cd ${package}
exec ${package}/lnms $*
'';
configFile = pkgs.writeText "config.php" ''
<?php
$new_config = json_decode(file_get_contents("${cfg.dataDir}/config.json"), true);
$config = ($config == null) ? $new_config : array_merge($config, $new_config);
${lib.optionalString (cfg.extraConfig != null) cfg.extraConfig}
'';
in
{
disabledModules = [ "services/monitoring/librenms.nix" ];
options.services.librenms = {
enable = mkEnableOption "LibreNMS network monitoring system";
package = mkOption {
type = types.package;
default = pkgs.librenms.override { inherit (cfg) dataDir logDir; };
description = "Librenms package to use.";
};
user = mkOption {
type = types.str;
default = "librenms";
description = ''
Name of the LibreNMS user.
'';
};
group = mkOption {
type = types.str;
default = "librenms";
description = ''
Name of the LibreNMS group.
'';
};
hostname = mkOption {
type = types.str;
default = config.networking.fqdnOrHostName;
defaultText = literalExpression "config.networking.fqdnOrHostName";
description = ''
The hostname to serve LibreNMS on.
'';
};
pollerThreads = mkOption {
type = types.int;
default = 16;
description = ''
Amount of threads of the cron-poller.
'';
};
enableOneMinutePolling = mkOption {
type = types.bool;
default = false;
description = ''
Enables the [1-Minute Polling](https://docs.librenms.org/Support/1-Minute-Polling/).
Changing this option will automatically convert your existing rrd files.
'';
};
useDistributedPollers = mkOption {
type = types.bool;
default = false;
description = ''
Enables (distributed pollers)[https://docs.librenms.org/Extensions/Distributed-Poller/]
for this LibreNMS instance. This will enable a local `rrdcached` and `memcached` server.
To use this feature, make sure to configure your firewall that the distributed pollers
can reach the local `mysql`, `rrdcached` and `memcached` ports.
'';
};
distributedPoller = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Configure this LibreNMS instance as a (distributed poller)[https://docs.librenms.org/Extensions/Distributed-Poller/].
This will disable all web features and just configure the poller features.
Use the `mysql` database of your main LibreNMS instance in the database settings.
'';
};
name = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Custom name of this poller.
'';
};
group = mkOption {
type = types.str;
default = "0";
example = "1,2";
description = ''
Group(s) of this poller.
'';
};
distributedBilling = mkOption {
type = types.bool;
default = false;
description = ''
Enable distributed billing on this poller.
'';
};
memcachedHost = mkOption {
type = types.str;
description = ''
Hostname or IP of the `memcached` server.
'';
};
memcachedPort = mkOption {
type = types.port;
default = 11211;
description = ''
Port of the `memcached` server.
'';
};
rrdcachedHost = mkOption {
type = types.str;
description = ''
Hostname or IP of the `rrdcached` server.
'';
};
rrdcachedPort = mkOption {
type = types.port;
default = 42217;
description = ''
Port of the `memcached` server.
'';
};
};
poolConfig = mkOption {
type =
with types;
attrsOf (oneOf [
str
int
bool
]);
default = {
"pm" = "dynamic";
"pm.max_children" = 32;
"pm.start_servers" = 2;
"pm.min_spare_servers" = 2;
"pm.max_spare_servers" = 4;
"pm.max_requests" = 500;
};
description = ''
Options for the LibreNMS PHP pool. See the documentation on `php-fpm.conf`
for details on configuration directives.
'';
};
nginx = mkOption {
type = types.submodule (
recursiveUpdate (import "${modulesPath}/services/web-servers/nginx/vhost-options.nix" {
inherit config lib;
}) { }
);
default = { };
example = literalExpression ''
{
serverAliases = [
"librenms.''${config.networking.domain}"
];
# To enable encryption and let let's encrypt take care of certificate
forceSSL = true;
enableACME = true;
# To set the LibreNMS virtualHost as the default virtualHost;
default = true;
}
'';
description = ''
With this option, you can customize the nginx virtualHost settings.
'';
};
dataDir = mkOption {
type = types.path;
default = "/var/lib/librenms";
description = ''
Path of the LibreNMS state directory.
'';
};
logDir = mkOption {
type = types.path;
default = "/var/log/librenms";
description = ''
Path of the LibreNMS logging directory.
'';
};
database = {
createLocally = mkOption {
type = types.bool;
default = false;
description = ''
Whether to create a local database automatically.
'';
};
host = mkOption {
default = "localhost";
description = ''
Hostname or IP of the MySQL/MariaDB server.
'';
};
port = mkOption {
type = types.port;
default = 3306;
description = ''
Port of the MySQL/MariaDB server.
'';
};
database = mkOption {
type = types.str;
default = "librenms";
description = ''
Name of the database on the MySQL/MariaDB server.
'';
};
username = mkOption {
type = types.str;
default = "librenms";
description = ''
Name of the user on the MySQL/MariaDB server.
'';
};
passwordFile = mkOption {
type = types.path;
example = "/run/secrets/mysql.pass";
description = ''
A file containing the password for the user of the MySQL/MariaDB server.
Must be readable for the LibreNMS user.
'';
};
};
environmentFile = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
File containing env-vars to be substituted into the final config. Useful for secrets.
Does not apply to settings defined in `extraConfig`.
'';
};
settings = mkOption {
type = types.submodule {
freeformType = settingsFormat.type;
options = { };
};
description = ''
Attrset of the LibreNMS configuration.
See https://docs.librenms.org/Support/Configuration/ for reference.
All possible options are listed [here](https://github.com/librenms/librenms/blob/master/misc/config_definitions.json).
See https://docs.librenms.org/Extensions/Authentication/ for setting other authentication methods.
'';
default = { };
example = {
base_url = "/librenms/";
top_devices = true;
top_ports = false;
};
};
extraConfig = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
Additional config for LibreNMS that will be appended to the `config.php`. See
https://github.com/librenms/librenms/blob/master/misc/config_definitions.json
for possible options. Useful if you want to use PHP-Functions in your config.
'';
};
};
config = lib.mkIf cfg.enable {
assertions = [
{
assertion = config.time.timeZone != null;
message = "You must set `time.timeZone` to use the LibreNMS module.";
}
{
assertion = cfg.database.createLocally -> cfg.database.host == "localhost";
message = ''The database host must be "localhost" if services.librenms.database.createLocally is set to true.'';
}
{
assertion = !(cfg.useDistributedPollers && cfg.distributedPoller.enable);
message = "The LibreNMS instance can't be a distributed poller and a full instance at the same time.";
}
];
users.users.${cfg.user} = {
group = "${cfg.group}";
isSystemUser = true;
};
users.groups.${cfg.group} = { };
services = {
librenms.settings =
{
# basic configs
"user" = cfg.user;
"own_hostname" = cfg.hostname;
"base_url" = lib.mkDefault "/";
"auth_mechanism" = lib.mkDefault "mysql";
# disable auto update function (won't work with NixOS)
"update" = false;
# enable fast ping by default
"ping_rrd_step" = 60;
# one minute polling
"rrd.step" = if cfg.enableOneMinutePolling then 60 else 300;
"rrd.heartbeat" = if cfg.enableOneMinutePolling then 120 else 600;
}
// (lib.optionalAttrs cfg.distributedPoller.enable {
"distributed_poller" = true;
"distributed_poller_name" = lib.mkIf (
cfg.distributedPoller.name != null
) cfg.distributedPoller.name;
"distributed_poller_group" = cfg.distributedPoller.group;
"distributed_billing" = cfg.distributedPoller.distributedBilling;
"distributed_poller_memcached_host" = cfg.distributedPoller.memcachedHost;
"distributed_poller_memcached_port" = cfg.distributedPoller.memcachedPort;
"rrdcached" = "${cfg.distributedPoller.rrdcachedHost}:${toString cfg.distributedPoller.rrdcachedPort}";
})
// (lib.optionalAttrs cfg.useDistributedPollers {
"distributed_poller" = true;
# still enable a local poller with distributed polling
"distributed_poller_group" = lib.mkDefault "0";
"distributed_billing" = lib.mkDefault true;
"distributed_poller_memcached_host" = "localhost";
"distributed_poller_memcached_port" = 11211;
"rrdcached" = "localhost:42217";
});
memcached = lib.mkIf cfg.useDistributedPollers {
enable = true;
listen = "0.0.0.0";
};
mysql = lib.mkIf cfg.database.createLocally {
enable = true;
package = lib.mkDefault pkgs.mariadb;
settings.mysqld = {
innodb_file_per_table = 1;
lower_case_table_names = 0;
} // (lib.optionalAttrs cfg.useDistributedPollers { bind-address = "0.0.0.0"; });
ensureDatabases = [ cfg.database.database ];
ensureUsers = [
{
name = cfg.database.username;
ensurePermissions = {
"${cfg.database.database}.*" = "ALL PRIVILEGES";
};
}
];
initialScript = lib.mkIf cfg.useDistributedPollers (
pkgs.writeText "mysql-librenms-init" ''
CREATE USER IF NOT EXISTS '${cfg.database.username}'@'%';
GRANT ALL PRIVILEGES ON ${cfg.database.database}.* TO '${cfg.database.username}'@'%';
''
);
};
nginx = lib.mkIf (!cfg.distributedPoller.enable) {
enable = true;
virtualHosts."${cfg.hostname}" = lib.mkMerge [
cfg.nginx
{
root = lib.mkForce "${package}/html";
locations."/" = {
index = "index.php";
tryFiles = "$uri $uri/ /index.php?$query_string";
};
locations."~ .php$".extraConfig = ''
fastcgi_pass unix:${config.services.phpfpm.pools."librenms".socket};
fastcgi_split_path_info ^(.+\.php)(/.+)$;
'';
}
];
};
phpfpm.pools.librenms = lib.mkIf (!cfg.distributedPoller.enable) {
inherit (cfg) group user;
inherit (package) phpPackage;
inherit phpOptions;
settings = {
"listen.mode" = "0660";
"listen.owner" = config.services.nginx.user;
"listen.group" = config.services.nginx.group;
} // cfg.poolConfig;
};
logrotate = {
enable = true;
settings."${cfg.logDir}/librenms.log" = {
su = "${cfg.user} ${cfg.group}";
create = "0640 ${cfg.user} ${cfg.group}";
rotate = 6;
frequency = "weekly";
compress = true;
delaycompress = true;
missingok = true;
notifempty = true;
};
};
cron = {
enable = true;
systemCronJobs =
let
env = "PHPRC=${phpIni}";
in
[
# based on crontab provided by LibreNMS
"33 */6 * * * ${cfg.user} ${env} ${package}/cronic ${package}/discovery-wrapper.py 1"
"*/5 * * * * ${cfg.user} ${env} ${package}/discovery.php -h new >> /dev/null 2>&1"
"${
if cfg.enableOneMinutePolling then "*" else "*/5"
} * * * * ${cfg.user} ${env} ${package}/cronic ${package}/poller-wrapper.py ${toString cfg.pollerThreads}"
"* * * * * ${cfg.user} ${env} ${package}/alerts.php >> /dev/null 2>&1"
"*/5 * * * * ${cfg.user} ${env} ${package}/poll-billing.php >> /dev/null 2>&1"
"01 * * * * ${cfg.user} ${env} ${package}/billing-calculate.php >> /dev/null 2>&1"
"*/5 * * * * ${cfg.user} ${env} ${package}/check-services.php >> /dev/null 2>&1"
# extra: fast ping
"* * * * * ${cfg.user} ${env} ${package}/ping.php >> /dev/null 2>&1"
# daily.sh tasks are split to exclude update
"19 0 * * * ${cfg.user} ${env} ${package}/daily.sh cleanup >> /dev/null 2>&1"
"19 0 * * * ${cfg.user} ${env} ${package}/daily.sh notifications >> /dev/null 2>&1"
"19 0 * * * ${cfg.user} ${env} ${package}/daily.sh peeringdb >> /dev/null 2>&1"
"19 0 * * * ${cfg.user} ${env} ${package}/daily.sh mac_oui >> /dev/null 2>&1"
];
};
};
systemd = {
services = {
rrdcached = lib.mkIf cfg.useDistributedPollers {
description = "rrdcached";
after = [ "librenms-setup.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "forking";
User = cfg.user;
Group = cfg.group;
LimitNOFILE = 16384;
RuntimeDirectory = "rrdcached";
PidFile = "/run/rrdcached/rrdcached.pid";
# rrdcached params from https://docs.librenms.org/Extensions/Distributed-Poller/#config-sample
ExecStart = "${pkgs.rrdtool}/bin/rrdcached -l 0:42217 -R -j ${cfg.dataDir}/rrdcached-journal/ -F -b ${cfg.dataDir}/rrd -B -w 1800 -z 900 -p /run/rrdcached/rrdcached.pid";
};
};
librenms-scheduler = {
description = "LibreNMS Scheduler";
path = [ pkgs.unixtools.whereis ];
serviceConfig = {
Type = "oneshot";
WorkingDirectory = package;
User = cfg.user;
Group = cfg.group;
ExecStart = "${artisanWrapper}/bin/librenms-artisan schedule:run";
};
};
librenms-setup = {
description = "Preparation tasks for LibreNMS";
before = [ "phpfpm-librenms.service" ];
after = [
"systemd-tmpfiles-setup.service"
] ++ (lib.optional (cfg.database.host == "localhost") "mysql.service");
wantedBy = [ "multi-user.target" ];
restartTriggers = [
package
configFile
];
path = [
pkgs.mariadb
pkgs.unixtools.whereis
pkgs.gnused
];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
User = cfg.user;
Group = cfg.group;
ExecStartPre = lib.mkIf cfg.database.createLocally [
"!${pkgs.writeShellScript "librenms-db-init" ''
DB_PASSWORD=$(cat ${cfg.database.passwordFile} | tr -d '\n')
echo "ALTER USER '${cfg.database.username}'@'localhost' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
${lib.optionalString cfg.useDistributedPollers ''
echo "ALTER USER '${cfg.database.username}'@'%' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql
''}
''}"
];
};
script = ''
set -euo pipefail
# config setup
ln -sf ${configFile} ${cfg.dataDir}/config.php
${pkgs.envsubst}/bin/envsubst -i ${configJson} -o ${cfg.dataDir}/config.json
export PHPRC=${phpIni}
if [[ ! -s ${cfg.dataDir}/.env ]]; then
# init .env file
echo "APP_KEY=" > ${cfg.dataDir}/.env
${artisanWrapper}/bin/librenms-artisan key:generate --ansi
${artisanWrapper}/bin/librenms-artisan webpush:vapid
echo "" >> ${cfg.dataDir}/.env
echo -n "NODE_ID=" >> ${cfg.dataDir}/.env
${package.phpPackage}/bin/php -r "echo uniqid();" >> ${cfg.dataDir}/.env
echo "" >> ${cfg.dataDir}/.env
else
# .env file already exists --> only update database and cache config
${pkgs.gnused}/bin/sed -i /^DB_/d ${cfg.dataDir}/.env
${pkgs.gnused}/bin/sed -i /^CACHE_DRIVER/d ${cfg.dataDir}/.env
fi
${lib.optionalString (cfg.useDistributedPollers || cfg.distributedPoller.enable) ''
echo "CACHE_DRIVER=memcached" >> ${cfg.dataDir}/.env
''}
echo "DB_HOST=${cfg.database.host}" >> ${cfg.dataDir}/.env
echo "DB_PORT=${toString cfg.database.port}" >> ${cfg.dataDir}/.env
echo "DB_DATABASE=${cfg.database.database}" >> ${cfg.dataDir}/.env
echo "DB_USERNAME=${cfg.database.username}" >> ${cfg.dataDir}/.env
echo -n "DB_PASSWORD=" >> ${cfg.dataDir}/.env
cat ${cfg.database.passwordFile} >> ${cfg.dataDir}/.env
# clear cache after update
OLD_VERSION=$(cat ${cfg.dataDir}/version)
if [[ $OLD_VERSION != "${package.version}" ]]; then
rm -r ${cfg.dataDir}/cache/*
echo "${package.version}" > ${cfg.dataDir}/version
fi
# convert rrd files when the oneMinutePolling option is changed
OLD_ENABLED=$(cat ${cfg.dataDir}/one_minute_enabled)
if [[ $OLD_ENABLED != "${lib.boolToString cfg.enableOneMinutePolling}" ]]; then
${package}/scripts/rrdstep.php -h all
echo "${lib.boolToString cfg.enableOneMinutePolling}" > ${cfg.dataDir}/one_minute_enabled
fi
# migrate db
${artisanWrapper}/bin/librenms-artisan migrate --force --no-interaction
'';
};
};
timers.librenms-scheduler = {
description = "LibreNMS Scheduler";
wantedBy = [ "timers.target" ];
timerConfig = {
OnCalendar = "minutely";
AccuracySec = "1second";
};
};
tmpfiles.rules =
[
"d ${cfg.logDir} 0750 ${cfg.user} ${cfg.group} - -"
"f ${cfg.logDir}/librenms.log 0640 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -"
"f ${cfg.dataDir}/.env 0600 ${cfg.user} ${cfg.group} - -"
"f ${cfg.dataDir}/version 0600 ${cfg.user} ${cfg.group} - -"
"f ${cfg.dataDir}/one_minute_enabled 0600 ${cfg.user} ${cfg.group} - -"
"f ${cfg.dataDir}/config.json 0600 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/storage 0700 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/storage/app 0700 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/storage/debugbar 0700 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/storage/framework 0700 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/storage/framework/cache 0700 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/storage/framework/sessions 0700 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/storage/framework/views 0700 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/storage/logs 0700 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/rrd 0700 ${cfg.user} ${cfg.group} - -"
"d ${cfg.dataDir}/cache 0700 ${cfg.user} ${cfg.group} - -"
]
++ lib.optionals cfg.useDistributedPollers [
"d ${cfg.dataDir}/rrdcached-journal 0700 ${cfg.user} ${cfg.group} - -"
];
};
programs.mtr.enable = true;
security.wrappers = {
fping = {
setuid = true;
owner = "root";
group = "root";
source = "${pkgs.fping}/bin/fping";
};
};
environment.systemPackages = [
artisanWrapper
lnmsWrapper
];
};
meta.maintainers = lib.teams.wdz.members;
}

View file

@ -1,213 +0,0 @@
{ config, pkgs, ... }:
let
host = "cloud.dgnum.eu";
nextcloud-occ = "${config.services.nextcloud.occ}/bin/nextcloud-occ";
in
{
services.nextcloud = {
enable = true;
hostName = host;
package = pkgs.nextcloud29;
https = true;
config = {
dbtype = "pgsql";
adminpassFile = config.age.secrets."nextcloud-adminpass_file".path;
adminuser = "thubrecht";
objectstore.s3 = {
enable = true;
hostname = "s3.dgnum.eu";
region = "garage";
usePathStyle = true;
port = 443;
bucket = "nextcloud-dgnum";
key = "GKda5367c73ca607c349d83c35";
verify_bucket_exists = false;
secretFile = config.age.secrets."nextcloud-s3_secret_file".path;
};
};
maxUploadSize = "4G";
poolSettings = {
pm = "dynamic";
"pm.max_children" = 64;
"pm.max_requests" = "500";
"pm.max_spare_servers" = "8";
"pm.min_spare_servers" = "4";
"pm.start_servers" = "6";
};
phpOptions = {
short_open_tag = "Off";
expose_php = "Off";
error_reporting = "E_ALL & ~E_DEPRECATED & ~E_STRICT";
display_errors = "stderr";
"opcache.enable_cli" = "1";
"opcache.interned_strings_buffer" = "32";
"opcache.max_accelerated_files" = "10000";
"opcache.memory_consumption" = "128";
"opcache.revalidate_freq" = "1";
"opcache.fast_shutdown" = "0";
"openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt";
catch_workers_output = "yes";
};
database.createLocally = true;
configureRedis = true;
autoUpdateApps.enable = true;
settings = {
overwriteprotocol = "https";
overwritehost = host;
"overwrite.cli.url" = "https://${host}";
updatechecker = false;
default_phone_region = "FR";
trusted_proxies = [ "::1" ];
allow_local_remote_servers = true;
maintenance_window_start = 1;
"memories.exiftool" = "${pkgs.lib.getExe pkgs.exiftool}";
"memories.vod.ffmpeg" = "${pkgs.lib.getExe pkgs.ffmpeg-headless}";
"memories.vod.ffprobe" = "${pkgs.ffmpeg-headless}/bin/ffprobe";
};
};
virtualisation = {
podman = {
enable = true;
defaultNetwork.settings = {
dns_enable = true;
ipv6_enabled = true;
};
};
};
virtualisation.oci-containers = {
containers.collabora = {
image = "collabora/code";
imageFile = pkgs.dockerTools.pullImage {
imageName = "collabora/code";
imageDigest = "sha256:07da8a191b37058514dfdf921ea8c2270c6634fa659acee774cf8594f86950e4";
sha256 = "sha256-5oaz07NQScHUVN/HznzZGQ2bGrU/V1GhI+9btXHz0GM=";
};
ports = [ "9980:9980" ];
environment = {
domain = "cloud.dgnum.eu";
extra_params = "--o:ssl.enable=false --o:ssl.termination=true --o:remote_font_config.url=https://cloud.dgnum.eu/apps/richdocuments/settings/fonts.json";
};
extraOptions = [
"--network=host"
"--cap-add"
"MKNOD"
"--cap-add"
"SYS_ADMIN"
];
};
};
services.nginx.virtualHosts = {
${host} = {
enableACME = true;
forceSSL = true;
extraConfig = ''
proxy_max_temp_file_size 4096m;
'';
};
"code.dgnum.eu" = {
forceSSL = true;
enableACME = true;
extraConfig = ''
# static files
location ^~ /browser {
proxy_pass http://127.0.0.1:9980;
proxy_set_header Host $host;
}
# WOPI discovery URL
location ^~ /hosting/discovery {
proxy_pass http://127.0.0.1:9980;
proxy_set_header Host $host;
}
# Capabilities
location ^~ /hosting/capabilities {
proxy_pass http://127.0.0.1:9980;
proxy_set_header Host $host;
}
# main websocket
location ~ ^/cool/(.*)/ws$ {
proxy_pass http://127.0.0.1:9980;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $host;
proxy_read_timeout 36000s;
}
# download, presentation and image upload
location ~ ^/(c|l)ool {
proxy_pass http://127.0.0.1:9980;
proxy_set_header Host $host;
}
# Admin Console websocket
location ^~ /cool/adminws {
proxy_pass http://127.0.0.1:9980;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $host;
proxy_read_timeout 36000s;
}
'';
};
};
systemd.services = {
nextcloud-preview = {
description = "Generate preview for nextcloud media.";
script = "${nextcloud-occ} preview:pre-generate -vvv";
startAt = "*-*-* 01:00:00 UTC";
serviceConfig = {
Restart = "on-failure";
};
};
nextcloud-cron.path = [ pkgs.perl ];
};
environment.systemPackages = [ pkgs.ffmpeg_6-headless ];
networking.hosts = {
"129.199.146.148" = [ "s3.dgnum.eu" ];
};
age-secrets.autoMatch = [ "nextcloud" ];
system.activationScripts = {
restart-nextcloud.text = ''
if [ "$(${pkgs.systemd}/bin/systemctl is-active phpfpm-nextcloud)" == "active" ]; then
${pkgs.systemd}/bin/systemctl restart phpfpm-nextcloud
fi
'';
};
dgn-backups.jobs.nextcloud.settings.paths = [ "/var/lib/nextcloud" ];
dgn-backups.postgresDatabases = [ "nextcloud" ];
}

View file

@ -1,28 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 jIXfPA CQffZYaxexZ2f+HeNj+SHeSak0kzNPiq6ExW7tUyCBs
oJQhtMFD9KSnXSPGRb3zLwCB2/KEXo8cgxHN5ML83Qw
-> ssh-ed25519 QlRB9Q V1PnEYJvFCdBRzN4z3iDtIzHLxxCimejdkqRS4zMCG8
bVc87bxPmhofmoscGFBgQ+ffRlo216RiRkkV1MNoQyY
-> ssh-ed25519 r+nK/Q YI+1MYnCvSq5/QfA2y01IQlJeMGF0AfNs91QlrVaVGs
HSB8Gai96mjRbM68G3iRmXNkI4kqyJAWTMxWc8UOPr8
-> ssh-rsa krWCLQ
k2mssz4C9p8K+rJ6Jbbm+w7uLTqoUOiOKvlt2btEyw2Lup8PQNfyTNFSBvuBMmfj
re1zuAufH0HIw3B0xWYauBSD4pasc7EFTr/OLoM8BRFMEb11IM5ZKJrO+hnWy0Sk
eIs6cpkoBVi4GZmkRfbvaitk42i9JzjrKU0OeqLCWQbHmHkTb3acsGXCc6A6JSbF
AVb+Eaak6EIdX1dP4PWyCxU2PkcBtYBcLoGH74r1o0i3SzvmuzKvlBntx5IzsAvY
+QNGJLNZl0+NePafAkvVY8UOrlzxj+tCgfunAGXIXlZlVfNcjZX9Wv30sJOtwpbw
DdkJAqSrNkHianC5MEGgpA
-> ssh-ed25519 /vwQcQ yxGAMhwDcoDjw5MJudEE95PakhZvNpYfmfWiM6wbQBg
C1o3mNO2YFnBXamCcpAW0aQVGrNNcUpDtSn8+VLobmE
-> ssh-ed25519 0R97PA XRWbcwt3wXR3AYg0rhzc6OUuAA+blVTf3SHERYy3MkA
iCBd0E1NrV7tv3/0pD0FYWgUfGmB4M+VWfiixvVGv68
-> ssh-ed25519 JGx7Ng R47xTx4IGC/qf/v6WOXvJTd20MbeTdZ/8ovAA6d0iyQ
uBxcQVztpW4QaAR5rKfEVgtmrPk6l51+tY3brNjsTV4
-> ssh-ed25519 5SY7Kg LNtU+/1YlPX6T6gO2lb/wEei7hsy2oud8cTQXFQy0HY
xxPvBAIpFyCUqExjseerz6WlwWQEmw9fltzQBx51KI0
-> ssh-ed25519 p/Mg4Q uWIz5shMnsLXsh160cCW8E6kh9v4LPunOonugjWdSEY
5aRrIB5gxIplVWDGeMQ6g09togku6LxWRxBP7FbRNU0
-> ssh-ed25519 tDqJRg G8rNpeGY29czDVMvvt4LZ7nffZ/JAHDzxuIs7C/0SEM
HowgAvrQQcvUx93ZdK5q2bSsJDqaOxFf+x/lwTRss4I
--- ktcSPCC1TpguyYJ2ua7IuGcEw+Z9YuqjzcmH18abjo4
<EFBFBD><20><>ゥ煩 ネ9<1猤カワ簒<EFBE9C>pWJSWpsV/ム#<23>ウリ9タ{タ゚cHB<><42><EFBFBD>5<EFBFBD>ャ^ァ

View file

@ -1,30 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 jIXfPA zSfj75mxEod8RszD4XGaFIeMvcLnBgUHShIW5yFPdiE
YXaCFZ07BMzehG/PCUFDEzRy+y4c+IESO9kcLx+eG8M
-> ssh-ed25519 QlRB9Q 39DPdLnRMs5YSQOr/rY2nXO/8s/oCnYDkRex51tZayw
W3GbNP7qbgW2b0RoZmcWH0kLtQaIV50APGcntjMfn8o
-> ssh-ed25519 r+nK/Q dnX8kPKvyHS5U1N52QTDwonaHbBh8sv2DPBL1PoBO2E
mxduSFeWB4tJlrHDEthNKGv/vxzeWUtNwq1b2nDP6Z0
-> ssh-rsa krWCLQ
QN1OOmCREY2LljXm0+TAsOSkjIQ0RXyX8w5TVOOus5QAt1WTJan/mm4X1SviWqmn
UFDIeCoG2l5tBSyZr4VpnDeq7koWRA2eC7WnwWW47PQIRFSyjf+sy00rGR9kxVuL
1M9gsAGa5sud/PvmgSPSLsGhhrPsH/ZxN9beyIXIwmssmjN34KygUz9+u4T8IkVz
oxdq75LMzE2o0gcgC1EZ5+rDq0NSPQ9+1KgqwJuKlLKRXGdudgaVEUxX60g2ZnkX
8fNEgxqEkQ5MNnPfwbVumF6SWmMWyZSJ0rwHC94O1RdRNDcD3yKimuBmNSv2X+3L
cS3kE9LfNst2zBKHBGBOHQ
-> ssh-ed25519 /vwQcQ ZD8aiyO6fWEM9zG0iPP1/lftRPNl+mmFLHvGxVpSWzg
ZcTmN8zSHz8iLQmCLTZCdaqX5En/KrciR8KHwoXl8t0
-> ssh-ed25519 0R97PA xLQYBS5ozP1e4NWVa9yahN2OQB0Luw7mm3nBYdoHyRI
SKTRzLfGNFQ9fSX8ZFkKIYPZ4If5QrxcmSoBoGVG2Xk
-> ssh-ed25519 JGx7Ng XPo1QJ8OS/ShEAaXWwzZCS1p5/C6mLNlk4Us63YTVQ8
HGbfr8WBfCDKnIlATAeiE6JcLWCbn64vn1Cg7i9QGbA
-> ssh-ed25519 5SY7Kg CFpRcZmZ7DTspxkmdD8x7dRh1mqOHpTF7GzW5xBtLxw
n1n6/Ciwwo4rb3Cb6Yv/b1dHSvVAbCuDZ52maNpCexg
-> ssh-ed25519 p/Mg4Q km6ZjasKtOlaQL8rdVXkjRP4sooql15PrW0lz6YZaDg
Yrpi65IC3RJS3YSAChKjVyvowGxxmSPFkwa6CXUYVZ4
-> ssh-ed25519 tDqJRg au3x6e4L1os7OH4WXbdST74LhMsHPjP6KYrTWKUc1i8
zxKFk51MteTETWEu8peSH/lninM3zZkQi+Xjx5OQMTU
-> l$R6Y:c1-grease
MY0HS+ErZAtAhg
--- w+3gxmkrZ+xxSAQHbERgvsqur0v6k2/U0KUsfegRGcI
7Ú”gpò7𿫹Š\ŠE„àø~Â$±\¹Ä”Q„™H˜Èî¼¼2'k4Ž¥zÿqȦì'ÍNò!{@qxÎ,ƒ+iTû

View file

@ -1,31 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 jIXfPA xQaZW42vwq7pndbRqiATFVgl1QM3LbD5Sqzz61yinUY
7N4GIIAnzwTPA2IgOPWLtE03kCZPihKu8ZAG9e7Bv7k
-> ssh-ed25519 QlRB9Q mfs9SndrSY1meTEYiVxXLbS7Ecf0rjaQ3vX4626+9CI
BDdh3a02EqMeO5jPlz6kjmjuLMldf/s9V7hDkIef+g4
-> ssh-ed25519 r+nK/Q HqduuibujATQyp2TUswgrFyTdcdmPsNsZJ2pOLZ+MTc
WjFm95dxVYKA2ekOgKzMrMmk1nxfuurmDyMXtUIGnIo
-> ssh-rsa krWCLQ
GzznBXY+5RpGFJKli2rOdzO5bun6REyjA78nV8RviQdAN/mGXEZfGFq4HFuQZM0e
fYADtpZxOZ3vyY/9DqCguay3R02DcyTpAhdb6A3kdzApUVR/3ZKJXy0+l5qRqKD7
j/cMfIxk/WpsHKHDWKXkG+FiTnF+V+ZtUom9W1aYFc1506OdDbjBVfTnBFs/+WVf
MWd+Y0ANCFiNH+kjzvALRazkmJgt9SvYWBG6suym6YZ2073GFu85jUJB2juSDmBN
tp0OJvNrjH5F/CcJXLMVrJz4Azin+2iM+re78cSVmZ1aqLf72RIrg/VhuuNy2MVn
gU32t9qy5EvTbzliWpAvxw
-> ssh-ed25519 /vwQcQ rVT/tH4fZ49hwxJTaZMZhzMgkS0MJILZmuL/J1CCPGY
mW3BNdXsylo0Yhg2KYpGNLoDkd7DYX+NEGF8a7j5R5g
-> ssh-ed25519 0R97PA vnXhW5pn1XgOJcMcD1cu7hQLlnIrJyp2Bu3TbThBIik
QFQFocftqwsPS1AbGykbDkIWqaAdZ7I9njS2ZUXz+4w
-> ssh-ed25519 JGx7Ng ljVNZ4AdZ3DLow2m3mf+6bf9zj6+t9RP7w8Bi7aMlAI
E5Q9yEA3d2nPTZO2jFkGnsHyo3W19P/lSG6yl3RL6Vo
-> ssh-ed25519 5SY7Kg 2LcgbYRROFSGfq0L5XBQMl6p62DreGceGqRFzKGi4X8
x4V+gnzdm1HgjYwhBnYAldkchX4YCsUhqoq1iCaOZ6s
-> ssh-ed25519 p/Mg4Q Y+o5nrSvL+xL43OHjEnesKV+9gCl4H4gBmBBjbqDABA
TvGky1wSVanvpq2Xj2FUmRtJ205iq92g6PVDASAfyaE
-> ssh-ed25519 tDqJRg X0Y8YCi5qOy3Du1/DIMMc4W7P6zQNTlwF4+QrisHCwM
SzJPH+h5847WSl9CrJatqIf9CSnKGUQZDK6ROD5LqXU
-> `--grease N]PH
fdR7jONsDC5Fj/FU++dDsFJSa4sLmvnTzPbt3X96zJDHVQypmV+JMhQNudQGrq9K
7oPr3+cA61qtqUv6v519zFLtRXkpY6FMiB2euGJufVZqGh9jDzfi0jNu6dUO7A
--- a0TP8YPal5jgd3BSIm0THbaMHgLOiOgMqdlwQwUGzWk
:È/ Àn ž±Ý§¦p=fu²hãT¶ÅêF—ÙêÂ¥nh¢„¾•œ¹ÀU2#„鵯©“ºôâ>Û“<4.<2E>uŸ‰…m3Ü&<26>g¤(ö<>5 Û¶Ã

View file

@ -1,24 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 tDqJRg ukyCbDqq1/18sjxWxyCCwYgYDavNcRq5cBvpZoqSKVQ
2lmz4ONDnXiW0+FqLwi4OVOClm96YU6NUMxeLcwyqhI
-> ssh-ed25519 jIXfPA MNspuPXKkP/fUp3qoPDmew+htam1l8JczSCCZFil6zE
1ugIhchyaumzv/izKFq1dCer6QPfLt6Fv2rIiU6rzGs
-> ssh-ed25519 QlRB9Q teomppq6nVFhnQFELI/sQNCRuMGNs2Tu6AY/PMWAzzI
LDLn1CsC9xqBBszdp4TZV/uCaYHBb65HS5eoG2+vfzU
-> ssh-ed25519 r+nK/Q GK/IVVvWVNjq1Fa8DKvljC1pD4OUz3MsM+VjROVYfSA
jJ2vK3HFkOGzrxvQJg6PayrEhOPVyvAZS29IEfKRbhs
-> ssh-rsa krWCLQ
XywRp0R34ulA6AhRloj+OonbP3ZmvWvnxko+KSBNZHUEO3P84N/UTSJLhTJrJHps
uYWhOO1VXMdOmu8+s2ymvsFFHZlQ1Ngr28/8Cb4InYbOcjc1jGsA/laSFelGG/qZ
CxoSw59oga+wssAf7NRVDY0GLtZIhdACnlfCodBnwGgr7MrO/jtv6wUcNtTQwqyg
k6JvmeXVO54sAbcICfDNHiWLejOA9B1tQ4biAtNZrw2BRh1siXVcjtrlkjdfqsc4
4R/EDAYLHIMBnG/6Qpp5H3vPEEdwtaU2Tcd5RZHxWR+8ZjFFhLsZaGQZ5GxzlVOW
qd63AwlEvNGOSIMXBqc+tQ
-> ssh-ed25519 /vwQcQ Qm4OViiUxA0eIAiP+tPi+q9Uw+dluFKGi4J35q6dr3A
Byx5ohtc05YfpZhcZew6P7g90KEMammQ0KgvtRGAhBk
-> ssh-ed25519 0R97PA YKE87fWy7Gix4dk+YOqTkMMFyG1mTVjroO/I6rHtLXQ
o9O664qMLUIEwxti17O4VByFCMmOZ4vTtPH5qNscGnU
-> ssh-ed25519 JGx7Ng NfuL52cirg0LkXcoF3a0GYJx82Bt50YS9cpEnDH27T8
OdqOs4ViSnW1fWZ5GLro4Z5afqmnGya6TsoKr3aZs0w
--- oqm2jb9ZHSHAhbxUYWDxQW/FaPwiq3iFr6RIX1nHCYo
쩚Îj½ó˪f¾©Fyz#ö뤄å…ùÕâ íz‰z¥}´ýÂø9(!SÂöÛ<C3B6>¸ûz2kªÈCæ<43>¦J¬T…Ÿ”þG<C3BE>€³“Z_àÑ

View file

@ -1,24 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 tDqJRg 81QjxFKkN+8VVGbQIAuM45veIGdQemg8CUTdPoH2QGs
YotUqCNICfvb/Flf3RHZRLJ93foKpAFB3AOjkol+EIc
-> ssh-ed25519 jIXfPA Kb01OMjnns0qo3LztzEnTShUs2aH0DZzDGDiE3WcqiA
aqdKE5MHxzCCGoIuZSOPIVSSQi75pifkQq+HptU33i0
-> ssh-ed25519 QlRB9Q eo5FA1T5eYatUmM41+RZc0y7ZlHembU+7YduHKUsFnA
tlDL2I+GFsqxiYFZKYNv/F48DnlsmqNLkB6hDbiTFhA
-> ssh-ed25519 r+nK/Q 6Zt+yfT1jAEjO53BR8Buk2nQomxRoFJgYpBRgP3CmR8
hQ8fsGpSWJI7NIpHLCVspMtsicxaiWwigXDzk20pRfE
-> ssh-rsa krWCLQ
FK1ozQkZ73MkzBzhLmcVAdNMvL+UzxCSVc26in+GRnZdDOEW0HnvYSxjnCkRfFZ5
l8Eo69JFVufJgKQ+Yx5xE3hfvZCEp7ih5ZmcD7rleLDGLeW4pIvamiUd/YGvGpw0
G2ZNHHATDviTlK344rc29mx/Dk01bSoAiiQJ+PiLa+bD1Uv/sXuyimm/wos3PeZV
7lcwu/Ug0k2RzhntYYjZML0fgdHlCMEiBRFqMaGAI2snTOnOtfcMb+0z0eeEUVrx
O9wCOwxj4GYr8tYQNujF6QUPF/sEOGXKlMCoK4OExjhfNL2Rrf1QTF1rlgOTsToP
sS8wCH/Gg7UQUb7LqmyA1g
-> ssh-ed25519 /vwQcQ dFeVQpXMkVKV3XLnoaSfIr092hEflFaqj5oH5VJlRVI
eM+EvVHPUblmDpIwLNE7CpU8RHYT/6v11gqliRFrT90
-> ssh-ed25519 0R97PA 1VraTBHXimUuyTRmMFzXcBFGZ+GWDS0eX08RMpRfqFo
24uyDJC0PugE8qsZRVHsUv4EQ89fm5dB6J18Dv7d3NM
-> ssh-ed25519 JGx7Ng j2v9R9ki2tPgFww+oaKAWtarDDUSQXSWLszaGqRi6SU
Xy0bFe+yrcuTMrBqbtmnlF6X6bkxXaQqwrtabTlsXPc
--- p9c3bc4gDKhcJkmiCIR9RJvTxywuPVeenqvgCuJgw6M
ágTÁôÃeÔˆ/<2F>Ë|hg*ý4DY¥íÿØä\Å”$œg᯿*°¶|uþB²gš?õ<19><:;Ýç@J$[dô'

View file

@ -1,27 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 tDqJRg KxI9SGnIHimjqNshpstOhMsH2FzpAZLNWHdzQ/pj5U0
1v+gVfblcSVA2vFcDShVW0iZ/tqMmedi/DELzCkhK08
-> ssh-ed25519 jIXfPA XHM6n4X/vKSw5zvHp9DV/ZWBAvbX7x0fMrCI3LuAEE0
0D4QO7C3A4JaXLlpUJPyn+lK9SB8KdgZIGD0Hsa27fQ
-> ssh-ed25519 QlRB9Q ttXkEpXp6RzjsgxvFJYDrKgyLj9sUMi25R1b9LVP3W0
qcOYZBdWifOzBdsZeYaJRsrPc1GGGmMZh3++eLWMDr4
-> ssh-ed25519 r+nK/Q M8nhPdL5EzyY+0FY4Ztq7cMnNmGaROocFKQD4Mt1o1Q
Gx04awJFu42AoV72PIh+wrvoXVPs1/toTSoxWzimJgI
-> ssh-rsa krWCLQ
Nw0fA8ph/Hofg4FbI6Tn3DWZXKty94CATWoGzjQD0sITszOarq5jAMxZl2BEw4Pz
RYvp65UIJC4zA7N7I7BBmtSbk1ztx1GGAjQZFMcyPYkoZJpagrDdgZMhR04KiNRN
81yG0nPHFlhIOByu+mK2NlvSty0q2bfEbinEUKz3gYqqQVxpg0sVTK79m+w9Fyq1
1U/6wP3UzOcwZ3Kx7ZWcnb+2RL+d70XFJEjYt59k8n8qfQuU4+3Lcol2CmbP7S+Z
S80Jvb2oRfLHB/0asuoo2tQ4SahW3K/1EcnQh3yOruIRDInm3CENDOprffqNcj7D
UndedK+2AzN3r/Dbr4aerw
-> ssh-ed25519 /vwQcQ oCD3GfzWpw+LE7bZGBYXLS289GLpTVcqWcnPukkgW3g
p3Tvvo8wb9Lv8rWZvh0BWbPvxYa1CYIGqqR5D14KBzY
-> ssh-ed25519 0R97PA 0H8OwGLeauHpSQvJ0yXJiIHxCl5aEJOXwe/HCRN3Q1w
/9son3mlGKOzSFQRDG2S/3abKrAnIxHho8EhgAQe8gc
-> ssh-ed25519 JGx7Ng DNtqL7Qj0/MU9WibUUFb2y/MpXbNrE6iMaJuCJQjREA
mqOEERErLEarNAzg453NIiWOfHd/ohDartg5+Ud3C7I
-> >Qzgp+-grease Tbc'Py} $ck/
TVvQj9iSMPaXM91Z74ylxesYetcaGAZyRQ5lRnUTE3Rd8G4hcnXNxzeD3/4GM+zY
s8ptyOVEqYQQJyvGg/58wu0
--- vhTC+XJU8C8U6FYqGPDv92pkSF54qNqqcIbZJtykFG8
ÑÜýH²Ra&·CçÃÍ»)¼\'ÿå#OäJÏuˆ_·]½ÓÍnmSXô<58>Ár&u^ãecŸ_?ÙUyì_åJ^—}¿¶!3ÙYüУ7Ò|èâêˆè€¥ÎíØyÊÄŽúÅÁ¿rn[[w¦x

View file

@ -1,24 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 tDqJRg F6kru2M2ZD++ylqZ5oRwHa+zz/vO+y0ixCB7oNGt3no
jzeyn2DIiRMS6pUyAxOFmsawWhXCPWJxAE73HNpfjMI
-> ssh-ed25519 jIXfPA lH3MYyh0uy32pAwTWeMRM1X8ThIGccfH4CGUNeO/ezY
R4D0dxxPsgrC63gTTae4uLJ8J5Kf4ZetIn4Yx4RVo+0
-> ssh-ed25519 QlRB9Q tOTcm1/j5R7lq6jWTXS/WuQBWps2pmI0i+tzwqvvQkQ
n/+GFXwdAwVvPv6wEOBRwDzQBG8vKooCWIUPBRsxE/c
-> ssh-ed25519 r+nK/Q ZTzwGvZEnw578JC8ROqVaG2ejCpHSkbhuLZLu8sxMWk
0pWfDKzeLPpUd2+RdkXOvMhQaAXK7AHgOMOkPcjQP9E
-> ssh-rsa krWCLQ
RIkTbc41aHXyybIJw3mMww5b46pb5rhjEvV8w+cU4vb7xaPt9fYTxPQa8eUZ28md
dwp11I2XQ/ujt/ECzXcgXboOVvd1GVgjNzJQhgXVJ96AC9Q/Jh8VXLW0/gxNvVjA
L54RWgQUo7EuFcFfxQksfblXIo4lNrDwu+5R/YkWs9NRMAgTDJYL13s4oUKykQ1F
SmZ0wJc+h42xH/+RZtq4Y65twbLkMzfM6BcwX+veR+AEI1FOtaACUmShePFyHdqT
uMdr6u9mxdS3zvB3WYLkVGpOSgkiFlsE7M7gXz8qFMMcd2aDs/Kb3oZ+nijRM9s1
HUt9MzwAPRUHN/egcmQ0QQ
-> ssh-ed25519 /vwQcQ EvwZHCvEyMoMAupu0K3a8HJq22L+v9w4Slvf40mpaz4
1n9tK86NsSv63llpifEEovq6MJSCbvaPX0SK7sxh1TA
-> ssh-ed25519 0R97PA r8hpgykfbDR5sUbHFyWqELUQ87k1oQrACo3iHqwmWFg
56Yg1iRQKxa57+eAekHj8faRX/FbSrtmII79HlJjoxs
-> ssh-ed25519 JGx7Ng ELVGzyFAxq1tUzmMGp8TMD1nk24KHTpGf0QhVw7MWm0
3FfQf6psLRkz2j80CUHS3DKcPhQ3ObK0VZ+ZW3x0YxY
--- a9E7zbh0zWgapnThLpfI6nlQU8feDbz3WX/52I5zi0E
&vcGô•ÈÛŒ• ëÚ}cH· êl/¾n°×%Þ‹ä¥Â †ÍÌ‚ÀŽ-¦eqkà³÷Ã<C3B7>

View file

@ -1,26 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 tDqJRg LXhMd6/5sCDjfcHrzO47alCvWs6+IUzIRUi5GJvdGWk
A4TfEV8n1SXLWza4KK3qi1jJ9tYir94XGaIHOc+mXNo
-> ssh-ed25519 jIXfPA nwcO+/nLlc9itdcNqb9t575Jqld1du4fvjqaZQjI6EY
EXRi4c7r8I88cKmdbSU+1UFM70/40g5+yKpbMRmtLGg
-> ssh-ed25519 QlRB9Q tFlhyWKx8cwLlbojKfjT5b3v+DJ5UIQT2i5Bry0hQyc
tg/AOuiCNet3QEM4oTfInKVLA9nmzIZHe9ZpotaBIBE
-> ssh-ed25519 r+nK/Q wdwpBiYrQdCRcqzWKGbP0+XtprVZpnrddrLH79aJIHM
seSMbR/8G8+E9HECBKgoJnC1Ke5pEYdgh7DWJGCGtqg
-> ssh-rsa krWCLQ
f7rsLcCaBZ1IkT5xV/+rsgny5skuiMjLUQg+57TGmJ8LR7KvdlgxKYJ14m9ncHuG
rVD38lrdMrKe1/RhVoj4MzTFW3fEtNrrhowjbzCyFeEca67QiXeW3sawZppsZFFn
LplyiYCmuKehNqwgEeujkBMiAsonJK6pg1CzXLJDski7M5PO7D5UOoUAptSTLwWL
RgahM7iXZQqqVqs+CeKicUwCm5ecftVNQ0IZGp4B9jQsPXFUGycarw67yMHM0eh+
idy/RgnE5EPLyCEzszT7sEElFqtI+YIWtASkdHA0RHWZQJ7x1xNgVzEN8ERqM60k
7nlrgNAF7D1BEbUiQxWdqw
-> ssh-ed25519 /vwQcQ 95EF0K0ecK95z6/YMLYeuL0m5z7Lvg5ZYz6Xlnp6DQY
oovJvAJfGF+P1ujI+KPFUJZphHG3FAwAXY+z4A3cmdU
-> ssh-ed25519 0R97PA viG7RR0Ul8FcdAsutrjpcHpQWPaAtFYbHWHk30/Whlg
lJSh04cNnej404xaUBZJW3VZdcB0C/2Pay84fcsQQTc
-> ssh-ed25519 JGx7Ng vQ7oLizY/zah9UYSd8aG8aVN/IkjVArPmGpXf8GIUDE
KAU2HD5szy68jyMkq+XS/yuUIwJX4F4YGoSxXavkjpg
-> C`94-:HI-grease
rO7P0+Dn
--- Aqdxflc4E0+U80I8mz44jKLsQLBCpQAwAQwKNLNlhPo
7?<3F>[dÉåV!ÃaOàÍëòn »<>ÜñeÇÊ$SMrãÁlOò)Wn!y_¿•W †qÅÓ<C385>ó©”Ìí÷£ ¸<>Ó~8[<12>F<1D> X¬wa+­÷Ã^kŽX*¢6p±Íùî@—Ÿ¡@žòY”I1<>·o8MóH!3qÍ Nހݬ/<2F>J:c< -ˆ'‡<>?i«œÜñÐï Ú

View file

@ -1,27 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 tDqJRg 8+Y6xMFhbX5L9ybASfvPBDJ2mGIveUg7NN3MDrPJo0s
sPwxCJJFFdEGmqdiIDE+MDI4VDuW7WLy7ZGSp//9siA
-> ssh-ed25519 jIXfPA NyBSpGNY40iDhUsn6a+M+8F4IStqIr3oP/GedHyxOlY
DZOQwuvyD9ZlBaHh7pkQAdU5vD1tjboXttbUvF8J/LU
-> ssh-ed25519 QlRB9Q Qum4OnMolkbtgv8/6D223NDSuHrvR/F3q8tykiUWRnA
rfeci/wSNAcaf4PMkEfa6god1CiRe4kBz0O3x8hFlFo
-> ssh-ed25519 r+nK/Q 767xxzJVtHdGogs4P+rntD7dCYrC42O8vfP0l89S9jo
SUbjLOnChbUd9OwrZtYjWWQWeXbD6AnoM48f4IjTMqc
-> ssh-rsa krWCLQ
U57D0XndUYML35wDIPOxgdvofoKU7HXgb7ElQSv1nKtfivTGew3phCzVZFA6j/mb
Ua0J2HyeLgh+wr79HVrKX+L2zKwY+Svbl7eEZOIucIwc3QUlHLlunpgsy4XfkB5z
emadc+nMItGrR4AwYPuVIvjLhKerQNxF9gVdEQaqHMnJdLCBjmLhPaVL+sllDwF7
87u8GHI/ofZdLx8BlcqGvRtDRFNsmYyrVsJBB+WqRx0Nf1f8Sw51ie2wlAJ+Luu2
04JE5X0JPDL8zJWE9wKcconn7DnaVW98qFR4TxQbvUcpsaLAv3P+ah9+jKa1CHXk
freXRYDaxsIJMk8lrYYYFw
-> ssh-ed25519 /vwQcQ E8vjYcz1dPVtmz/je00SxFzeGZw+H/6g7oE+/3FBYzs
ABcTJRxjPWgpDhCgPDH7kgvwVBfflWMKwqsrqtEoPCE
-> ssh-ed25519 0R97PA 9Ruui56EYgG4R4VtAB7xzhLZLyit+hSjwxY3fWRPIBA
i2F6MIqIFRRaaatIQS4Db0eTOINA+z+yN4dtABNAy5M
-> ssh-ed25519 JGx7Ng tbPTSJbTwln0mbLHsRsoGPwJB1Ul9SZsYqbWedGpAw8
7Qxwu98bVfvRCprDg9UrM7og+69MLAVeKa1gC5N+l4s
-> H}rwXW[l-grease $0MLfP.! Wdl 3Ii%1 [YU*Y
Rju41TAZdlGEQHVLBJwE4GUUB7t9tyKyIya44Q8U3m+S3F7tZYreYINGbNbZ0k+k
Hw7dGgehDWY22CIfrwawJBe6Mekbqx3xLJNg8w
--- 2MpE/97PS8rXGcLIrzCbscVfxKSe8BOyYq46lcc0Bcw
²O}…4®é¸]!/¡jY´2¼I×Q<C397>ó ~2aÝ^m3fšjx/±,°Ð>ÓÀD57‰o :Cò1KGó6kDù´„qî$±k@TÑ=2¥óœwfÝ+‰°‘Ÿ%rÐrˆ.;C™L

View file

@ -1,27 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 tDqJRg X/tRIl6TzF09a1Tvr8vP3SocmlfwKg307he8LP3Q5mo
hWjX3AUbREbQR+uCiW8Nsj5nCwYQYy1KV/41sbxBFo4
-> ssh-ed25519 jIXfPA 6EOXJfa+aY4JjOb0SO2k+s6xnNjtm/o8au6lbN1UfxA
dVsgH99btiE+pl7Q4uiOcYDTwtv6X0jgjYXoFFd+tPs
-> ssh-ed25519 QlRB9Q 4Hje1HQL+Zjm9+BGDQvb83KaizOjfKTwjiq1SJlXvA0
w2rMGVcZcS2aLNYxHZIJZF/j50CQm8UCmq89W9K7Q14
-> ssh-ed25519 r+nK/Q aPQh4X7xZnTbrkxIaAwUbaS7NnbHMY+Q31E0x7AvwSo
rnMus4wPVugzscVNPO33rNgboN7I42tdz4dikVOvWIw
-> ssh-rsa krWCLQ
Xe2Vv3tCZy19QQt26q6T3mJkZyltU7OVOrruwxWr8hlaKgOfR/pMa7nbR+eWm6jS
++39H+E6gssE/534ld5qz2J3oPV5E6+p4wok/Owy7zE6aWrALP1Mp296lumRjjGN
6aYhmf4fbpvOWDMNujExWURggswbUplk0f7l5UYjNpcSnM9Iq6s9fTAUVTMAlvoL
cmVvPTll6QlhhM7tkJL1fo+1nEimfmwDaOhE2lAKKJUD7DTqcBGsukpysOhcmCyr
Xtx38kcuF5eaDzjT9gXgi4QtCrxf31Lfjju44HSqJFB1LqO2Vzd9rASurD2LN7/1
uj8F5y+dmf6IqIM/kYXqPg
-> ssh-ed25519 /vwQcQ Byl5reTJslEFsIdUWp+rg5sZxG1jEHVduBE/grTD/Vc
SEzFbpWUZrVitO1Swfs3/pzfaZ6Zd4Roi8anJRHO7/o
-> ssh-ed25519 0R97PA CLDuGuFPHf0rgUoCUY2C1jtXAeBEqKiqaeiH4ZcRFk8
rBYZfmS7BSKDIJMVpWTGy5wRhhoi9xR1GchVsUn7Psw
-> ssh-ed25519 JGx7Ng xqTydh3Bt5bL/7R6ZnVtqhfSW2V3g1g2UWPcePt8TCU
lPQeGP4VQGU4xeGqVcIRnWZjeDp2Q4lH2CLg+C/weyM
-> .-grease
l4qPzZnL/yerx8Y3VUmUoO2GgK7OUAjbhfYsHPhDFSo+ZPgvYo7qpJBEsPQqrPA3
FF2/R9IFD+jFranJsg
--- ynZs900dI1cp+HWu6HdnUGKaJw/Wa1Y26eQSeO3fvH8
|Nös.­æ·»×KC²éi#<11>XôfÓéöÃÎq[í¶t{ŸôEkœÇ±­<AÿñYd'çÉ…²3ȆbMæÝ;0f”V[œ¥<ûàX;E

View file

@ -1,26 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 tDqJRg eFczeKxbba1gwn822mWYUNmZNnNeEfXTRkGCyDaiklo
S/f2Wcr/Rvu4RA6dfhTsRPJwSD7IQRJh31C0tA1o2gM
-> ssh-ed25519 jIXfPA SoTCqUmBludbO2xiowGA2lYUopGx7VU+yOn//6IAYEg
IguizihadnsOJSEVa9OVOL7jvrtI0hJkqm5WZMsWz/g
-> ssh-ed25519 QlRB9Q jRUO7iTPtVXKVOdIQcyZmfvgK4ULrHH8C5tb4dkoVk8
ZbXBjPeT9BcFpCw1YIVHsEqOKm4f640M8OJcD4xi760
-> ssh-ed25519 r+nK/Q faReoyDFkhSROsdiYn9IsZMszVu1sOrG7/QlwtJOAho
ov3T4AI7PzldeWYXSRDegq3qTGaZJb2JM3JsErKc4g0
-> ssh-rsa krWCLQ
ZUTsm0W0l+Ucod66o5UIMgr+7HNbv/8BX6aFhgwb29+1A7XhDmKR4zykYclg/SWG
eWUZNuKpPU0RjIKM6Ijn5f7imr3U8UX2yq06oUQ+IZoljP94Q7h7JqdBVlI3SHjm
7rd4qPJM3eFZAPtv0RgHHEfmjADI5j9pJY/g0ucRkuU2RsqhSJxkU7K5dIUd4r/Z
/rGpBlwryvtKFiOHpQGuusr6pLWHYXDRHd3yLk5m5VKgkUIpygelakIhXQ7RdSw/
Wn403eOEz0ZWKy9b0dk7s1nqBE9BLwW4WKxCYG2aegVWJeRjZSkeKjpXyO67+Gbl
L9Y9Soj4/Pl0LtMIKeUrXw
-> ssh-ed25519 /vwQcQ aXCrEhFaCpkWXDH7dIc75U/Zp4kasXH08vFvMPJIuxw
jR8h3NxfAd4oKZ0zrKsRCbssNsc7WoVvJ+FV6v0AnwU
-> ssh-ed25519 0R97PA XK0SqZtwHnW4QzFfym/Ts70SZ/voM3Vcy4hIJfcodUE
cTt80+v1IAIRbZckgSSBhYO4pWVaSP2fGQw5GWx+wS8
-> ssh-ed25519 JGx7Ng 5+miQtKCui673QvWbRRywF68KeCjeEZreT/l8+rXsW8
wEkDUJfpd5mPKrZLnq0Bvkrd86OFBQ86FWwqAR39yTM
-> /S9.@;7-grease TX< 1MD:2 "M2 G
OA
--- 2SAsxu0cZ8MqKKGWhQBA+2q5BimvFI4xrlZTjKY7/8Y
 ˆ9¸"™ÿfc ŸÉVBÓÌÆ­BAè«6r¹‰$ú¤ËàãNèuôÙ­ù¦êÈ6šêü²|,ñ‹¢`Æq

View file

@ -1,28 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 tDqJRg /JJUhm9FSXvpTAiBVlFckNNjPQ7462DYL2Am6MQJ2wI
DlNGDtFm//uSyQslm5y2gwem8MMb8Vn1IBFvSwLTrgU
-> ssh-ed25519 jIXfPA 4xGwdPIlqjUOAT71JJeJnoPHJ83pj199Wq8pHuTNSVM
/ghnfL6ZnaC2gugfAK8LMgelRZfXusc/3WvunVOQdIg
-> ssh-ed25519 QlRB9Q QUhRB5cRh3860hv9rfR9fivprTcnPJzjwbxbcTSvAC0
7Q3OoKLQiG9M1m0Jo8fDC5A1syJE4SWpemFcNps3Xek
-> ssh-ed25519 r+nK/Q xLoI1QWgOOy7jvIVbYBPIkp0dJmHdyDbW3S+tZKTFj4
i8agupe8eRb1MoA0v+YXnAP8Ht6h7rUQ2uO96zN/kzs
-> ssh-rsa krWCLQ
JPkD2Dx1hl12lKqFYRnrPSksyx6857DAMPEijVskvnBoSy7aaYe5X8im08DTrU/y
fDIpP+KRsV76Cwf4wXWPaklprpdABtiPddU42ez52LFOBGxN8GWUeMMLsu2P87T3
2AxpxZHyWXnOXXZkDA8dXuaG1f72rTHKDktL8gpJIaPwJU80xz5aqfW//MdpCWai
BFwrH+g1E+d4BDuwPQtaJTdHPXtuzJeWNLUGh98BHhtmAj5KeA0VqRiuPLvMR5WA
hweC9/TC2/L44FvBzRCRZ1G1Wi/6y9WSFqkxIDkPS+FVaHydQzCU/nVMbWBrMqBk
AOkBRVVbkQ+FGlgRQRoSwA
-> ssh-ed25519 /vwQcQ cEOzkX2MsPTVoumhNUnoNKQLVQBKOWulWiAji0h7TX8
tqyUiR+pF7/TU3l2zTeyfCjGpfDEYstSzbjY92zNTvI
-> ssh-ed25519 0R97PA 87EH9ErhuLEAutvi+NFGhlu1I82VRKlQJeYh7a0Q1Xc
WkMBpNBtqMjX11e+aeVXwNz0TyjSz/Rt+/Ds8Wjoi4k
-> ssh-ed25519 JGx7Ng 86YKANcxCOx0UnupkuA+vcRlNH6nGK8a/DBF8E9JQSY
YhLMromwUoM1w/fSEhhNc2bXCOQO0nTn/wUjx3ukQWQ
-> $b'P9-grease 6p!S!H 1C) x JnJ
tkAmhqMSaA5o1UEYdPr1g9M7M/3zd6r8ljLJqvvN+DxdPz1ll7RGUYgTOD2QBLwO
kJgbOQ1SEqYYH5wpuETSfvl+jCxG96vw7l4QnQ
--- TiTFdP2mgqwzvwbSFhm1eFLUsN8VQg6HII+D1UvxO4I
Ô"K•ş2Üđ«mú^5.MČ4îŠaĐ`P9
häZ-ÚQ˘Ý_^´ů3§®Ţ™łIŢ<49>fJxf]óä2¶ ý‡ĄîŃů©·Ź0PýÚN<>_ĎŘŞ *űčŇĘVˇ}˝ŻŻ

View file

@ -1,28 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 jIXfPA T6TOJOuejaoxw3zdeLzGm0CrSkDCCIRenL7wMGnDtlU
dubdAXhc32S6BszHddOcMA6aStZLOvc+36s3nZsYFMU
-> ssh-ed25519 QlRB9Q akzRDbZzo0LwoS1cOwE/tYdz7M+6bhgI81d37d1GtBw
KsGqFhkjlcJNquMi2+1TfQDBy9qguwh5ED9KBg4Y2hU
-> ssh-ed25519 r+nK/Q bL6A9O6UnjjyY+iLvbQSvSTjXX38FLsNjaSngoQXHxY
YZ7Y11inKpzA2m6lro9XXX2qkW6FmkeFGZ3Ak6X+U2w
-> ssh-rsa krWCLQ
dZVUqAyqrP3KHZlpu70IBU8U3I9IP71RzjbiF1rp4rOdz4iQ9ik88ai+hXVuadcN
DMl/7pIkVky6EL8JxFXTQhLivJUpO3NcN3iAS+CLKC+0EFVc03sLyCjn8IExO85r
Lec37ICk9n4LUNEA91A2h4C8U9TbDxCt7MLrIKcQtfFcd+4U1o9g3n19xo9PK1Ho
mcqTbUVgW1nOLxsEeCp5zsCQ+/8tFLcnK08yUB0RlWK+PDFZkk8u8Q2SYZjnaeEp
cwOhUnm/1a15IbW2oGCrVaEd/ymnLDJc6S7vXGpFDWHmOzvJ4Av9KZlGFYaWCjbV
7bGIgWkiQ7iJvTxzu0ZEqw
-> ssh-ed25519 /vwQcQ /DR3Kox7XkbdYQH7SyIc9atjwwe7Ah7hH/63RlzDd0g
k/199lCIfxR7l4ETJMEr1Ch1Zx8v3M5zn0b8mg6ip2k
-> ssh-ed25519 0R97PA H1PS+SlW5FNOf15eO6MKJ/nnVJQkfFMub0IzTS4PhDo
77zwCD0tbrLu4J0vS0RxPK3YZucFV1VYkUVoMTHjf2o
-> ssh-ed25519 JGx7Ng 2WIYPKkWXplInR8v1q22ygs7uYNfIzETeiCt5+MKQQQ
9Gsyr30kaNhxn+fUCBicvoA+hHiWpUf0d0pxRZauhMY
-> ssh-ed25519 5SY7Kg QTnBfvkMcnXpGITtaHr+mRZGogI1kTUqO4byfyMZhGE
89A/PPHVPeBQvTxCeXH8ITVDMkcsYUMbwatyw8NQ04E
-> ssh-ed25519 p/Mg4Q n6hQLuUv3QOMADJF0zpcALYqVUVi5tZHmKGmVZA0IVQ
ZXa+3y33kyo4vQxcEa2XTMIwjH2HE+bAKZw993PgROk
-> ssh-ed25519 tDqJRg Hf1KIZjUTTaHo18P1vWxaSehyKTFElBOovrCN0uJFCc
H8qGw8vIqp4bNiyon2uvTkrrd8lIYnMWnIfzS+w4QRQ
--- QOKOfU20JY1Sj+K20UUxgtPZ7JxKuZ1GtK+OKBZ1Zhg
Íúâ?º}àæ2æŽýiÐM}6BÖw#b2Ï´žËйÍÊžvu´¿,Ö'.ŒWÔ”øIPýã'ixYÍ€*·šKoÎtXI#Àß6b`„1pÃЬòÍœˆ×"§lâSf(ˆ`UöëÄê6 kT°Á'µÎÔM@ÈÖå„hŸï®{WYŸØÝÏÂ<SN;UŒœ ݨÿ

View file

@ -1,28 +0,0 @@
age-encryption.org/v1
-> ssh-ed25519 jIXfPA CQffZYaxexZ2f+HeNj+SHeSak0kzNPiq6ExW7tUyCBs
oJQhtMFD9KSnXSPGRb3zLwCB2/KEXo8cgxHN5ML83Qw
-> ssh-ed25519 QlRB9Q V1PnEYJvFCdBRzN4z3iDtIzHLxxCimejdkqRS4zMCG8
bVc87bxPmhofmoscGFBgQ+ffRlo216RiRkkV1MNoQyY
-> ssh-ed25519 r+nK/Q YI+1MYnCvSq5/QfA2y01IQlJeMGF0AfNs91QlrVaVGs
HSB8Gai96mjRbM68G3iRmXNkI4kqyJAWTMxWc8UOPr8
-> ssh-rsa krWCLQ
k2mssz4C9p8K+rJ6Jbbm+w7uLTqoUOiOKvlt2btEyw2Lup8PQNfyTNFSBvuBMmfj
re1zuAufH0HIw3B0xWYauBSD4pasc7EFTr/OLoM8BRFMEb11IM5ZKJrO+hnWy0Sk
eIs6cpkoBVi4GZmkRfbvaitk42i9JzjrKU0OeqLCWQbHmHkTb3acsGXCc6A6JSbF
AVb+Eaak6EIdX1dP4PWyCxU2PkcBtYBcLoGH74r1o0i3SzvmuzKvlBntx5IzsAvY
+QNGJLNZl0+NePafAkvVY8UOrlzxj+tCgfunAGXIXlZlVfNcjZX9Wv30sJOtwpbw
DdkJAqSrNkHianC5MEGgpA
-> ssh-ed25519 /vwQcQ yxGAMhwDcoDjw5MJudEE95PakhZvNpYfmfWiM6wbQBg
C1o3mNO2YFnBXamCcpAW0aQVGrNNcUpDtSn8+VLobmE
-> ssh-ed25519 0R97PA XRWbcwt3wXR3AYg0rhzc6OUuAA+blVTf3SHERYy3MkA
iCBd0E1NrV7tv3/0pD0FYWgUfGmB4M+VWfiixvVGv68
-> ssh-ed25519 JGx7Ng R47xTx4IGC/qf/v6WOXvJTd20MbeTdZ/8ovAA6d0iyQ
uBxcQVztpW4QaAR5rKfEVgtmrPk6l51+tY3brNjsTV4
-> ssh-ed25519 5SY7Kg LNtU+/1YlPX6T6gO2lb/wEei7hsy2oud8cTQXFQy0HY
xxPvBAIpFyCUqExjseerz6WlwWQEmw9fltzQBx51KI0
-> ssh-ed25519 p/Mg4Q uWIz5shMnsLXsh160cCW8E6kh9v4LPunOonugjWdSEY
5aRrIB5gxIplVWDGeMQ6g09togku6LxWRxBP7FbRNU0
-> ssh-ed25519 tDqJRg G8rNpeGY29czDVMvvt4LZ7nffZ/JAHDzxuIs7C/0SEM
HowgAvrQQcvUx93ZdK5q2bSsJDqaOxFf+x/lwTRss4I
--- ktcSPCC1TpguyYJ2ua7IuGcEw+Z9YuqjzcmH18abjo4
<EFBFBD><20><>ゥ煩 ネ9<1猤カワ簒<EFBE9C>pWJSWpsV/ム#<23>ウリ9タ{タ゚cHB<><42><EFBFBD>5<EFBFBD>ャ^ァ

Some files were not shown because too many files have changed in this diff Show more