offspot-config 2.3.2__tar.gz → 2.4.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {offspot_config-2.3.2 → offspot_config-2.4.1}/CHANGELOG.md +19 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/PKG-INFO +1 -1
- offspot_config-2.4.1/src/offspot_config/branding/horizontal-logo-dark.png +0 -0
- offspot_config-2.4.1/src/offspot_config/branding/horizontal-logo-light.png +0 -0
- offspot_config-2.4.1/src/offspot_config/branding/horizontal-logo.svg +1 -0
- offspot_config-2.4.1/src/offspot_config/branding/square-logo-dark.png +0 -0
- offspot_config-2.4.1/src/offspot_config/branding/square-logo-light.png +0 -0
- offspot_config-2.4.1/src/offspot_config/branding/square-logo.svg +1 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/builder.py +22 -14
- offspot_config-2.4.1/src/offspot_runtime/__about__.py +1 -0
- offspot_config-2.3.2/src/offspot_config/branding/horizontal-logo-dark.png +0 -0
- offspot_config-2.3.2/src/offspot_config/branding/horizontal-logo-light.png +0 -0
- offspot_config-2.3.2/src/offspot_config/branding/horizontal-logo.svg +0 -37
- offspot_config-2.3.2/src/offspot_config/branding/square-logo-dark.png +0 -0
- offspot_config-2.3.2/src/offspot_config/branding/square-logo-light.png +0 -0
- offspot_config-2.3.2/src/offspot_config/branding/square-logo.svg +0 -23
- offspot_config-2.3.2/src/offspot_runtime/__about__.py +0 -1
- {offspot_config-2.3.2 → offspot_config-2.4.1}/.gitignore +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/.pre-commit-config.yaml +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/LICENSE +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/README.md +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/pyproject.toml +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/__init__.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/catalog.json +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/catalog.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/constants.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/file.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/inputs/__init__.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/inputs/base.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/inputs/checksum.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/inputs/file.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/inputs/mainconfig.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/inputs/oci.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/inputs/output.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/inputs/str.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/inputs/ways.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/oci_images.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/packages.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/utils/__init__.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/utils/dashboard.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/utils/download.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/utils/misc.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/utils/sizes.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/utils/yaml.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_config/zim.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/__init__.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/ap.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/checks.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/configlib.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/containers.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/dnsmasqspoof.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/ethernet.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/firmware.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/fromfile.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/hostname.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/src/offspot_runtime/timezone.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/tasks.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/tests/conftest.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/tests/test_catalog.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/tests/test_checks.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/tests/test_humanid.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/tests/test_inputs.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/tests/test_link.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/tests/test_reader.py +0 -0
- {offspot_config-2.3.2 → offspot_config-2.4.1}/tests/test_zim.py +0 -0
|
@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## [2.4.1] - 2025-03-07
|
|
9
|
+
|
|
10
|
+
### Fixed
|
|
11
|
+
|
|
12
|
+
- [branding] Eventually settled on no-padding branding
|
|
13
|
+
- [kiwix] Fixed links and NO_HOME broken in 2.4.0
|
|
14
|
+
- [dashboard] Added offspot-config version as hotspot version for dashboard 1.5
|
|
15
|
+
|
|
16
|
+
## [2.4.0] - 2025-02-18
|
|
17
|
+
|
|
18
|
+
### Changed
|
|
19
|
+
|
|
20
|
+
- [branding] Updated logos to use new (case) version and removed dark-mode versions (now same as light)
|
|
21
|
+
- [captive-portal] Using 1.5.0 with updated branding
|
|
22
|
+
- [dashboard] Using 1.5.0 with updated branding and removed size filter
|
|
23
|
+
- [kiwix-serve] Using 3.7.0-2
|
|
24
|
+
- [kiwix-serve] Kiwix-serve subdomain changed from `kiwix` to `browse`
|
|
25
|
+
- [reverse-proxy] Using 1.10 with updated Caddy
|
|
26
|
+
|
|
8
27
|
## [2.3.2] - 2025-01-20
|
|
9
28
|
|
|
10
29
|
### Added
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
<svg viewBox="0 0 1549.5 494.7" xmlns="http://www.w3.org/2000/svg"><g fill="#231f20"><path d="m818.2 2.2h-60.7l-79 89.3v-89.3h-52.5v206.4h52.5v-50.8l27.4-30.3 54.5 81.1h62.8l-81.7-120.9z"/><path d="m846.2 2.2h52.5v206.3h-52.5z"/><path d="m1146.5 154-40.4-151.8h-51.3l-39.4 151.8-40.4-151.8h-56l67.5 206.4h54.2l38.9-142.7 38.3 142.7h53.9l68.1-206.4h-53.6z"/><path d="m1258.5 2.2h52.5v206.3h-52.5z"/><path d="m1471.9 100.7 68.1-98.5h-61.6l-39.8 60.1-39.8-60.1h-61l69 100.8-73.7 105.6h61l44.5-65.8 44.5 65.8h62.8z"/><path d="m627.7 439.8v-174.6h26.4v72.3h76.3v-72.3h26.4v174.6h-26.4v-78.1h-76.3v78.1z"/><path d="m841.9 442.8c-11.8 0-22.4-2.7-31.7-8s-16.6-12.8-21.9-22.6c-5.3-9.7-8-21.2-8-34.3s2.7-24.6 8-34.3 12.6-17.2 21.9-22.6c9.3-5.3 20-8 31.9-8s22.6 2.7 31.8 8 16.5 12.8 21.7 22.6c5.2 9.7 7.9 21.2 7.9 34.3s-2.7 24.6-8 34.3-12.6 17.3-21.8 22.6-19.8 8-31.8 8zm0-25.2c6.3 0 12.1-1.4 17.5-4.2 5.3-2.8 9.6-7.2 12.8-13.1s4.9-13.3 4.9-22.3-1.6-16.6-4.9-22.4c-3.2-5.8-7.5-10.1-12.7-13-5.2-2.8-11-4.2-17.3-4.2s-12.1 1.4-17.5 4.2c-5.3 2.8-9.6 7.2-12.8 13s-4.9 13.3-4.9 22.4c0 13.6 3.4 23.7 10.3 30.1s15.1 9.6 24.6 9.6z"/><path d="m982.6 439.8c-12.1 0-21.8-3-28.9-8.9-7.2-5.9-10.7-16.4-10.7-31.6v-60.9h-31.2v-22.5h18.5c8.5 0 13.5-4.2 15-12.5l3.7-20h20.4v32.4h48.9v22.5h-48.9v60.4c0 6.5 1.5 11 4.4 13.6s7.9 3.9 15.1 3.9h28.9v23.4h-35.2z"/><path d="m1094.8 442.8c-16.3 0-29.3-3.8-38.9-11.5-9.6-7.6-15.1-17.8-16.5-30.4h27.2c1 5.8 3.9 10.6 8.8 14.2 4.9 3.7 11.4 5.5 19.6 5.5s13.8-1.6 18.1-4.9c4.2-3.2 6.4-7 6.4-11.3 0-6.3-2.5-10.6-7.6-13-5.1-2.3-12.5-4.1-22.3-5.2-8.5-1-16.2-2.9-23.1-5.9-6.9-2.9-12.3-6.9-16.3-12s-6-11.4-6-19.1 4.2-19.5 12.7-26.2c8.5-6.6 20.3-10 35.4-10s26.9 3.4 35.2 10.2 13.1 16.1 14.5 27.9h-25.4c-.7-5-3.2-8.9-7.7-11.8s-10.1-4.4-16.7-4.4-12.2 1.3-16.2 3.9-6 5.9-6 10.1c0 9 9.6 14.5 28.9 16.5 9.1 1 17.3 2.7 24.4 5.1s12.8 6.2 17 11.2c4.2 5.1 6.2 12.2 6.2 21.3.2 7.5-2 14.2-6.4 20.2s-10.5 10.7-18.2 14.2-16.8 5.2-27.1 5.2z"/><path d="m1170.9 494.7v-178.6h22.9l2 19h1.5c3.3-6.2 8.4-11.3 15.1-15.6 6.7-4.2 14.8-6.4 24.1-6.4s18.5 2.5 26.4 7.4c8 4.9 14.3 12.1 19.1 21.7 4.7 9.6 7.1 21.5 7.1 35.8s-2.5 26-7.4 35.7c-4.9 9.6-11.5 16.9-19.8 21.8s-17.6 7.4-27.9 7.4-16.8-1.8-22.9-5.5c-6.2-3.7-10.7-7.8-13.7-12.5v69.8h-26.4zm58.6-77.1c9.3 0 17.1-3.3 23.3-10s9.4-16.6 9.4-29.9-3.1-23.2-9.4-29.7c-6.2-6.5-14-9.7-23.3-9.7s-17.3 3.3-23.6 9.9c-6.2 6.6-9.4 16.5-9.4 29.8s3.1 23 9.4 29.7c6.2 6.7 14.1 10 23.6 10z"/><path d="m1370.7 442.8c-11.8 0-22.4-2.7-31.7-8s-16.6-12.8-21.9-22.6c-5.3-9.7-8-21.2-8-34.3s2.7-24.6 8-34.3 12.6-17.2 21.9-22.6c9.3-5.3 20-8 31.9-8s22.6 2.7 31.8 8 16.5 12.8 21.7 22.6c5.2 9.7 7.9 21.2 7.9 34.3s-2.7 24.6-8 34.3-12.6 17.3-21.8 22.6-19.8 8-31.8 8zm0-25.2c6.3 0 12.1-1.4 17.5-4.2 5.3-2.8 9.6-7.2 12.8-13.1s4.9-13.3 4.9-22.3-1.6-16.6-4.9-22.4c-3.2-5.8-7.5-10.1-12.7-13-5.2-2.8-11-4.2-17.3-4.2s-12.1 1.4-17.5 4.2c-5.3 2.8-9.6 7.2-12.8 13s-4.9 13.3-4.9 22.4c0 13.6 3.4 23.7 10.3 30.1s15.1 9.6 24.6 9.6z"/><path d="m1513.8 439.8c-12.1 0-21.8-3-28.9-8.9-7.2-5.9-10.7-16.4-10.7-31.6v-60.9h-31.2v-22.5h18.5c8.5 0 13.5-4.2 15-12.5l3.7-20h20.4v32.4h48.9v22.5h-48.9v60.4c0 6.5 1.5 11 4.4 13.6s7.9 3.9 15.1 3.9h28.9v23.4h-35.2z"/><path d="m432.7 309.1c-15.7-49.8-68.7-77.4-118.5-61.8-49.8 15.7-77.5 68.7-61.8 118.5 0 .2.2.5.2.7h-44.8c-8.5 0-16.1-5.6-18.6-13.8l-37.2-121.9 6.3-3.4c88-37 182.2 29 247.8-34.3l.4-.4c8.1-7.4 16.2-14.9 40.2.1 25.8 16.2 82.8 58.4 108.6 130.6 0 0 15.7-5.6 11.3-24.7-4.4-19.2-36.1-74.5-101-123.5-11.9-9-22.6-16.5-31.5-22.5 13-55.5-54.4-122.4-120.2-90.9-47-44.4-99.7-62.5-148.1-61.8-128.2 1.8-227.1 135.4-120.7 262.9l.2.2c1.6 1.9 3.3 3.9 5 5.8 6.9 8.3 11.5 15.6 15.4 28.5l31.7 104h-11.2c-10.3 0-18.7 8.4-18.7 18.7h42.6l71.6 33.8c4.4-9.4.4-20.5-8.9-24.9l-18.8-8.9h54c0-10.3-8.4-18.7-18.7-18.7h-48.9c-8.5 0-16.1-5.6-18.6-13.8l-25.1-82.6c-6.2-21.7 8.1-35.9 21.7-37.6 12.3-1.5 18.5 6.4 24.4 25.7l22.3 73.2h-11.2c-10.3 0-18.7 8.4-18.7 18.7h42.6l71.6 33.8c4.4-9.4.4-20.5-8.9-24.9l-18.8-8.9h39.6c21.8 37.2 67.1 55.9 110 42.4 49.8-15.7 77.4-68.7 61.8-118.5zm-72-212.5c15.7 0 28.4 12.7 28.4 28.4s-1.3 9.7-3.6 13.8c-.2-9.8-8.2-17.8-18.2-17.8s-18.2 8.1-18.2 18.2 2.4 10.3 6.2 13.7c-13.2-2.5-23.1-14-23.1-27.9s12.7-28.4 28.4-28.4z"/></g></svg>
|
|
Binary file
|
|
Binary file
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="-602.2" x2="-602.2" y1="395.5" y2="91.4"><stop offset="0"/><stop offset="1" stop-opacity=".7"/></linearGradient><path d="m-359 677.1h1029.3v666.7h-1029.3z"/><path d="m1517.1-111.3c-14.1-44.9-62-69.9-107-55.7-44.9 14.1-69.9 62-55.7 107 0 .2.1.4.2.6h-40.5c-7.7 0-14.5-5-16.8-12.4l-33.5-110 5.7-3c79.4-33.3 164.4 26.2 223.6-31l.4-.4c7.3-6.7 14.6-13.4 36.3 0 23.3 14.6 74.7 52.7 98 117.8 0 0 14.1-5 10.2-22.3s-32.6-67.2-91.1-111.4c-10.7-8.1-20.4-14.9-28.4-20.3 11.7-50.1-49.1-110.5-108.4-82-42.6-40-90.1-56.4-133.7-55.7-115.7 1.6-204.9 122.2-108.9 237.2l.2.2c1.5 1.8 3 3.5 4.5 5.3 6.2 7.5 10.3 14.1 13.9 25.7l28.6 93.8h-10.1c-9.3 0-16.9 7.6-16.9 16.9h38.4l64.6 30.5c4-8.5.4-18.5-8-22.5l-16.9-8h48.7c0-9.3-7.6-16.9-16.9-16.9h-44.1c-7.7 0-14.5-5-16.8-12.4l-22.7-74.5c-5.6-19.6 7.3-32.4 19.5-33.9 11.1-1.4 16.7 5.8 22 23.2l20.1 66.1h-10.1c-9.3 0-16.9 7.6-16.9 16.9h38.4l64.6 30.5c4-8.5.4-18.5-8-22.5l-16.9-8h35.7c19.6 33.6 60.5 50.4 99.2 38.2 44.9-14.1 69.9-62 55.7-107zm-65-191.8c14.2 0 25.6 11.5 25.6 25.6s-1.2 8.8-3.2 12.5c-.2-8.9-7.4-16-16.4-16s-16.4 7.3-16.4 16.4 2.2 9.3 5.6 12.3c-11.9-2.3-20.8-12.7-20.8-25.2s11.5-25.6 25.6-25.6z"/><rect fill="#fff" height="512" rx="100" width="512" y=".3"/><path d="m462 299.3c-2.9-12.9-24.2-50.1-67.6-83.1-7.9-6.1-15.1-11.1-21.1-15.1 8.7-37.3-36.5-82.3-80.5-61.1-31.6-29.9-66.9-42.1-99.3-41.6-85.9 1.2-152.2 91.1-80.9 176.8l.1.1c1.1 1.3 2.2 2.6 3.4 3.9 4.6 5.6 7.7 10.5 10.3 19.2l21.3 69.9h-7.5c-6.9 0-12.6 5.6-12.6 12.6h28.5l47.9 22.8c3-6.3.3-13.8-6-16.8l-12.6-6h36.2c0-6.9-5.6-12.6-12.6-12.6h-32.8c-5.7 0-10.8-3.8-12.5-9.3l-16.8-55.5c-4.2-14.6 5.4-24.1 14.5-25.3 8.3-1 12.4 4.3 16.3 17.3l15 49.3h-7.5c-6.9 0-12.6 5.6-12.6 12.6h28.5l47.9 22.8c3-6.3.3-13.8-6-16.8l-12.6-6h26.5c2.7 4.6 6 8.9 9.9 12.8 24.7 24.8 64.9 24.8 89.6 0s24.7-65.1 0-89.9-64.9-24.8-89.6 0c-17.4 17.4-22.6 42.5-15.5 64.5h-30c-5.7 0-10.8-3.8-12.5-9.3l-24.9-82 4.2-2.3c59-24.8 122.1 19.5 166-23.1l.3-.3c5.4-5 10.9-10 26.9 0 17.3 10.9 55.5 39.3 72.8 87.8 0 0 10.5-3.8 7.6-16.6zm-121.3-107.6c-.1-6.6-5.5-11.9-12.2-11.9s-12.2 5.5-12.2 12.2 1.6 6.9 4.2 9.2c-8.8-1.7-15.5-9.4-15.5-18.8s8.5-19.1 19-19.1 19 8.5 19 19.1c0 3.4-.9 6.5-2.4 9.3z" fill="#161616"/><path d="m-412.6 291.5c-2.9-12.9-24.2-49.9-67.6-82.8-7.9-6-15.1-11.1-21.1-15 8.7-37.2-36.5-82-80.5-60.9-31.6-29.8-66.9-41.9-99.3-41.4-85.9 1.2-152.2 90.7-80.9 176.1l.1.1c1.1 1.3 2.2 2.6 3.4 3.9 4.6 5.5 7.7 10.5 10.3 19.1l21.3 69.7h-7.5c-6.9 0-12.6 5.6-12.6 12.6h28.5l47.9 22.7c3-6.3.3-13.8-6-16.7l-12.6-5.9h36.2c0-6.9-5.6-12.6-12.6-12.6h-32.8c-5.7 0-10.8-3.7-12.5-9.2l-16.8-55.3c-4.2-14.5 5.4-24 14.5-25.2 8.3-1 12.4 4.3 16.3 17.2l15 49.1h-7.5c-6.9 0-12.6 5.6-12.6 12.6h28.5l47.9 22.7c3-6.3.3-13.8-6-16.7l-12.6-5.9h26.5c2.7 4.6 6 8.9 9.9 12.7 24.7 24.7 64.9 24.7 89.6 0s24.7-64.9 0-89.6-64.9-24.7-89.6 0c-17.4 17.4-22.6 42.4-15.5 64.3h-30c-5.7 0-10.8-3.7-12.5-9.2l-24.9-81.7 4.2-2.3c59-24.7 122.1 19.5 166-23l.3-.3c5.4-4.9 10.9-10 26.9 0 17.3 10.8 55.5 39.1 72.8 87.5 0 0 10.5-3.7 7.6-16.6zm-121.4-107.2c-.1-6.6-5.5-11.9-12.2-11.9s-12.2 5.4-12.2 12.2 1.6 6.9 4.2 9.1c-8.8-1.7-15.5-9.4-15.5-18.7s8.5-19 19-19 19 8.5 19 19c0 3.4-.9 6.5-2.4 9.2z" fill="url(#a)"/></svg>
|
|
@@ -24,6 +24,7 @@ from offspot_config.utils.sizes import (
|
|
|
24
24
|
get_raw_content_size_for,
|
|
25
25
|
)
|
|
26
26
|
from offspot_config.utils.yaml import yaml_dump
|
|
27
|
+
from offspot_runtime.__about__ import __version__
|
|
27
28
|
|
|
28
29
|
# matches $environ[XXX] where XXX is a builder-level environ to replace with
|
|
29
30
|
RE_ENVIRON_VAR = re.compile(r"\$environ{(?P<var>[A-Za-z_\-0-9]+)}")
|
|
@@ -31,6 +32,8 @@ RE_SPECIFIC_APP_DIR = re.compile(r"\${APP_DIR:(?P<ident>[a-z\.\-]+)}")
|
|
|
31
32
|
|
|
32
33
|
# service subdomain for ZIM downloads, when enabled
|
|
33
34
|
ZIMDL_PREFIX = "zim-download"
|
|
35
|
+
# service subdomain for kiwix-serve (used to be static to kiwix)
|
|
36
|
+
KIWIX_PREFIX = "browse"
|
|
34
37
|
# on-host path to dashboard config
|
|
35
38
|
DASHBOARD_CONFIG_PATH = CONTENT_TARGET_PATH / "dashboard.yaml"
|
|
36
39
|
# on-host metrics persistent data folder
|
|
@@ -49,14 +52,14 @@ KIWIX_ZIM_LOAD_BALANCER_URL = "https://download.kiwix.org/zim/"
|
|
|
49
52
|
# data source for “internal images” (out of catalog)
|
|
50
53
|
INTERNAL_IMAGES = {
|
|
51
54
|
"captive-portal": {
|
|
52
|
-
"source": "ghcr.io/offspot/captive-portal:1.
|
|
53
|
-
"filesize":
|
|
54
|
-
"fullsize":
|
|
55
|
+
"source": "ghcr.io/offspot/captive-portal:1.5.0",
|
|
56
|
+
"filesize": 180121600,
|
|
57
|
+
"fullsize": 180055087,
|
|
55
58
|
},
|
|
56
59
|
"dashboard": {
|
|
57
|
-
"source": "ghcr.io/offspot/dashboard:1.
|
|
60
|
+
"source": "ghcr.io/offspot/dashboard:1.5.0",
|
|
58
61
|
"filesize": 178063360,
|
|
59
|
-
"fullsize":
|
|
62
|
+
"fullsize": 177129017,
|
|
60
63
|
},
|
|
61
64
|
"file-browser": {
|
|
62
65
|
"source": "ghcr.io/offspot/file-browser:1.1",
|
|
@@ -69,9 +72,9 @@ INTERNAL_IMAGES = {
|
|
|
69
72
|
"fullsize": 58922600,
|
|
70
73
|
},
|
|
71
74
|
"kiwix-serve": {
|
|
72
|
-
"source": "ghcr.io/offspot/kiwix-serve:3.7.0-
|
|
75
|
+
"source": "ghcr.io/offspot/kiwix-serve:3.7.0-2",
|
|
73
76
|
"filesize": 58480640,
|
|
74
|
-
"fullsize":
|
|
77
|
+
"fullsize": 58447802,
|
|
75
78
|
},
|
|
76
79
|
"metrics": {
|
|
77
80
|
"source": "ghcr.io/offspot/metrics:0.3.0",
|
|
@@ -79,9 +82,9 @@ INTERNAL_IMAGES = {
|
|
|
79
82
|
"fullsize": 167202612,
|
|
80
83
|
},
|
|
81
84
|
"reverse-proxy": {
|
|
82
|
-
"source": "ghcr.io/offspot/reverse-proxy:1.
|
|
83
|
-
"filesize":
|
|
84
|
-
"fullsize":
|
|
85
|
+
"source": "ghcr.io/offspot/reverse-proxy:1.10",
|
|
86
|
+
"filesize": 108052480,
|
|
87
|
+
"fullsize": 107972550,
|
|
85
88
|
},
|
|
86
89
|
}
|
|
87
90
|
|
|
@@ -237,7 +240,8 @@ class ConfigBuilder:
|
|
|
237
240
|
"restart": "unless-stopped",
|
|
238
241
|
"expose": ["80"],
|
|
239
242
|
"environment": {
|
|
240
|
-
"KIWIX_READER_LINK_TPL": "//
|
|
243
|
+
"KIWIX_READER_LINK_TPL": f"//{KIWIX_PREFIX}."
|
|
244
|
+
+ "{fqdn}/viewer#{zim_name}",
|
|
241
245
|
"KIWIX_DOWNLOAD_LINK_TPL": (
|
|
242
246
|
f"//{ZIMDL_PREFIX}." + "{fqdn}/{zim_filename}"
|
|
243
247
|
),
|
|
@@ -285,7 +289,11 @@ class ConfigBuilder:
|
|
|
285
289
|
download_fqdn = None
|
|
286
290
|
|
|
287
291
|
payload = {
|
|
288
|
-
"metadata": {
|
|
292
|
+
"metadata": {
|
|
293
|
+
"name": self.name,
|
|
294
|
+
"fqdn": self.fqdn,
|
|
295
|
+
"version": f"v{__version__}",
|
|
296
|
+
},
|
|
289
297
|
"packages": [
|
|
290
298
|
package.to_dashboard_entry(fqdn=self.fqdn, download_fqdn=download_fqdn)
|
|
291
299
|
for package in self.dashboard_entries
|
|
@@ -620,7 +628,7 @@ class ConfigBuilder:
|
|
|
620
628
|
self.add_files_service()
|
|
621
629
|
self.files_mapping.update({ZIMDL_PREFIX: "zims"})
|
|
622
630
|
|
|
623
|
-
self.reversed_services.add("kiwix")
|
|
631
|
+
self.reversed_services.add(f"{KIWIX_PREFIX}:kiwix")
|
|
624
632
|
|
|
625
633
|
image = get_internal_image("file-manager")
|
|
626
634
|
self.config["oci_images"].add(image)
|
|
@@ -922,7 +930,7 @@ class ConfigBuilder:
|
|
|
922
930
|
self.compose["services"]["reverse-proxy"]["environment"].update(
|
|
923
931
|
{
|
|
924
932
|
"SERVICES": ",".join(self.reversed_services),
|
|
925
|
-
"NO_HOME_SERVICES": "
|
|
933
|
+
"NO_HOME_SERVICES": f"{KIWIX_PREFIX}",
|
|
926
934
|
"FILES_MAPPING": ",".join(
|
|
927
935
|
f"{domain}:{folder}"
|
|
928
936
|
for domain, folder in self.files_mapping.items()
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "2.4.1"
|
|
Binary file
|
|
Binary file
|
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 2200 400">
|
|
3
|
-
<defs>
|
|
4
|
-
<style>
|
|
5
|
-
path {
|
|
6
|
-
fill: #000000;
|
|
7
|
-
}
|
|
8
|
-
@media (prefers-color-scheme: dark) {
|
|
9
|
-
path {
|
|
10
|
-
fill: #FFFFFF;
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
@media (prefers-color-scheme: light) {
|
|
14
|
-
path {
|
|
15
|
-
fill: #000000;
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
</style>
|
|
19
|
-
</defs>
|
|
20
|
-
<g>
|
|
21
|
-
<path d="M431.6,260.3c-2.9-13.2-25-51.3-69.6-85.1-8.3-6.3-15.5-11.4-21.6-15.5,8.8-38.3-37.5-84.3-82.9-62.7-32.6-30.7-68.8-43-102.2-42.6C66.9,55.6-1.3,147.7,72.2,235.6h0c1.2,1.4,2.4,2.8,3.5,4.1,4.7,5.7,7.9,10.8,10.6,19.6l21.8,71.7h-7.7c-7.1,0-13,5.7-13,13h29.3l49.3,23.4c3.1-6.5,0-14.1-6.1-17.1l-13-6.1h37.1c0-7.1-5.7-13-13-13h-33.8c-5.9,0-11.2-3.9-12.8-9.4l-17.3-57c-4.3-14.9,5.5-24.8,14.9-25.9,8.4-1,12.8,4.5,16.7,17.7l15.3,50.5h-7.7c-7.1,0-13,5.7-13,13h29.3l49.3,23.4c3.1-6.5,0-14.1-6.1-17.1l-13-6.1h27.3c2.8,4.7,6.1,9,10.2,13.2,25.3,25.3,66.8,25.3,92.1,0,25.3-25.3,25.3-66.8,0-92.1-25.3-25.3-66.8-25.3-92.1,0s-23.2,43.6-15.9,66h-30.8c-5.9,0-11.2-3.9-12.8-9.4l-25.5-84.1,4.3-2.4c60.7-25.5,125.6,20,170.7-23.8h.2c5.5-5.3,11.2-10.6,27.7,0,17.9,11.2,57,40.3,74.9,90,0,0,10.8-3.9,7.9-17.1h0l.2-.2ZM306.6,150.1c0-6.9-5.7-12.2-12.6-12.2s-12.6,5.5-12.6,12.6,1.8,7.1,4.3,9.4c-9-1.8-15.9-9.6-15.9-19.3s8.8-19.6,19.6-19.6,19.6,8.8,19.6,19.6-1,6.7-2.6,9.4Z"/>
|
|
22
|
-
<g>
|
|
23
|
-
<path d="M572.6,219.4l-20.2,21.8v54.2h-39.1V105.9h39.1v85.9l17.1-23.6,48.3-62.3h47.9l-67.4,84.3,69.4,105.3h-46.6l-48.7-76h.2Z"/>
|
|
24
|
-
<path d="M679.9,118.3c0-5.7,2-10.2,5.7-14,3.7-3.7,8.8-5.5,15.5-5.5s11.6,1.8,15.3,5.5c3.7,3.7,5.7,8.3,5.7,14s-2,10.4-5.7,14.1c-3.9,3.7-9,5.5-15.3,5.5s-11.4-1.8-15.3-5.5-5.7-8.3-5.7-14.1h-.2ZM719.8,295.5h-37.7v-140.9h37.7v140.9Z"/>
|
|
25
|
-
<path d="M873.2,244.4l18.5-89.8h36.3l-36,140.9h-31.4l-26.7-88.6-26.7,88.6h-31.4l-36-140.9h36.3l18.3,89.6,25.7-89.6h27.1l25.7,89.8h.2Z"/>
|
|
26
|
-
<path d="M946.5,118.3c0-5.7,2-10.2,5.7-14,3.7-3.7,8.8-5.5,15.5-5.5s11.6,1.8,15.3,5.5c3.7,3.7,5.7,8.3,5.7,14s-2,10.4-5.7,14.1c-3.9,3.7-9,5.5-15.3,5.5s-11.4-1.8-15.3-5.5-5.7-8.3-5.7-14.1h-.2ZM986.4,295.5h-37.7v-140.9h37.7v140.9Z"/>
|
|
27
|
-
<path d="M1071.1,196.7l23.8-42h40.3l-40.1,69,41.8,71.9h-40.3l-25.1-44.2-25,44.2h-40.5l41.9-71.9-39.9-69h40.3l23.2,42h-.4Z"/>
|
|
28
|
-
<path d="M1376.2,295.5h-39.1v-81.1h-76.2v81.1h-39.1V105.9h39.1v76.8h76.2v-76.8h39.1v189.6Z"/>
|
|
29
|
-
<path d="M1402,223.8c0-14,2.8-26.5,8.1-37.3,5.3-11,13.2-19.5,23.2-25.3s21.8-9,35.2-9c19.1,0,34.6,5.9,46.6,17.5,12,11.6,18.7,27.5,20,47.4v9.6c.2,21.6-5.7,38.9-17.9,52.1-12,13-28.3,19.6-48.5,19.6s-36.5-6.5-48.5-19.5c-12.2-13-18.1-30.7-18.1-53v-2ZM1439.7,226.5c0,13.4,2.6,23.6,7.5,30.7,5.1,7.1,12.2,10.6,21.6,10.6s16.3-3.5,21.4-10.4c5.1-7.1,7.7-18.3,7.7-33.6s-2.6-23.4-7.7-30.5c-5.1-7.3-12.4-10.8-21.6-10.8s-16.3,3.5-21.4,10.8c-5.1,7.3-7.5,18.3-7.5,33.4v-.2Z"/>
|
|
30
|
-
<path d="M1603.6,120v34.6h24.2v27.5h-24.2v70.3c0,5.3,1,8.8,2.9,11.2,2,2.2,5.9,3.3,11.4,3.3s7.9-.4,11-1v28.5c-7.5,2.2-14.9,3.3-22.8,3.3-26.3,0-39.9-13.4-40.3-39.9v-75.8h-20.6v-27.5h20.6v-34.6h37.7Z"/>
|
|
31
|
-
<path d="M1725,256.6c0-4.5-2.4-8.3-6.9-10.8s-11.8-5.1-22-7.1c-33.6-7.1-50.3-21.2-50.3-42.6s5.1-23,15.5-31.2c10.4-8.4,24-12.6,40.7-12.6s32.2,4.1,42.8,12.6c10.8,8.4,16.1,19.5,16.1,32.8h-37.5c0-5.3-1.8-9.8-5.3-13.4s-8.8-5.3-16.3-5.3-11.2,1.4-14.7,4.3-5.3,6.5-5.3,11,2,7.5,5.9,10c3.9,2.6,10.6,4.7,20,6.7s17.3,3.9,23.8,6.3c19.8,7.3,29.9,19.8,29.9,37.9s-5.5,23.2-16.5,31.2c-11,7.9-25.3,12-42.6,12s-22.2-2.2-31.4-6.3c-9.2-4.1-16.3-10-21.6-17.3s-7.9-15.3-7.9-23.8h35.8c.4,6.7,2.8,11.8,7.5,15.3,4.5,3.5,10.8,5.3,18.5,5.3s12.6-1.4,16.3-4.1c3.7-2.8,5.5-6.3,5.5-10.8l.2-.2Z"/>
|
|
32
|
-
<path d="M1912.6,226.3c0,21.6-4.9,39.1-14.7,52.1-9.8,13-23.2,19.6-39.9,19.6s-25.7-4.9-34.6-14.9v66.4h-37.5v-195.1h35l1.4,13.8c9-11,21-16.3,35.8-16.3s30.8,6.5,40.5,19.3c9.6,12.8,14.5,30.5,14.5,53v2l-.4.2ZM1874.9,223.6c0-13.2-2.4-23.2-6.9-30.3-4.7-7.1-11.4-10.6-20.2-10.6s-19.8,4.5-24.4,13.6v57.8c4.5,9.2,12.8,14,24.6,14,17.9,0,26.9-14.7,26.9-44.2v-.2Z"/>
|
|
33
|
-
<path d="M1930.1,223.8c0-14,2.8-26.5,8.1-37.3,5.3-11,13.2-19.5,23.2-25.3s21.8-9,35.2-9c19.1,0,34.6,5.9,46.6,17.5,12,11.6,18.7,27.5,20,47.4v9.6c.2,21.6-5.7,38.9-17.9,52.1-12,13-28.3,19.6-48.5,19.6s-36.5-6.5-48.5-19.5c-12.2-13-18.1-30.7-18.1-53v-2ZM1967.6,226.5c0,13.4,2.6,23.6,7.5,30.7,5.1,7.1,12.2,10.6,21.6,10.6s16.3-3.5,21.4-10.4c5.1-7.1,7.7-18.3,7.7-33.6s-2.6-23.4-7.7-30.5c-5.1-7.3-12.4-10.8-21.6-10.8s-16.3,3.5-21.4,10.8c-5.1,7.3-7.5,18.3-7.5,33.4v-.2Z"/>
|
|
34
|
-
<path d="M2131.7,120v34.6h24.2v27.5h-24.2v70.3c0,5.3,1,8.8,2.9,11.2,2,2.2,5.9,3.3,11.4,3.3s7.9-.4,11-1v28.5c-7.5,2.2-14.9,3.3-22.8,3.3-26.3,0-39.9-13.4-40.3-39.9v-75.8h-20.6v-27.5h20.6v-34.6h37.7Z"/>
|
|
35
|
-
</g>
|
|
36
|
-
</g>
|
|
37
|
-
</svg>
|
|
Binary file
|
|
Binary file
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<svg version="1.1" viewBox="0 0 400 400" xmlns="http://www.w3.org/2000/svg">
|
|
3
|
-
<defs>
|
|
4
|
-
<style>
|
|
5
|
-
path {
|
|
6
|
-
fill: #000000;
|
|
7
|
-
}
|
|
8
|
-
@media (prefers-color-scheme: dark) {
|
|
9
|
-
path {
|
|
10
|
-
fill: #FFFFFF;
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
@media (prefers-color-scheme: light) {
|
|
14
|
-
path {
|
|
15
|
-
fill: #000000;
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
</style>
|
|
19
|
-
</defs>
|
|
20
|
-
<g>
|
|
21
|
-
<path d="m381.29 260.3c-2.6281-13.2-22.656-51.3-63.075-85.1-7.5219-6.3-14.047-11.4-19.575-15.5 7.975-38.3-33.984-84.3-75.128-62.7-29.544-30.7-62.35-43-92.619-42.6-80.113 1.2-141.92 93.3-75.309 181.2 1.0875 1.4 2.175 2.8 3.1719 4.1 4.2594 5.7 7.1594 10.8 9.6063 19.6l19.756 71.7h-6.9781c-6.4344 0-11.781 5.7-11.781 13h26.553l44.678 23.4c2.8094-6.5 0-14.1-5.5281-17.1l-11.781-6.1h33.622c0-7.1-5.1656-13-11.781-13h-30.631c-5.3469 0-10.15-3.9-11.6-9.4l-15.678-57c-3.8969-14.9 4.9844-24.8 13.503-25.9 7.6125-1 11.6 4.5 15.134 17.7l13.866 50.5h-6.9781c-6.4344 0-11.781 5.7-11.781 13h26.553l44.678 23.4c2.8094-6.5 0-14.1-5.5281-17.1l-11.781-6.1h24.741c2.5375 4.7 5.5281 9 9.2438 13.2 22.928 25.3 60.538 25.3 83.466 0 22.928-25.3 22.928-66.8 0-92.1-22.928-25.3-60.538-25.3-83.466 0-22.928 25.3-21.025 43.6-14.409 66h-27.913c-5.3469 0-10.15-3.9-11.6-9.4l-23.109-84.1 3.8969-2.4c55.009-25.5 113.83 20 154.7-23.8h0.18125c4.9844-5.3 10.15-10.6 25.103 0 16.222 11.2 51.656 40.3 67.878 90 0 0 9.7875-3.9 7.1594-17.1l0.18125-0.2zm-113.28-110.2c0-6.9-5.1656-12.2-11.419-12.2s-11.419 5.5-11.419 12.6 1.6313 7.1 3.8969 9.4c-8.1563-1.8-14.409-9.6-14.409-19.3s7.975-19.6 17.763-19.6c9.7875 0 17.763 8.8 17.763 19.6s-0.90625 6.7-2.3562 9.4z" />
|
|
22
|
-
</g>
|
|
23
|
-
</svg>
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = "2.3.2"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|