Post-merge fixes

distributor-node/package.json

@@ -44,7 +44,8 @@
     "url-join": "^4.0.1",
     "@types/url-join": "^4.0.1",
     "winston-daily-rotate-file": "^4.5.5",
-    "jsonwebtoken": "^8.5.1"
+    "jsonwebtoken": "^8.5.1",
+    "yaml": "^1.10.2"
   },
   "devDependencies": {
     "@adobe/jsonschema2md": "https://github.com/adobe/jsonschema2md",

docker-compose.yml

@@ -60,6 +60,7 @@ services:
     working_dir: /joystream/distributor-node
     ports:
       - 127.0.0.1:3334:3334
+      - 127.0.0.1:4334:4334
     env_file:
       # relative to working directory where docker-compose was run from
       - .env
@@ -69,15 +70,16 @@ services:
       JOYSTREAM_DISTRIBUTOR__ENDPOINTS__QUERY_NODE: ${DISTRIBUTOR_QUERY_NODE_URL}
       JOYSTREAM_DISTRIBUTOR__KEYS: "[{\"suri\":\"${DISTRIBUTOR_1_ACCOUNT_URI}\"}]"
       JOYSTREAM_DISTRIBUTOR__WORKER_ID: ${DISTRIBUTOR_1_WORKER_ID}
-      JOYSTREAM_DISTRIBUTOR__PORT: 3334
+      JOYSTREAM_DISTRIBUTOR__PUBLIC_API__PORT: 3334
+      JOYSTREAM_DISTRIBUTOR__OPERATOR_API__PORT: 4334
       JOYSTREAM_DISTRIBUTOR__ENDPOINTS__JOYSTREAM_NODE_WS: ${JOYSTREAM_NODE_WS}
       JOYSTREAM_DISTRIBUTOR__DIRECTORIES__ASSETS: /data
       JOYSTREAM_DISTRIBUTOR__DIRECTORIES__CACHE_STATE: /cache
-      JOYSTREAM_DISTRIBUTOR__DIRECTORIES__LOGS: /logs
+      JOYSTREAM_DISTRIBUTOR__LOGS__FILE__PATH: /logs
     #   JOYSTREAM_DISTRIBUTOR__ENDPOINTS__ELASTIC_SEARCH: es-endpoint
-    #   JOYSTREAM_DISTRIBUTOR__LOG__CONSOLE: "off"
-    #   JOYSTREAM_DISTRIBUTOR__LOG__FILE: "off"
-    #   JOYSTREAM_DISTRIBUTOR__LOG__ELASTIC: "off"
+    #   JOYSTREAM_DISTRIBUTOR__LOGS__CONSOLE: "off"
+    #   JOYSTREAM_DISTRIBUTOR__LOGS__FILE: "off"
+    #   JOYSTREAM_DISTRIBUTOR__LOGS__ELASTIC: "off"
     #   JOYSTREAM_DISTRIBUTOR__LIMITS__STORAGE: 50G
     #   JOYSTREAM_DISTRIBUTOR__BUCKETS: "[1,2]"
     command: ['yarn', 'joystream-distributor', 'start']
@@ -123,6 +125,7 @@ services:
     working_dir: /joystream/distributor-node
     ports:
       - 127.0.0.1:3336:3334
+      - 127.0.0.1:4336:4334
     env_file:
       # relative to working directory where docker-compose was run from
       - .env
@@ -132,15 +135,16 @@ services:
       JOYSTREAM_DISTRIBUTOR__ENDPOINTS__QUERY_NODE: ${DISTRIBUTOR_QUERY_NODE_URL}
       JOYSTREAM_DISTRIBUTOR__KEYS: "[{\"suri\":\"${DISTRIBUTOR_2_ACCOUNT_URI}\"}]"
       JOYSTREAM_DISTRIBUTOR__WORKER_ID: ${DISTRIBUTOR_2_WORKER_ID}
-      JOYSTREAM_DISTRIBUTOR__PORT: 3334
+      JOYSTREAM_DISTRIBUTOR__PUBLIC_API__PORT: 3334
+      JOYSTREAM_DISTRIBUTOR__OPERATOR_API__PORT: 4334
       JOYSTREAM_DISTRIBUTOR__ENDPOINTS__JOYSTREAM_NODE_WS: ${JOYSTREAM_NODE_WS}
       JOYSTREAM_DISTRIBUTOR__DIRECTORIES__ASSETS: /data
       JOYSTREAM_DISTRIBUTOR__DIRECTORIES__CACHE_STATE: /cache
-      JOYSTREAM_DISTRIBUTOR__DIRECTORIES__LOGS: /logs
+      JOYSTREAM_DISTRIBUTOR__LOGS__FILE__PATH: /logs
     #   JOYSTREAM_DISTRIBUTOR__ENDPOINTS__ELASTIC_SEARCH: es-endpoint
-    #   JOYSTREAM_DISTRIBUTOR__LOG__CONSOLE: "off"
-    #   JOYSTREAM_DISTRIBUTOR__LOG__FILE: "off"
-    #   JOYSTREAM_DISTRIBUTOR__LOG__ELASTIC: "off"
+    #   JOYSTREAM_DISTRIBUTOR__LOGS__CONSOLE: "off"
+    #   JOYSTREAM_DISTRIBUTOR__LOGS__FILE: "off"
+    #   JOYSTREAM_DISTRIBUTOR__LOGS__ELASTIC: "off"
     #   JOYSTREAM_DISTRIBUTOR__LIMITS__STORAGE: 50G
     #   JOYSTREAM_DISTRIBUTOR__BUCKETS: "[1,2]"
     command: ['yarn', 'joystream-distributor', 'start']

yarn.lock

@@ -32275,7 +32275,7 @@ yaml-validator@^3.0.0:
     js-yaml "^4.0.0"
     optionator "^0.9.1"
 
-yaml@^1.10.0, yaml@^1.7.2, yaml@^1.8.3:
+yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2, yaml@^1.8.3:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==