Merge pull request 'mssql: place its directories and name the software's port, not a machine's' (#160) from feat/mssql-for-ace into main
This commit was merged in pull request #160.
This commit is contained in:
+11
-12
@@ -21,23 +21,23 @@
|
|||||||
"listens": [
|
"listens": [
|
||||||
{
|
{
|
||||||
"name": "database",
|
"name": "database",
|
||||||
"port": 4848,
|
"port": 1433,
|
||||||
"protocol": "tcp",
|
"protocol": "tcp",
|
||||||
"from": "mesh",
|
"from": "mesh",
|
||||||
"why": "modules on any machine that were granted a database. 4848, not 1433: the machine this replaces has served it there since it was installed, and every consumer was handed that number"
|
"why": "modules on any machine that were granted a database, and the people who were given its address; the machine port is the assignment's to pin"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"serves": {
|
"serves": {
|
||||||
"mssql-database": {}
|
"mssql-database": {}
|
||||||
},
|
},
|
||||||
"receives": {
|
"receives": {
|
||||||
"mssql-database": "/var/lib/mssql/grants/mesh.json"
|
"mssql-database": "${dir:grants}/mesh.json"
|
||||||
},
|
},
|
||||||
"grants": {
|
"grants": {
|
||||||
"mssql-database": "/var/lib/mssql/grants"
|
"mssql-database": "${dir:grants}"
|
||||||
},
|
},
|
||||||
"own-secrets": {
|
"own-secrets": {
|
||||||
"sa": "/var/lib/mssql/sa.secret",
|
"sa": "${dir:state}/sa.secret",
|
||||||
"broker": "/var/lib/mesh/mssql/broker"
|
"broker": "/var/lib/mesh/mssql/broker"
|
||||||
},
|
},
|
||||||
"resources": [
|
"resources": [
|
||||||
@@ -50,19 +50,18 @@
|
|||||||
{
|
{
|
||||||
"id": "state",
|
"id": "state",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
"path": "/var/lib/mssql",
|
"mode": "0700",
|
||||||
"mode": "0700"
|
"place": "."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "grants",
|
"id": "grants",
|
||||||
"type": "directory",
|
"type": "directory",
|
||||||
"path": "/var/lib/mssql/grants",
|
|
||||||
"mode": "0700"
|
"mode": "0700"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "sa-env",
|
"id": "sa-env",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"path": "/var/lib/mssql/sa.env",
|
"path": "${dir:state}/sa.env",
|
||||||
"mode": "0600",
|
"mode": "0600",
|
||||||
"content": "ACCEPT_EULA=Y\nMSSQL_SA_PASSWORD=${secret:sa}\n"
|
"content": "ACCEPT_EULA=Y\nMSSQL_SA_PASSWORD=${secret:sa}\n"
|
||||||
},
|
},
|
||||||
@@ -84,7 +83,7 @@
|
|||||||
"image": "mcr.microsoft.com/mssql/server@sha256:4402d880dd4c34bfa7d8705e56a86cd6c88da80a1f6bbbe741f999e76264a090",
|
"image": "mcr.microsoft.com/mssql/server@sha256:4402d880dd4c34bfa7d8705e56a86cd6c88da80a1f6bbbe741f999e76264a090",
|
||||||
"network": "mssql",
|
"network": "mssql",
|
||||||
"env-file": [
|
"env-file": [
|
||||||
"/var/lib/mssql/sa.env"
|
"${dir:state}/sa.env"
|
||||||
],
|
],
|
||||||
"ports": [
|
"ports": [
|
||||||
"1433"
|
"1433"
|
||||||
@@ -101,8 +100,8 @@
|
|||||||
"network": "mssql",
|
"network": "mssql",
|
||||||
"volumes": [
|
"volumes": [
|
||||||
"/var/lib/mesh/mssql/broker:/run/secrets/broker:ro",
|
"/var/lib/mesh/mssql/broker:/run/secrets/broker:ro",
|
||||||
"/var/lib/mssql/grants:/var/lib/mssql/grants:ro",
|
"${dir:grants}:/var/lib/mssql/grants:ro",
|
||||||
"/var/lib/mssql/sa.secret:/run/secrets/sa:ro"
|
"${dir:state}/sa.secret:/run/secrets/sa:ro"
|
||||||
],
|
],
|
||||||
"env": {
|
"env": {
|
||||||
"MESH_PROVISION_MSSQL": "mssql://sa@mssql:1433/master",
|
"MESH_PROVISION_MSSQL": "mssql://sa@mssql:1433/master",
|
||||||
|
|||||||
Reference in New Issue
Block a user