From f8625a88f952e8f8107e0be9eec2bd99cf9fef05 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Tue, 26 Sep 2023 10:19:42 +0200 Subject: [PATCH] feat(archives.jenkins.io) prepare data migration from Oracle (#162) Signed-off-by: Damien Duportal --- archives.jenkins.io.tf | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/archives.jenkins.io.tf b/archives.jenkins.io.tf index 3edf3cc..6269dd5 100644 --- a/archives.jenkins.io.tf +++ b/archives.jenkins.io.tf @@ -6,7 +6,7 @@ resource "digitalocean_ssh_key" "archives_jenkins_io" { resource "digitalocean_volume" "archives_jenkins_io_data" { region = var.region name = "archivesjenkinsiodata" # Only lowercase alphanum - size = 700 + size = 750 initial_filesystem_type = "ext4" description = "Data disk for archives.jenkins.io" } @@ -26,7 +26,6 @@ resource "digitalocean_droplet" "archives_jenkins_io" { resize_disk = true ssh_keys = [digitalocean_ssh_key.archives_jenkins_io.fingerprint] user_data = templatefile("${path.root}/.shared-tools/terraform/cloudinit.tftpl", { hostname = "archives.do.jenkins.io" }) - } ## Allow accessing the internet in HTTP/HTTPS/DNS and allow incoming HTTP/HTTP from anywhere (public service) @@ -37,9 +36,13 @@ resource "digitalocean_firewall" "archives_jenkins_io" { droplet_ids = [digitalocean_droplet.archives_jenkins_io.id] inbound_rule { - protocol = "tcp" - port_range = "22" - source_addresses = ["109.88.234.158/32"] + protocol = "tcp" + port_range = "22" + # TODO: implement a common way to share admin IPs through terraform projects + source_addresses = [ + "109.88.234.158/32", # dduportal + "129.146.98.132/32", # Oracle's VM archives.jenkins.io (for data migration) + ] } inbound_rule {