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

modules/gnome-keyring/module.json

@@ -1,6 +1,7 @@
 {
   "module": "gnome-keyring",
   "version": "1",
+  "moved": true,
   "capabilities": [
     "package-manager"
   ],
@@ -16,11 +17,11 @@
     "gnome_keyring_collections",
     "gnome_keyring_ssh_keys"
   ],
-  "shell": [
+  "items": [
     {
-      "for": "xinitrc",
-      "slot": "first",
-      "code": "# The ssh agent (module gnome-keyring, novox/hq ADR 0208): gcr's, which the account's service manager\n# starts on first use from its socket. Named here, for the session and every terminal it starts, until\n# the account's environment can say a path under the runtime directory (see the module's README).\nSSH_AUTH_SOCK=\"${XDG_RUNTIME_DIR:-/run/user/$(id -u)}/gcr/ssh\"\nexport SSH_AUTH_SOCK\n"
+      "collection": "shell:xinitrc:first",
+      "name": "xinitrc-first",
+      "template": "files/xinitrc-first"
     }
   ],
   "resources": [
@@ -46,7 +47,7 @@
       "mode": "0644",
       "into": "block",
       "at": "end",
-      "content": "# The login keyring (module gnome-keyring, novox/hq ADR 0208, ADR 0102): the password typed at the\n# login screen unlocks the keyring, and the login session starts the keyring daemon with it.\nauth       optional     pam_gnome_keyring.so\nsession    optional     pam_gnome_keyring.so auto_start\n"
+      "template": "files/pam/login"
     },
     {
       "id": "pam-passwd",
@@ -55,7 +56,7 @@
       "mode": "0644",
       "into": "block",
       "at": "end",
-      "content": "# The login keyring (module gnome-keyring, novox/hq ADR 0208, ADR 0102): changing the account's\n# password changes the login keyring's with it, so the next login still unlocks it.\npassword   optional     pam_gnome_keyring.so\n"
+      "template": "files/pam/passwd"
     }
   ],
   "build": {
@@ -70,6 +71,11 @@
         "loads": [
           "gnome-keyring-tools"
         ]
+      },
+      {
+        "name": "files",
+        "kind": "archive",
+        "from": "files"
       }
     ]
   }