Merge pull request #2 from red5pro/fix/DEV-852

DEV-852 Update docker compose for Linode for as-terraform variables
red5pro · Feb 21, 2025 · 913b4f3 · 913b4f3
2 parents 550342c + e2dab54
commit 913b4f3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/main.tf b/main.tf
@@ -347,13 +347,6 @@ resource "random_password" "r5as_auth_secret" {
   special = false
 }
 
-# Generate random root user password
-resource "random_password" "linode_root_user_password" {
-  count       = local.cluster_or_autoscale ? 1 : 0
-  length      = 16
-  special     = false
-}
-
 resource "linode_instance" "red5pro_sm" {
   count           = local.stream_manager_count
   label           = local.stream_manager_count == 1 ? "${var.name}-sm2" : "${var.name}-sm2-${count.index+1}"
@@ -393,7 +386,6 @@ resource "linode_instance" "red5pro_sm" {
       "R5AS_AUTH_USER=${var.stream_manager_auth_user}",
       "R5AS_AUTH_PASS=${var.stream_manager_auth_password}",
       "TF_VAR_linode_api_token=${var.linode_api_token}",
-      "TF_VAR_linode_root_user_password=${random_password.linode_root_user_password[0].result}",
       "TF_VAR_linode_ssh_key_name=${local.ssh_key_name}",
       "TF_VAR_r5p_license_key=${var.red5pro_license_key}",
       "TRAEFIK_TLS_CHALLENGE=${local.stream_manager_ssl == "letsencrypt" ? "true" : "false"}",

diff --git a/red5pro-installer/autoscaling-with-ssl/docker-compose.yml b/red5pro-installer/autoscaling-with-ssl/docker-compose.yml
@@ -135,7 +135,6 @@ services:
       R5AS_SASL_ENABLED_MECHANISMS: PLAIN 
       R5AS_COMMAND_INACTIVITY_GAP_MS: 10000
       TF_VAR_linode_api_token: ${TF_VAR_linode_api_token}
-      TF_VAR_linode_root_user_password: ${TF_VAR_linode_root_user_password}
       TF_VAR_linode_ssh_key_name: ${TF_VAR_linode_ssh_key_name}
       TF_VAR_r5p_license_key: ${TF_VAR_r5p_license_key:?Ensure TF_VAR_r5p_license_key is set to the Red5 Pro license key}
 

diff --git a/red5pro-installer/autoscaling-without-ssl/docker-compose.yml b/red5pro-installer/autoscaling-without-ssl/docker-compose.yml
@@ -135,7 +135,6 @@ services:
       R5AS_SASL_ENABLED_MECHANISMS: PLAIN 
       R5AS_COMMAND_INACTIVITY_GAP_MS: 10000
       TF_VAR_linode_api_token: ${TF_VAR_linode_api_token}
-      TF_VAR_linode_root_user_password: ${TF_VAR_linode_root_user_password}
       TF_VAR_linode_ssh_key_name: ${TF_VAR_linode_ssh_key_name}
       TF_VAR_r5p_license_key: ${TF_VAR_r5p_license_key:?Ensure TF_VAR_r5p_license_key is set to the Red5 Pro license key}