From 934cb0df0fc66213560b5f310a635c9d76e086e3 Mon Sep 17 00:00:00 2001 From: Ryan Aslett Date: Thu, 27 Mar 2025 10:22:55 -0700 Subject: [PATCH 1/6] ansible: add new smartos-22 host --- ansible/inventory.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 1bb4577bb..51d6e8664 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -200,14 +200,14 @@ hosts: # to update the Jenkins worker IP allowlist in github-bot ubuntu2204-x64-1: {ip: 67.158.54.159, alias: jenkins-workspace-9} ubuntu2204-x64-2: {ip: 8.225.232.44, alias: jenkins-workspace-10} - smartos22-x64-2: - ip: 172.16.9.3 - ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@67.158.54.56"' - ansible_user: root smartos22-x64-3: ip: 172.16.9.3 ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@8.225.232.32"' ansible_user: root + smartos22-x64-4: + ip: 172.16.9.3 + ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@192.207.255.126"' + ansible_user: root smartos23-x64-4: ip: 172.16.9.3 ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@192.207.255.124"' From 9da1dfc9e62d1b1d9450c0d1e9ba69c7a75bb7dd Mon Sep 17 00:00:00 2001 From: Ryan Aslett Date: Thu, 29 May 2025 08:40:54 -0700 Subject: [PATCH 2/6] ansible: add the unencrypted server --- ansible/inventory.yml | 2 ++ ansible/playbooks/create-rsync-unencrypted.yml | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 ansible/playbooks/create-rsync-unencrypted.yml diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 51d6e8664..7392f7b11 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -8,6 +8,8 @@ hosts: - infra: + - azure: + ubuntu2404-x64-1: {ip: 172.203.217.211, alias: rsync, user: iojs} - digitalocean: ubuntu1604-x64-1: {ip: 138.197.224.240, alias: www} diff --git a/ansible/playbooks/create-rsync-unencrypted.yml b/ansible/playbooks/create-rsync-unencrypted.yml new file mode 100644 index 000000000..7858f7335 --- /dev/null +++ b/ansible/playbooks/create-rsync-unencrypted.yml @@ -0,0 +1,14 @@ +--- + +# +# sets up the host that serves unencrypted and rsync endpoints +# +# This is very incomplete, and mostly just for bootstrapping the box. +# The rsync config, and rsync mirror service are not configured with ansible. (and hopefully wont have to be) + +- hosts: infra-azure-ubuntu2404-x64-1 + roles: + - bootstrap + - package-upgrade + - baselayout + - { role: nginx, sites: [ 'nodejs.org','unencrypted' ] } From 5da2fe5bad22f7a1b5573fc76eae53518a605761 Mon Sep 17 00:00:00 2001 From: Ryan Aslett Date: Mon, 24 Mar 2025 20:45:31 -0700 Subject: [PATCH 3/6] ansible: add new uncompromised smartos hosts --- ansible/inventory.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index a55319ee1..91179539c 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -208,6 +208,10 @@ hosts: ip: 172.16.9.3 ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@192.207.255.126"' ansible_user: root + smartos22-x64-3: + ip: 172.16.9.3 + ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@8.225.232.32"' + ansible_user: root smartos23-x64-4: ip: 172.16.9.3 ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@192.207.255.124"' @@ -216,6 +220,10 @@ hosts: ip: 172.16.9.3 ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@8.225.232.36"' ansible_user: root + smartos23-x64-6: + ip: 172.16.9.3 + ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@8.225.232.36"' + ansible_user: root - osuosl: From 76ebc77abd355f3a2d5f754941f79115f51b1b7c Mon Sep 17 00:00:00 2001 From: Ryan Aslett Date: Thu, 29 May 2025 08:51:15 -0700 Subject: [PATCH 4/6] ansible: remove extraneous merge artifacts --- ansible/inventory.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index d4d6d51f1..b9cb11966 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -210,10 +210,6 @@ hosts: ip: 172.16.9.3 ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@192.207.255.126"' ansible_user: root - smartos22-x64-3: - ip: 172.16.9.3 - ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@8.225.232.32"' - ansible_user: root smartos23-x64-4: ip: 172.16.9.3 ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@192.207.255.124"' @@ -222,10 +218,6 @@ hosts: ip: 172.16.9.3 ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@8.225.232.36"' ansible_user: root - smartos23-x64-6: - ip: 172.16.9.3 - ansible_ssh_common_args: '-o ProxyCommand="ssh -i ~/.ssh/nodejs_build_test -W %h:%p root@8.225.232.36"' - ansible_user: root - osuosl: From 42c5e0a288cb9aa93bd1af91e44479c73dc6185b Mon Sep 17 00:00:00 2001 From: Ryan Aslett Date: Thu, 29 May 2025 08:55:08 -0700 Subject: [PATCH 5/6] ansible: remove old unencrypted server --- ansible/inventory.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index b9cb11966..c7a35ce11 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -151,9 +151,6 @@ hosts: ubuntu2204-x64-3: {ip: 52.117.26.14, alias: jenkins-workspace-6} ubuntu2204_docker-x64-1: {ip: 52.117.26.9} - - equinix_mnx: - ubuntu1804-x64-1: {ip: 147.28.162.99, user: ubuntu} - - hetzner: ubuntu2204-x64-1: ip: 37.27.104.214 From 0743f2a5996363d0dc41ce1d17af407d6bb4cf4d Mon Sep 17 00:00:00 2001 From: Ryan Aslett Date: Thu, 29 May 2025 09:28:39 -0700 Subject: [PATCH 6/6] ansible: remove other legacy equinix hosts --- ansible/inventory.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index c7a35ce11..280bfb85a 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -22,10 +22,6 @@ hosts: ubuntu2004-x64-1: {ip: 169.60.150.91, alias: ansible} ubuntu2404-x64-1: {ip: 169.61.75.62, alias: ci-release} - - joyent: - debian10-x64-1: {ip: 147.28.162.110, alias: grafana} - ubuntu1604-x64-1: {ip: 147.28.162.105, alias: unencrypted} - - mnx: ubuntu2204-x64-1: {ip: 67.158.54.181, alias: backup-2} @@ -54,9 +50,6 @@ hosts: - iinthecloud: ibmi73-ppc64_be-1: {ip: 65.183.160.62, user: nodejs} - - joyent: - ubuntu1804_docker-x64-1: {ip: 147.28.162.104, user: ubuntu} - - marist: zos24-s390x-1: {ip: 148.100.36.157, user: unix1}