Capture mesh-catalog at feat/r4g (2246ccc4) with the templates its manifests name and its predefined.json, and lay the copy out as a repository's root
The catalogue's manifests moved their content into template files and fall back to predefined keys, so a copy of module.json alone no longer passes the catalogue's own check; the bus's Dockerfile is gone from the catalogue.
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"module": "ssh-client",
|
||||
"version": "1",
|
||||
"moved": true,
|
||||
"tools": [
|
||||
"ssh_client_hosts",
|
||||
"ssh_client_resolve",
|
||||
@@ -11,6 +12,12 @@
|
||||
"ssh_client_known_host",
|
||||
"ssh_client_test"
|
||||
],
|
||||
"requires": [
|
||||
"forge-account"
|
||||
],
|
||||
"state": [
|
||||
"keys"
|
||||
],
|
||||
"data": {
|
||||
"own": [
|
||||
{
|
||||
@@ -27,14 +34,16 @@
|
||||
"type": "directory",
|
||||
"path": "${machine:account-home}/.ssh",
|
||||
"owner": "${machine:account}",
|
||||
"mode": "0700"
|
||||
"mode": "0700",
|
||||
"unknown": "module"
|
||||
},
|
||||
{
|
||||
"id": "config-d",
|
||||
"type": "directory",
|
||||
"path": "${machine:account-home}/.ssh/config.d",
|
||||
"owner": "${machine:account}",
|
||||
"mode": "0700"
|
||||
"mode": "0700",
|
||||
"unknown": "module"
|
||||
},
|
||||
{
|
||||
"id": "config",
|
||||
@@ -44,7 +53,33 @@
|
||||
"mode": "0600",
|
||||
"into": "block",
|
||||
"at": "start",
|
||||
"content": "# The mesh's region (module ssh-client, novox/hq research 027/03). It comes first because ssh\n# takes the first value it finds for each option. It brings in ~/.ssh/config.d/ in name order:\n# 00-mesh, the mesh's Host per machine, then each file another module places there. Replaced at\n# every push. Everything below it is yours, kept as you wrote it, and applies to every host the\n# files above leave unsettled.\nInclude ~/.ssh/config.d/*\n"
|
||||
"template": "files/config"
|
||||
},
|
||||
{
|
||||
"id": "known-hosts",
|
||||
"type": "file",
|
||||
"path": "${machine:account-home}/.ssh/known_hosts",
|
||||
"owner": "${machine:account}",
|
||||
"mode": "0644",
|
||||
"into": "block",
|
||||
"template": "files/known_hosts"
|
||||
},
|
||||
{
|
||||
"id": "forge-host",
|
||||
"type": "file",
|
||||
"path": "${machine:account-home}/.ssh/config.d/10-forge",
|
||||
"owner": "${machine:account}",
|
||||
"mode": "0600",
|
||||
"template": "files/forge"
|
||||
},
|
||||
{
|
||||
"id": "git-config",
|
||||
"type": "file",
|
||||
"path": "${machine:account-home}/.config/git/config",
|
||||
"owner": "${machine:account}",
|
||||
"mode": "0644",
|
||||
"into": "block",
|
||||
"template": "files/gitconfig"
|
||||
}
|
||||
],
|
||||
"facts": {
|
||||
@@ -66,6 +101,11 @@
|
||||
"loads": [
|
||||
"ssh-client-tools"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "files",
|
||||
"kind": "archive",
|
||||
"from": "files"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user