OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Addedsupport for credentials on redis

Browse Source
This commit is contained in:
Alejandro Celaya
2022-12-12 20:50:21 +01:00
parent 0b04476c99
commit 2bf3e6a13b
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -45,7 +45,7 @@
"php-middleware/request-id": "^4.1", "php-middleware/request-id": "^4.1",
"pugx/shortid-php": "^1.1", "pugx/shortid-php": "^1.1",
"ramsey/uuid": "^4.5", "ramsey/uuid": "^4.5",
"shlinkio/shlink-common": "dev-main#f4101bc as 5.2", "shlinkio/shlink-common": "dev-main#8d06f0e as 5.2",
"shlinkio/shlink-config": "dev-main#96c81fb as 2.3", "shlinkio/shlink-config": "dev-main#96c81fb as 2.3",
"shlinkio/shlink-event-dispatcher": "^2.6", "shlinkio/shlink-event-dispatcher": "^2.6",
"shlinkio/shlink-importer": "dev-main#c97662b as 5.0", "shlinkio/shlink-importer": "dev-main#c97662b as 5.0",

2
config/autoload/redis.local.php.local
View File

@@ -7,6 +7,8 @@ return [
'cache' => [ 'cache' => [
'redis' => [ 'redis' => [
'servers' => 'tcp://shlink_redis:6379', 'servers' => 'tcp://shlink_redis:6379',
// 'servers' => 'tcp://barbar@shlink_redis_acl:6379',
// 'servers' => 'tcp://foo:bar@shlink_redis_acl:6379',
], ],
], ],

2
data/infra/redis/redis-acl.conf Normal file
View File

@@ -0,0 +1,2 @@
user foo allcommands allkeys on >bar
requirepass barbar

14
docker-compose.yml
View File

@@ -29,6 +29,7 @@ services:
- shlink_db_maria - shlink_db_maria
- shlink_db_ms - shlink_db_ms
- shlink_redis - shlink_redis
- shlink_redis_acl
- shlink_mercure - shlink_mercure
- shlink_mercure_proxy - shlink_mercure_proxy
- shlink_rabbitmq - shlink_rabbitmq
@@ -65,6 +66,7 @@ services:
- shlink_db_maria - shlink_db_maria
- shlink_db_ms - shlink_db_ms
- shlink_redis - shlink_redis
- shlink_redis_acl
- shlink_mercure - shlink_mercure
- shlink_mercure_proxy - shlink_mercure_proxy
- shlink_rabbitmq - shlink_rabbitmq
@@ -89,6 +91,7 @@ services:
- shlink_db_maria - shlink_db_maria
- shlink_db_ms - shlink_db_ms
- shlink_redis - shlink_redis
- shlink_redis_acl
- shlink_mercure - shlink_mercure
- shlink_mercure_proxy - shlink_mercure_proxy
- shlink_rabbitmq - shlink_rabbitmq
@@ -146,10 +149,19 @@ services:
shlink_redis: shlink_redis:
container_name: shlink_redis container_name: shlink_redis
image: redis:6.0-alpine image: redis:6.2-alpine
ports: ports:
- "6380:6379" - "6380:6379"
shlink_redis_acl:
container_name: shlink_redis_acl
image: redis:6.2-alpine
command: ["redis-server", "/usr/local/etc/redis/redis.conf"]
ports:
- "6382:6379"
volumes:
- ./data/infra/redis/redis-acl.conf:/usr/local/etc/redis/redis.conf
shlink_mercure_proxy: shlink_mercure_proxy:
container_name: shlink_mercure_proxy container_name: shlink_mercure_proxy
image: nginx:1.19.6-alpine image: nginx:1.19.6-alpine