fix: prefix redis env with ysr

Author: stanley2058

.env.docker.template

@@ -1,14 +1,13 @@
 # This is a simple configuration to get this running using docker compose.
 
-REDIS=redis://redis:6379
+YSR_REDIS=redis://redis:6379
 
 S3_ENDPOINT=minio
 S3_PORT=9000
 S3_SSL=false
 S3_ACCESS_KEY=minioadmin
 S3_SECRET_KEY=minioadmin
 
-NO_AUTH=true
 # YDOC_UPDATE_CALLBACK=http://demo:5173/ydoc
 
 # log everything

.env.template

@@ -1,6 +1,6 @@
 ### Redis endpoint
-REDIS=redis://localhost:6379
-# REDIS_PREFIX=y # by default "y:" is prepended to all used redis keys
+YSR_REDIS=redis://localhost:6379
+# YSR_REDIS_PREFIX=y # by default "y:" is prepended to all used redis keys
 
 ### y-redis server component
 # PORT=3002 # The port that is used for listening for websocket connections
@@ -20,9 +20,6 @@ S3_SECRET_KEY=minioadmin
 # POSTGRES=postgres://user:pass@localhost/database
 # POSTGRES_TESTDB=yredis_tests ## use a different database for testing
 
-### Skip authentication
-# NO_AUTH=true
-
 ### Auth signature
 ## The auth server authenticates web clients using json-web-tokens (jwt). 
 ## They are generated and validated using the following json-web-keys (jwk).

.env.test.template

@@ -1,6 +1,6 @@
 ### Redis endpoint
-REDIS=redis://localhost:36379
-# REDIS_PREFIX=y # by default "y:" is prepended to all used redis keys
+YSR_REDIS=redis://localhost:36379
+# YSR_REDIS_PREFIX=y # by default "y:" is prepended to all used redis keys
 
 ### y-redis server component
 # PORT=3002 # The port that is used for listening for websocket connections
@@ -20,9 +20,6 @@ S3_SECRET_KEY=minioadmin
 POSTGRES=postgres://yredis:yredis@localhost:35432/yredis
 POSTGRES_TESTDB=yredis_tests ## use a different database for testing
 
-### Skip authentication
-# NO_AUTH=true
-
 ### Auth signature
 ## The auth server authenticates web clients using json-web-tokens (jwt). 
 ## They are generated and validated using the following json-web-keys (jwk).

bin/server.js

@@ -5,7 +5,7 @@ import * as env from 'lib0/environment'
 import * as server from '../src/index.js'
 
 const port = number.parseInt(env.getConf('port') || '3002')
-const redisPrefix = env.getConf('redis-prefix') || 'y'
+const redisPrefix = env.getConf('ysr-redis-prefix') || 'y'
 const postgresUrl = env.getConf('postgres')
 const s3Endpoint = env.getConf('s3-endpoint')
 

bin/worker.js

@@ -3,7 +3,7 @@
 import * as env from 'lib0/environment'
 import * as api from '../src/api.js'
 
-const redisPrefix = env.getConf('redis-prefix') || 'y'
+const redisPrefix = env.getConf('ysr-redis-prefix') || 'y'
 const postgresUrl = env.getConf('postgres')
 const s3Endpoint = env.getConf('s3-endpoint')
 

src/api.js

@@ -16,7 +16,7 @@ import * as time from 'lib0/time'
 const logWorker = logging.createModuleLogger('@y/redis/api/worker')
 // const logApi = logging.createModuleLogger('@y/redis/api')
 
-export const redisUrl = env.ensureConf('redis')
+export const redisUrl = env.ensureConf('ysr-redis')
 
 let ydocUpdateCallback = env.getConf('ydoc-update-callback')
 if (ydocUpdateCallback != null && ydocUpdateCallback.slice(-1) !== '/') {