redis changes

GenerateNU · Jun 10, 2024 · 0f40275 · 0f40275
1 parent 70a6a5e
commit 0f40275
Show file tree

Hide file tree

Showing 32 changed files with 40 additions and 560 deletions.
diff --git a/backend/Dockerfile.server → backend/Dockerfile b/backend/Dockerfile.server → backend/Dockerfile
diff --git a/config/.env.template b/config/.env.template
@@ -21,11 +21,6 @@ SAC_REDIS_LIMITER_HOST="127.0.0.1"
 SAC_REDIS_LIMITER_PORT="6381"
 SAC_REDIS_LIMITER_DB="0"
 
-SAC_AWS_BUCKET_NAME="SAC_AWS_BUCKET_NAME"
-SAC_AWS_ID="SAC_AWS_ID"
-SAC_AWS_SECRET="SAC_AWS_SECRET"
-SAC_AWS_REGION="SAC_AWS_REGION"
-
 SAC_SUDO_PASSWORD="Password#!1"
 
 SAC_AWS_BUCKET_NAME="SAC_AWS_BUCKET_NAME"

diff --git a/deployment/.gitignore b/deployment/.gitignore
diff --git a/deployment/.terraform.lock.hcl b/deployment/.terraform.lock.hcl
diff --git a/deployment/docker-composes/redis.yml b/deployment/docker-composes/redis.yml
diff --git a/deployment/docker-composes/opensearch.yml → deployment/docker/opensearch.yml b/deployment/docker-composes/opensearch.yml → deployment/docker/opensearch.yml
diff --git a/backend/Dockerfile.redis → deployment/docker/redis/Dockerfile.redis b/backend/Dockerfile.redis → deployment/docker/redis/Dockerfile.redis
diff --git a/deployment/docker/redis/redis.yml b/deployment/docker/redis/redis.yml
@@ -0,0 +1,34 @@
+services:
+  redis-session:
+    build:
+      context: .
+      dockerfile: Dockerfile.redis
+    container_name: redis_session
+    ports:
+      - 6380:6379
+    environment:
+      - REDIS_USERNAME=${SAC_REDIS_SESSION_USERNAME}
+      - REDIS_PASSWORD=${SAC_REDIS_SESSION_PASSWORD}
+      - REDIS_DISABLE_DEFAULT_USER="true"
+    volumes:
+      - redis-session-data:/data
+  redis-limiter:
+    build:
+      context: .
+      dockerfile: Dockerfile.redis
+    container_name: redis_limiter
+    ports:
+      - 6381:6379
+    environment:
+      - REDIS_USERNAME=${SAC_REDIS_LIMITER_USERNAME}
+      - REDIS_PASSWORD=${SAC_REDIS_LIMITER_PASSWORD}
+      - REDIS_DISABLE_DEFAULT_USER="true"
+    volumes:
+      - redis-limiter-data:/data
+volumes:
+  redis-session-data:
+  redis-limiter-data:
+  opensearch-data1:
+
+networks:
+  opensearch-net:
diff --git a/deployment/docker-composes/webserver.yml → deployment/docker/webserver.yml b/deployment/docker-composes/webserver.yml → deployment/docker/webserver.yml
diff --git a/deployment/main.tf b/deployment/main.tf
diff --git a/deployment/packer/docker-install.sh b/deployment/packer/docker-install.sh
diff --git a/deployment/packer/echo-test.pkr.hcl b/deployment/packer/echo-test.pkr.hcl
diff --git a/deployment/packer/opensearch.pkr.hcl b/deployment/packer/opensearch.pkr.hcl
diff --git a/deployment/packer/preamble.pkr.hcl b/deployment/packer/preamble.pkr.hcl
diff --git a/deployment/packer/redis.pkr.hcl b/deployment/packer/redis.pkr.hcl
diff --git a/deployment/packer/webserver-init.sh b/deployment/packer/webserver-init.sh
diff --git a/deployment/packer/webserver.pkr.hcl b/deployment/packer/webserver.pkr.hcl
diff --git a/backend/redis_entrypoint.sh → deployment/redis_entrypoint.sh b/backend/redis_entrypoint.sh → deployment/redis_entrypoint.sh
diff --git a/deployment/terraform-modules/go-server/init.sh b/deployment/terraform-modules/go-server/init.sh
diff --git a/deployment/terraform-modules/go-server/main.tf b/deployment/terraform-modules/go-server/main.tf
diff --git a/deployment/terraform-modules/go-server/outputs.tf b/deployment/terraform-modules/go-server/outputs.tf
diff --git a/deployment/terraform-modules/go-server/variables.tf b/deployment/terraform-modules/go-server/variables.tf