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

modules/triggerhappy/module.json

@@ -1,6 +1,7 @@
 {
   "module": "triggerhappy",
   "version": "1",
+  "moved": true,
   "capabilities": [
     "service-manager"
   ],
@@ -28,7 +29,7 @@
       "type": "file",
       "path": "/etc/systemd/system/triggerhappy.service.d/mesh.conf",
       "mode": "0644",
-      "content": "# Written by the mesh (module triggerhappy, novox/hq ADR 0212). Replaced on every push.\n#\n# The daemon opens the input devices as root, then drops to the operator's account with its groups,\n# so every trigger runs as the account: it reaches the account's session bus and display, with no su\n# and no hard-coded user. Only the mesh's trigger file is read.\n[Service]\nExecStart=\nExecStart=/usr/bin/thd --triggers /etc/triggerhappy/triggers.d/mesh.conf --socket /run/thd.socket --user ${machine:account} --deviceglob /dev/input/event*\n"
+      "template": "files/service.conf"
     },
     {
       "id": "triggers-dir",
@@ -41,7 +42,7 @@
       "type": "file",
       "path": "/etc/triggerhappy/triggers.d/mesh.conf",
       "mode": "0644",
-      "content": "# The machine's hotkeys, written by the mesh (module triggerhappy, novox/hq ADR 0212). Replaced on\n# every push: a key is added by the module it belongs to, as a contribution to node-hotkeys.\n# A line is: the key, its state (1 pressed, 2 held, 0 released), the command.\n${contribution:node-hotkeys:trigger}"
+      "template": "files/triggers.conf"
     },
     {
       "id": "service",
@@ -67,6 +68,11 @@
         "loads": [
           "triggerhappy-tools"
         ]
+      },
+      {
+        "name": "files",
+        "kind": "archive",
+        "from": "files"
       }
     ]
   }