Feature 57 (config and provisioning): release the catalogue, the reviewed release branch merged with main, on top of main

modules/nextcloud/files/config.json

@@ -0,0 +1 @@
+{}

modules/nextcloud/files/server.env

@@ -0,0 +1,14 @@
+POSTGRES_HOST=${bound:postgres-database:at}:${bound:postgres-database:port}
+POSTGRES_DB=${bound:postgres-database:as}
+POSTGRES_USER=${bound:postgres-database:as}
+POSTGRES_PASSWORD=${secret:postgres-database}
+NEXTCLOUD_ADMIN_USER=mesh-admin
+NEXTCLOUD_ADMIN_PASSWORD=${secret:admin}
+OBJECTSTORE_S3_HOST=${bound:s3-bucket:at}
+OBJECTSTORE_S3_PORT=${bound:s3-bucket:port}
+OBJECTSTORE_S3_BUCKET=${bound:s3-bucket:bucket}
+OBJECTSTORE_S3_KEY=${bound:s3-bucket:as}
+OBJECTSTORE_S3_SECRET=${secret:s3-bucket}
+OBJECTSTORE_S3_SSL=false
+OBJECTSTORE_S3_USEPATH_STYLE=true
+OBJECTSTORE_S3_REGION=${bound:s3-bucket:region}

modules/nextcloud/module.json

@@ -54,6 +54,26 @@
       }
     ]
   },
+  "config": {
+    "container": {
+      "type": "string",
+      "description": "The name of the container the module's tools run Nextcloud's occ in; empty is nextcloud.",
+      "trusted": true,
+      "default": ""
+    },
+    "url": {
+      "type": "string",
+      "description": "The address the module's tools reach Nextcloud's sharing API at, as a URL; empty is this machine's Nextcloud on its port.",
+      "trusted": true,
+      "default": ""
+    },
+    "user": {
+      "type": "string",
+      "description": "The Nextcloud account the module's tools act as; empty is admin.",
+      "trusted": true,
+      "default": ""
+    }
+  },
   "resources": [
     {
       "id": "mesh-state",
@@ -72,7 +92,7 @@
       "type": "file",
       "path": "${dir:state}/server.env",
       "mode": "0600",
-      "content": "POSTGRES_HOST=${bound:postgres-database:at}:${bound:postgres-database:port}\nPOSTGRES_DB=${bound:postgres-database:as}\nPOSTGRES_USER=${bound:postgres-database:as}\nPOSTGRES_PASSWORD=${secret:postgres-database}\nNEXTCLOUD_ADMIN_USER=mesh-admin\nNEXTCLOUD_ADMIN_PASSWORD=${secret:admin}\nOBJECTSTORE_S3_HOST=${bound:s3-bucket:at}\nOBJECTSTORE_S3_PORT=${bound:s3-bucket:port}\nOBJECTSTORE_S3_BUCKET=${bound:s3-bucket:bucket}\nOBJECTSTORE_S3_KEY=${bound:s3-bucket:as}\nOBJECTSTORE_S3_SECRET=${secret:s3-bucket}\nOBJECTSTORE_S3_SSL=false\nOBJECTSTORE_S3_USEPATH_STYLE=true\nOBJECTSTORE_S3_REGION=${bound:s3-bucket:region}\n"
+      "template": "files/server.env"
     },
     {
       "id": "html",
@@ -109,7 +129,8 @@
       "type": "file",
       "path": "${dir:mesh-state}/config.json",
       "mode": "0600",
-      "content": "{}\n",
+      "template": "files/config.json",
+      "takes-config": ["container", "url", "user"],
       "merge": "json"
     }
   ],
@@ -133,6 +154,11 @@
           "MESH_NEXTCLOUD_ADMIN_USER": "mesh-admin",
           "MESH_NEXTCLOUD_ADMIN_PASSWORD_FILE": "${dir:state}/admin.secret"
         }
+      },
+      {
+        "name": "files",
+        "kind": "archive",
+        "from": "files"
       }
     ]
   }