Feature 57 (config and provisioning): modules declare config and provisions, their files rendered from templates; synced with main (issues of feature 57, 874)

modules/docker/module.json

@@ -44,18 +44,23 @@
       "docker exec cat /etc/resolv.conf"
     ]
   },
-  "settings": {
-    "log-max-size": {
-      "kind": "preference",
-      "default": "100m",
-      "why": "each container's log is cut at this size and the runtime keeps log-max-file of them, so 100m and 10 hold about 1 GB per container: what the one machine with rotation set by hand has (novox/hq issue 452). A whole number from 1 with k, m or g after it, refused before daemon.json is written. The runtime reads it only at its next start, which the mesh never forces, and a container created before that keeps the options it was created with until it is created again"
+    "config": {
+      "log-max-size": {
+        "type": "string",
+        "description": "The size each container's log is cut at, a whole number from 1 with k, m or g after it; the runtime keeps log-max-file of them, so 100m and 10 hold about 1 GB per container (novox/hq issue 452). The runtime reads it only at its next start, which the mesh never forces, and a container created before that keeps the options it was created with until it is created again.",
+        "pattern": "[1-9][0-9]*[kmg]",
+        "trusted": true,
+        "default": "100m"
+      },
+      "log-max-file": {
+        "type": "number",
+        "description": "How many of a container's log files of log-max-size the runtime keeps, a count from 1 to 99, the oldest dropped first; taken at the runtime's next start and by containers created after it, like log-max-size (novox/hq issue 452).",
+        "minimum": 1,
+        "maximum": 99,
+        "trusted": true,
+        "default": 10
+      }
     },
-    "log-max-file": {
-      "kind": "preference",
-      "default": 10,
-      "why": "how many of a container's log files of log-max-size the runtime keeps, the oldest dropped first; a count from 1 to 99, refused before daemon.json is written, taken at the runtime's next start and by containers created after it, like log-max-size (novox/hq issue 452)"
-    }
-  },
   "resources": [
     {
       "id": "package",
@@ -86,7 +91,7 @@
       "path": "${dir:state}/log-rotation.conf",
       "mode": "0600",
       "trusted": true,
-      "content": "# The log rotation daemon.json takes, written by the mesh from this machine's settings log-max-size and\n# log-max-file, and judged by the step log-rotation-check before daemon.json is written (novox/hq issue 452).\n# Replaced on every push; change the settings, never this file.\nsize=${setting:log-max-size}\nfiles=${setting:log-max-file}\n"
+      "template": "files/log-rotation.conf"
     },
     {
       "id": "log-rotation-check",
@@ -112,7 +117,7 @@
       "mode": "0644",
       "into": "json",
       "trusted": true,
-      "content": "{\"live-restore\": true, \"insecure-registries\": [\"${seat:mesh-artifact-store:reach}\"], \"log-driver\": \"json-file\", \"log-opts\": {\"max-size\": \"${setting:log-max-size}\", \"max-file\": \"${setting:log-max-file}\"}}\n"
+      "template": "files/daemon.json"
     },
     {
       "id": "runtime",
@@ -129,14 +134,14 @@
       "type": "file",
       "path": "/etc/systemd/system/docker-prune.service",
       "mode": "0644",
-      "content": "# Generated by the mesh. Do not edit — module docker writes this file and replaces it at every push.\n[Unit]\nDescription=Prune dangling images and unused build cache (the mesh's docker module)\n# Never volumes, never a container, never an image a container uses: dangling\n# images and build cache nothing refers to, unused for a week. What a person\n# prunes beyond that is docker_prune's, by hand.\nAfter=docker.service\nConditionPathExists=/run/docker.sock\n\n[Service]\nType=oneshot\nNice=19\nIOSchedulingClass=idle\nExecStart=/usr/bin/docker image prune --force --filter until=168h\nExecStart=/usr/bin/docker builder prune --force --filter until=168h\n"
+      "template": "files/docker-prune.service"
     },
     {
       "id": "prune-timer",
       "type": "file",
       "path": "/etc/systemd/system/docker-prune.timer",
       "mode": "0644",
-      "content": "# Generated by the mesh. Do not edit — module docker writes this file and replaces it at every push.\n[Unit]\nDescription=Weekly prune of dangling images and unused build cache (the mesh's docker module)\n\n[Timer]\nOnCalendar=weekly\nRandomizedDelaySec=1h\nPersistent=true\n\n[Install]\nWantedBy=timers.target\n"
+      "template": "files/docker-prune.timer"
     },
     {
       "id": "prune",
@@ -162,6 +167,11 @@
         "loads": [
           "docker-tools"
         ]
+      },
+      {
+        "name": "files",
+        "kind": "archive",
+        "from": "files"
       }
     ]
   }