redis socket support

8 files changed, 14 insertions, 12 deletions

diff --git a/tools/redis/redis.conf b/tools/redis/redis.conf
new file mode 100644
index 0000000000..ff0db4cbdf
--- /dev/null
+++ b/tools/redis/redis.conf
@@ -0,0 +1,10 @@
+unixsocket /var/run/redis/redis.sock
+unixsocketperm 770
+port 0
+# Do not actually listen to any tcp port
+# but include the bind directive because without it redis will
+# listen on the public interface. Port 0 causes it to NOT listen on
+# the public interface. Adding the below line is an extra precaution.
+# If a developer comes by later and wants to listen on a tcp port and changes
+# the above port, it will ONLY listen on the local interface.
+bind 127.0.0.1
diff --git a/tools/redis/redis_1.conf b/tools/redis/redis_1.conf
deleted file mode 100644
index 8b6f3784d7..0000000000
--- a/tools/redis/redis_1.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-protected-mode no
-port 63791
-dir .
-logfile "/tmp/redis.log"
diff --git a/tools/redis/redis_2.conf b/tools/redis/redis_2.conf
deleted file mode 100644
index 7f02a91f4b..0000000000
--- a/tools/redis/redis_2.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-protected-mode no
-port 63792
-dir .
-logfile "/tmp/redis.log"
diff --git a/tools/redis/redis_3.conf b/tools/redis/redis_3.conf
deleted file mode 100644
index 203d723421..0000000000
--- a/tools/redis/redis_3.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-protected-mode no
-port 63793
-dir .
-logfile "/tmp/redis.log"
diff --git a/tools/redis/redis_socket_ha_1/.dir_placeholder b/tools/redis/redis_socket_ha_1/.dir_placeholder
new file mode 100644
index 0000000000..7660bfed95
--- /dev/null
+++ b/tools/redis/redis_socket_ha_1/.dir_placeholder
@@ -0,0 +1 @@
+This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the redis container will be unable to create a socket file in a directory owned by root.
diff --git a/tools/redis/redis_socket_ha_2/.dir_placeholder b/tools/redis/redis_socket_ha_2/.dir_placeholder
new file mode 100644
index 0000000000..7660bfed95
--- /dev/null
+++ b/tools/redis/redis_socket_ha_2/.dir_placeholder
@@ -0,0 +1 @@
+This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the redis container will be unable to create a socket file in a directory owned by root.
diff --git a/tools/redis/redis_socket_ha_3/.dir_placeholder b/tools/redis/redis_socket_ha_3/.dir_placeholder
new file mode 100644
index 0000000000..7660bfed95
--- /dev/null
+++ b/tools/redis/redis_socket_ha_3/.dir_placeholder
@@ -0,0 +1 @@
+This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the redis container will be unable to create a socket file in a directory owned by root.
diff --git a/tools/redis/redis_socket_standalone/.dir_placeholder b/tools/redis/redis_socket_standalone/.dir_placeholder
new file mode 100644
index 0000000000..7660bfed95
--- /dev/null
+++ b/tools/redis/redis_socket_standalone/.dir_placeholder
@@ -0,0 +1 @@
+This dir must pre-exist and be owned by the user you are launching awx dev env as. If the dir does not exist before launching the awx dev environment then docker will create the dir and it will be owned by root. Since we start our awx dev environment with user: ${CURRENT_UID} the redis container will be unable to create a socket file in a directory owned by root.