Compare commits

..
Author SHA1 Message Date
jschoubben 3728b07d20 Leave gitea's 222:22 to its own decision
A controller test holds git-over-ssh at 222 as the mesh's fixed convention
when no node says otherwise (TestTheForgesSshPortIsTheMeshsFixedConvention
ByDefault): without a setting, the short form would publish 22:22 and
collide with the machine's own sshd. Changing that is a decision, not part
of this sweep.
2026-09-30 12:36:24 +02:00
jschoubben a49f598a4e Manifests publish software ports; the machine side is the assignment's
postgres, distribution, gitea, mailu, only-office and portainer published
long-form mappings (5432:5432, 222:22, 7080:80, 9090:9000 …): a machine port
in a definition (ADR 0038, the migration note). Each now publishes the
software's port and names it in listens (mailu's web/web-tls and
only-office's and portainer's web said the machine number); mailu's env
says ${port:80}/${port:443} instead of 7080/7443.

Nothing moves on novox. postgres, distribution and gitea already have their
machine ports as novox settings (6852, 5100, 222); mailu, only-office and
portainer need theirs set BEFORE this rolls out:
  settings set mailu {"ports":{"80":7080,"443":7443}} --node novox
  settings set only-office {"ports":{"80":9070}} --node novox
  settings set portainer {"ports":{"9000":9090,"9443":9443}} --node novox
Those pins are accepted by today's manifests too (GivenPorts answers to the
container port), so setting them first changes nothing either.

Verified with the controller's own publishedOn/portInto/GivenPorts on
novox's settings (+ the three pins): every container's published ports and
mailu's env file render byte-identical before and after — mesh-store
6852:5432, mesh-registry 5100:5000, gitea 222:22, mailu-front 7080:80
7443:443 (+ mail ports), only-office 9070:80, portainer 9090:9000 9443:9443.

Not included: nats publishes 127.0.0.1:8222:8222 — a loopback bind, which a
short form cannot express; its monitor port needs its own change.
2026-09-30 12:35:58 +02:00
6 changed files with 13 additions and 79 deletions
+1 -1
View File
@@ -55,7 +55,7 @@
"name": "mesh-registry",
"image": "registry@sha256:a3d8aaa63ed8681a604f1dea0aa03f100d5895b6a58ace528858a7b332415373",
"ports": [
"5000:5000"
"5000"
],
"volumes": [
"/var/lib/mesh-registry:/var/lib/registry"
-66
View File
@@ -1,66 +0,0 @@
{
"module": "kometa",
"version": "1",
"capabilities": [
"container-runtime"
],
"requires": [
"plex-api",
"secret"
],
"binds": {
"plex-api": "${dir:state}/plex-api.json"
},
"secrets": {
"plex-api": "${dir:state}/plex-api.secret",
"secret": {
"tmdb": "${dir:state}/tmdb.secret"
}
},
"resources": [
{
"id": "state",
"type": "directory",
"mode": "0700",
"place": "."
},
{
"id": "config",
"type": "directory",
"mode": "0700"
},
{
"id": "settings",
"type": "file",
"path": "${dir:state}/config.yml",
"mode": "0600",
"merge": "json",
"content": "{\n \"plex\": {\n \"url\": \"${bound:plex-api:scheme}://${bound:plex-api:at}:${bound:plex-api:port}\",\n \"token\": \"${secret:plex-api}\",\n \"timeout\": 60,\n \"clean_bundles\": false,\n \"empty_trash\": false,\n \"optimize\": false,\n \"verify_ssl\": null,\n \"db_cache\": null\n },\n \"tmdb\": {\n \"apikey\": \"${secret:tmdb}\",\n \"language\": \"en\",\n \"cache_expiration\": 60,\n \"region\": null\n },\n \"settings\": {\n \"cache\": true,\n \"cache_expiration\": 60,\n \"asset_directory\": \"config/assets\",\n \"sync_mode\": \"append\",\n \"minimum_items\": 1,\n \"delete_below_minimum\": false,\n \"run_again_delay\": 2,\n \"show_missing\": false,\n \"save_report\": false,\n \"run_order\": [\n \"operations\",\n \"metadata\",\n \"collections\",\n \"overlays\"\n ],\n \"asset_folders\": true,\n \"asset_depth\": 0,\n \"create_asset_folders\": false,\n \"prioritize_assets\": false,\n \"dimensional_asset_rename\": false,\n \"download_url_assets\": false,\n \"show_missing_assets\": true,\n \"show_missing_season_assets\": false,\n \"show_missing_episode_assets\": false,\n \"show_asset_not_needed\": true,\n \"default_collection_order\": null,\n \"item_refresh_delay\": 0,\n \"delete_not_scheduled\": false,\n \"missing_only_released\": false,\n \"only_filter_missing\": false,\n \"show_unmanaged\": true,\n \"show_unconfigured\": true,\n \"show_filtered\": false,\n \"show_unfiltered\": false,\n \"show_options\": false,\n \"tvdb_language\": \"default\",\n \"ignore_ids\": null,\n \"ignore_imdb_ids\": null,\n \"playlist_sync_to_users\": null,\n \"playlist_exclude_users\": null,\n \"playlist_report\": true,\n \"custom_repo\": null,\n \"overlay_artwork_filetype\": \"webp_lossy\",\n \"overlay_artwork_quality\": 90,\n \"auto_sort_hubs\": null,\n \"verify_ssl\": true\n },\n \"libraries\": {}\n}\n"
},
{
"id": "net",
"type": "network",
"name": "kometa"
},
{
"id": "run",
"type": "container",
"name": "kometa",
"image": "kometateam/kometa@sha256:6c3971a4aaa928b045e5f22514196b6db7f9b2b186158ebfe3239f4b328dfb0a",
"network": "kometa",
"schedule": "0 3 * * *",
"args": [
"--run"
],
"env": {
"TZ": "Etc/UTC",
"KOMETA_NO_MISSING": "true",
"KOMETA_READ_ONLY_CONFIG": "true"
},
"volumes": [
"${dir:config}:/config",
"${dir:state}/config.yml:/config/config.yml:ro"
]
}
]
}
+5 -5
View File
@@ -117,14 +117,14 @@
},
{
"name": "web",
"port": 7080,
"port": 80,
"protocol": "tcp",
"from": "mesh",
"why": "the web front over http; only the ACME HTTP-01 passthrough is routed here \u2014 everything else 301s to https and would loop a proxy"
},
{
"name": "web-tls",
"port": 7443,
"port": 443,
"protocol": "tcp",
"from": "mesh",
"why": "the web front over its own TLS (admin, webmail, API); the public name mail.novox.be is a route grant reaching it here"
@@ -168,7 +168,7 @@
"type": "file",
"path": "${dir:state}/mailu.env",
"mode": "0644",
"content": "ADMIN_ADDRESS=mailu-admin\nANTISPAM_ADDRESS=mailu-antispam\nANTIVIRUS_ADDRESS=mailu-antivirus\nIMAP_ADDRESS=mailu-imap\nSMTP_ADDRESS=mailu-smtp\nFRONT_ADDRESS=mailu-front\nWEBMAIL_ADDRESS=mailu-webmail\nWEBDAV_ADDRESS=mailu-webdav\nREDIS_ADDRESS=mailu-redis\nPORTS=25,80,443,465,993,995,4190,110,143,587\nDOMAIN=novox.be\nHOSTNAMES=mail.novox.be\nPOSTMASTER=admin\nSITENAME=Novox\nWEBSITE=https://novox.be\nTLS_FLAVOR=letsencrypt\nSUBNET=192.168.203.0/24\nCOMPOSE_PROJECT_NAME=mailu\nANTIVIRUS=clamav\nWEBMAIL=roundcube\nWEBDAV=radicale\nFETCHMAIL_ENABLED=True\nFETCHMAIL_DELAY=600\nADMIN=true\nWEB_ADMIN=/admin\nWEB_WEBMAIL=/webmail\nWEBROOT_REDIRECT=/webmail\nAPI=true\nWEB_API=/api\nAUTH_RATELIMIT_IP=6000/hour\nAUTH_RATELIMIT_USER=1000/day\nCREDENTIAL_ROUNDS=12\nPASSWORD_SCHEME=PBKDF2\nDISABLE_STATISTICS=True\nMESSAGE_SIZE_LIMIT=50000000\nMESSAGE_RATELIMIT=200/day\nRECIPIENT_DELIMITER=+\nPOSTFIX_MYNETWORKS=127.0.0.0/8 [::1]/128\nRELAYNETS=\nRELAYHOST=\nREJECT_UNLISTED_RECIPIENT=\nDB_FLAVOR=postgresql\nINITIAL_ADMIN_ACCOUNT=admin\nINITIAL_ADMIN_DOMAIN=novox.be\nINITIAL_ADMIN_MODE=ifmissing\nSMTP_PORT=25\nSMTPS_PORT=465\nSUBMISSION_PORT=587\nPOP3_PORT=110\nPOP3S_PORT=995\nIMAP_PORT=143\nIMAPS_PORT=993\nHTTP_PORT=7080\nHTTPS_PORT=7443\nAUTOMX_PORT=4243\nAMX_SMTP_ADDRESS=mail.novox.be\nAMX_SMTP_PORT=587\nAMX_IMAP_ADDRESS=mail.novox.be\nAMX_IMAP_PORT=143\nAMX_MAIL_DOMAINS=novox.be\nDMARC_RUA=admin\nDMARC_RUF=admin\nLETSENCRYPT_SHORTCHAIN=True\nTZ=Etc/UTC\nLOG_LEVEL=INFO\nWELCOME=false\nREAL_IP_HEADER=X-Real-IP\nREAL_IP_FROM=142.132.152.141\nCOMPRESSION=\nCOMPRESS_LEVEL=\nCOMPRESSION_LEVEL=\nBIND_ADDRESS4=127.0.0.1\nBIND_ADDRESS6=::1\nMAILU_VERSION=1.9\nDOCKER_ORG=mailu\nDOCKER_PREFIX=\nWELCOME_SUBJECT=Welcome to your new email account\nWELCOME_BODY=Welcome to your new email account, if you can read this, then it is configured properly!\n"
"content": "ADMIN_ADDRESS=mailu-admin\nANTISPAM_ADDRESS=mailu-antispam\nANTIVIRUS_ADDRESS=mailu-antivirus\nIMAP_ADDRESS=mailu-imap\nSMTP_ADDRESS=mailu-smtp\nFRONT_ADDRESS=mailu-front\nWEBMAIL_ADDRESS=mailu-webmail\nWEBDAV_ADDRESS=mailu-webdav\nREDIS_ADDRESS=mailu-redis\nPORTS=25,80,443,465,993,995,4190,110,143,587\nDOMAIN=novox.be\nHOSTNAMES=mail.novox.be\nPOSTMASTER=admin\nSITENAME=Novox\nWEBSITE=https://novox.be\nTLS_FLAVOR=letsencrypt\nSUBNET=192.168.203.0/24\nCOMPOSE_PROJECT_NAME=mailu\nANTIVIRUS=clamav\nWEBMAIL=roundcube\nWEBDAV=radicale\nFETCHMAIL_ENABLED=True\nFETCHMAIL_DELAY=600\nADMIN=true\nWEB_ADMIN=/admin\nWEB_WEBMAIL=/webmail\nWEBROOT_REDIRECT=/webmail\nAPI=true\nWEB_API=/api\nAUTH_RATELIMIT_IP=6000/hour\nAUTH_RATELIMIT_USER=1000/day\nCREDENTIAL_ROUNDS=12\nPASSWORD_SCHEME=PBKDF2\nDISABLE_STATISTICS=True\nMESSAGE_SIZE_LIMIT=50000000\nMESSAGE_RATELIMIT=200/day\nRECIPIENT_DELIMITER=+\nPOSTFIX_MYNETWORKS=127.0.0.0/8 [::1]/128\nRELAYNETS=\nRELAYHOST=\nREJECT_UNLISTED_RECIPIENT=\nDB_FLAVOR=postgresql\nINITIAL_ADMIN_ACCOUNT=admin\nINITIAL_ADMIN_DOMAIN=novox.be\nINITIAL_ADMIN_MODE=ifmissing\nSMTP_PORT=25\nSMTPS_PORT=465\nSUBMISSION_PORT=587\nPOP3_PORT=110\nPOP3S_PORT=995\nIMAP_PORT=143\nIMAPS_PORT=993\nHTTP_PORT=${port:80}\nHTTPS_PORT=${port:443}\nAUTOMX_PORT=4243\nAMX_SMTP_ADDRESS=mail.novox.be\nAMX_SMTP_PORT=587\nAMX_IMAP_ADDRESS=mail.novox.be\nAMX_IMAP_PORT=143\nAMX_MAIL_DOMAINS=novox.be\nDMARC_RUA=admin\nDMARC_RUF=admin\nLETSENCRYPT_SHORTCHAIN=True\nTZ=Etc/UTC\nLOG_LEVEL=INFO\nWELCOME=false\nREAL_IP_HEADER=X-Real-IP\nREAL_IP_FROM=142.132.152.141\nCOMPRESSION=\nCOMPRESS_LEVEL=\nCOMPRESSION_LEVEL=\nBIND_ADDRESS4=127.0.0.1\nBIND_ADDRESS6=::1\nMAILU_VERSION=1.9\nDOCKER_ORG=mailu\nDOCKER_PREFIX=\nWELCOME_SUBJECT=Welcome to your new email account\nWELCOME_BODY=Welcome to your new email account, if you can read this, then it is configured properly!\n"
},
{
"id": "secret-env",
@@ -456,8 +456,8 @@
"587",
"993",
"995",
"7080:80",
"7443:443"
"80",
"443"
],
"volumes": [
"${dir:data-certs}:/certs",
+2 -2
View File
@@ -23,7 +23,7 @@
"listens": [
{
"name": "web",
"port": 9070,
"port": 80,
"protocol": "tcp",
"from": "mesh",
"why": "the document server over http; the public name office.novox.be is a route grant, and route-proxy reaches it on this published port"
@@ -93,7 +93,7 @@
"${dir:state}/server.env"
],
"ports": [
"9070:80"
"80"
],
"volumes": [
"${dir:logs}:/var/log/onlyoffice",
+4 -4
View File
@@ -8,10 +8,10 @@
"listens": [
{
"name": "web",
"port": 9090,
"port": 9000,
"protocol": "tcp",
"from": "mesh",
"why": "the dashboard over http; portainer.novox.be is a route grant and the proxy reaches it here \u2014 the machine side of 9090:9000, the predecessor's number"
"why": "the dashboard over http; routed, so the proxy reaches it here"
},
{
"name": "web-tls",
@@ -39,8 +39,8 @@
"name": "portainer",
"image": "portainer/portainer-ce@sha256:4d616db18cfeb5dd41a69c0958bc825c84483ea9cde1106eb82a5d26f3bd8b0e",
"ports": [
"9090:9000",
"9443:9443"
"9000",
"9443"
],
"volumes": [
"${dir:data}:/data",
+1 -1
View File
@@ -87,7 +87,7 @@
"PGDATA": "/var/lib/postgresql/data/pgdata"
},
"ports": [
"5432:5432"
"5432"
],
"volumes": [
"/var/lib/mesh-store:/var/lib/postgresql/data",