Merge pull request #5428 from wazuh/maintenance/5425-add-ubuntu-2410-…

…in-allocator Added Ubuntu 24.04 AMD64 and ARM64 to the Allocator
wazuh · May 23, 2024 · afd6c1f · afd6c1f
2 parents ae71170 + df8daae
commit afd6c1f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/deployability/modules/allocation/aws/helpers/userData.sh b/deployability/modules/allocation/aws/helpers/userData.sh
@@ -162,7 +162,13 @@ fi
 
 if [ "$DIST_NAME" = "ubuntu" ] || [ "$DIST_NAME" = "debian" ]; then
     perl -pi -e "s/^#?Port 22$/Port ${SSH_PORT}/" /etc/ssh/sshd_config
-    service sshd restart || service ssh restart
+    if [ "$DIST_VER" = "24" ]; then
+        perl -pi -e "s/^#?ListenStream=22$/ListenStream=${SSH_PORT}/" /etc/systemd/system/sockets.target.wants/ssh.socket
+        systemctl daemon-reload
+        systemctl restart sshd || systemctl restart ssh 
+    else
+        service sshd restart || service ssh restart
+    fi
 fi
 
 if [ "$DIST_NAME" = "darwin" ]; then

diff --git a/deployability/modules/allocation/static/specs/os.yml b/deployability/modules/allocation/static/specs/os.yml
@@ -209,6 +209,14 @@ vagrant:
 
 aws:
   # Ubuntu
+  linux-ubuntu-24.04-amd64:
+    ami: ami-04b70fa74e45c3917
+    zone: us-east-1
+    user: ubuntu
+  linux-ubuntu-24.04-arm64:
+    ami: ami-0eac975a54dfee8cb
+    zone: us-east-1
+    user: ubuntu
   linux-ubuntu-22.04-amd64:
     ami: ami-053b0d53c279acc90
     zone: us-east-1