From 92f5df310f315802781423724e05e0776b5d587c Mon Sep 17 00:00:00 2001
From: Eric Wang <eric.wang401@gmail.com>
Date: Sat, 26 Aug 2023 22:41:29 +0000
Subject: [PATCH] fix redis password can't have special chars

---
 CHANGELOG.md         | 14 ++++++++++++++
 docker-compose.yml   |  2 +-
 routes/api-admin.php |  5 +++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0d44888f03..a3b5636a97a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v4.0.0-beta
+
+### Additions
+
+- Added IP pools and overhauled IP Address Management (IPAM)
+
+### Changes
+
+- Switched out MySQL for PostgreSQL (pending)
+
+### Fixes
+
+- Fixed inability to use special characters for Redis password
+
 ## v3.10.1-beta
 
 ### Fixes
diff --git a/docker-compose.yml b/docker-compose.yml
index 8897ec37024..f92f7b80a82 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,7 +50,7 @@ services:
   redis:
     image: redis:7.0-alpine
     restart: unless-stopped
-    command: redis-server --save 60 1 --loglevel notice --requirepass ${REDIS_PASSWORD}
+    command: redis-server --save 60 1 --loglevel notice --requirepass '${REDIS_PASSWORD}'
     ports:
       - 6379:6379
   workers:
diff --git a/routes/api-admin.php b/routes/api-admin.php
index 170d97d5ded..7bad3cc68a4 100644
--- a/routes/api-admin.php
+++ b/routes/api-admin.php
@@ -56,11 +56,12 @@
 Route::resource('address-pools', Admin\AddressPools\AddressPoolController::class)
     ->only(['index', 'show', 'store', 'update', 'destroy']);
 Route::prefix('/address-pools/{address_pool}')->group(function () {
-    Route::resource('addresses', Admin\AddressPools\AddressController::class)
-        ->only(['index', 'store', 'update', 'destroy']);
     Route::get('/nodes', [Admin\AddressPools\AddressPoolController::class, 'getNodesAllocatedTo']);
 });
 
+Route::resource('address-pools.addresses', Admin\AddressPools\AddressController::class)
+        ->only(['index', 'store', 'update', 'destroy']);
+
 Route::resource('users', Admin\UserController::class)
     ->only(['index', 'show', 'store', 'update', 'destroy']);