refactor: rename dev-test-iroh to dev-test-bootstrap2-iroh

Align naming with existing convention where "bootstrap2" refers to the
Kitsune2 bootstrap protocol version.

Author: ThetaSinner

.github/workflows/preview.yaml

@@ -21,9 +21,9 @@ jobs:
             cat stderr.log | grep "in.*line.*column" -B1 -A1 --no-group-separator | sed -z 's/\([^\n]*\)\n\s*in "\([^"]*\)", line \([[:digit:]]\+\), column \([[:digit:]]\+\):\s*/::error file=cloud-init.yaml,title=\1 in \2,line=\3,col=\4::/g'
             exit 1
           fi
-      - name: Lint dev-test-iroh cloud-init file
+      - name: Lint dev-test-bootstrap2-iroh cloud-init file
         run: |
-          if ! cloud-init schema -c dev-test-iroh/cloud-init.yaml 2> >(tee stderr.log) >> $GITHUB_STEP_SUMMARY
+          if ! cloud-init schema -c dev-test-bootstrap2-iroh/cloud-init.yaml 2> >(tee stderr.log) >> $GITHUB_STEP_SUMMARY
           then
             # Print errors as such in GitHub logs.
             cat stderr.log | grep "in.*line.*column" -B1 -A1 --no-group-separator | sed -z 's/\([^\n]*\)\n\s*in "\([^"]*\)", line \([[:digit:]]\+\), column \([[:digit:]]\+\):\s*/::error file=cloud-init.yaml,title=\1 in \2,line=\3,col=\4::/g'

Pulumi.network-services.yaml

@@ -10,5 +10,5 @@ config:
   hc-auth-iroh-unyt:session-secret:
     secure: AAABADk48DM2ZdxAXP0bqKocsoRrVSiS9aXgDULVL5jsc+TT8up+zivzSyNb0XriQvnYIz+o1VfyyYwVh8YQFqxTDdn4hNJSyh7rW2sYovD6rN3y+GuWhnVBdRNNflhNcGERk5k1nvkM8jDA7yvfkPzzUZaWgL1I
   cloudflare:apiToken:
-    secure: AAABAAZzoth38tXpuxrHgKym1nBInl/O69Hr/R8TUdpoiQndNx9CS8KViwrNUHnoQCHb5C7rDOFna3JSIKwOjPkKup0Gi70vsalBI0xG/AY8Q0Lmcw==
+    secure: AAABAFPh7LffxJ9S2r0u9GTA2M5dKok33wA3EsEtRrHD5WALAIDju1ANuvtjsaoxtZ7UpojMifDF7Ndk49zxFXhZozwvzn+/kQJWRhdsNqWmSsr9NA==
   dns:cloudflare-zone-id: 10a5dbacf3bed1ccc671f04e90f4423f

README.md

@@ -212,7 +212,7 @@ certificate (retrying until DNS propagates) and starts the `bootstrap` systemd s
 
 No manual setup is required beyond the Pulumi configuration. The deployment creates:
 - A DigitalOcean droplet
-- Cloudflare A and AAAA records for `dev-test-iroh.holochain.org`
+- Cloudflare A and AAAA records for `dev-test-bootstrap2-iroh.holochain.org`
 
 Cloud-init handles certbot and service startup automatically.
 
@@ -221,7 +221,7 @@ Cloud-init handles certbot and service startup automatically.
 SSH into the server and use systemd to manage the bootstrap service:
 
 ```sh
-ssh root@dev-test-iroh.holochain.org
+ssh root@dev-test-bootstrap2-iroh.holochain.org
 
 # Check service status
 systemctl status bootstrap
@@ -235,11 +235,11 @@ systemctl restart bootstrap
 
 ### Updating the container
 
-Edit `dev-test-iroh/cloud-init.yaml` locally and open a PR. Once merged, the cloud-init change will take effect on the
+Edit `dev-test-bootstrap2-iroh/cloud-init.yaml` locally and open a PR. Once merged, the cloud-init change will take effect on the
 next droplet recreation. To update a running instance, SSH in and update the Quadlet container file:
 
 ```sh
-scp dev-test-iroh/cloud-init.yaml root@dev-test-iroh.holochain.org:/tmp/cloud-init.yaml
+scp dev-test-bootstrap2-iroh/cloud-init.yaml root@dev-test-bootstrap2-iroh.holochain.org:/tmp/cloud-init.yaml
 ```
 
 Then on the server, extract the updated container definition from the cloud-init and reload:

dev-test-iroh/cloud-init.yaml dev-test-bootstrap2-iroh/cloud-init.yamldev-test-iroh/cloud-init.yaml renamed to dev-test-bootstrap2-iroh/cloud-init.yaml

@@ -1,8 +1,5 @@
 #cloud-config
 
-packages:
-  - podman
-
 snap:
   commands:
     0: [install, core]
@@ -13,7 +10,7 @@ write_files:
   - content: |
       [Container]
       Image=ghcr.io/holochain/kitsune2_bootstrap_srv_iroh_relay:v0.4.0-dev.6
-      Exec=kitsune2-bootstrap-srv --production --listen [::]:443 --tls-cert /etc/letsencrypt/live/dev-test-iroh.holochain.org/fullchain.pem --tls-key /etc/letsencrypt/live/dev-test-iroh.holochain.org/privkey.pem
+      Exec=kitsune2-bootstrap-srv --production --listen [::]:443 --tls-cert /etc/letsencrypt/live/dev-test-bootstrap2-iroh.holochain.org/fullchain.pem --tls-key /etc/letsencrypt/live/dev-test-bootstrap2-iroh.holochain.org/privkey.pem
       Environment=RUST_LOG=info
       Network=host
       Volume=/etc/letsencrypt:/etc/letsencrypt:ro
@@ -30,12 +27,19 @@ write_files:
       #!/bin/bash
       set -euo pipefail
 
+      # Restart journald so its storage directory matches the machine ID
+      # that cloud-init may have reinitialized.
+      systemctl restart systemd-journald
+
+      apt-get update -y
+      apt-get install -y podman
+
       max_attempts=10
       delay=30
 
       for attempt in $(seq 1 $max_attempts); do
         echo "Certbot attempt $attempt of $max_attempts..."
-        if certbot certonly --standalone -d dev-test-iroh.holochain.org --non-interactive --agree-tos -m contact@holochain.org; then
+        if certbot certonly --standalone -d dev-test-bootstrap2-iroh.holochain.org --non-interactive --agree-tos -m contact@holochain.org; then
           echo "Certificate obtained successfully."
           systemctl daemon-reload
           systemctl start bootstrap

main.go

@@ -13,9 +13,9 @@ import (
 )
 
 func main() {
-	devTestIrohCloudInitYaml, err := os.ReadFile("dev-test-iroh/cloud-init.yaml")
+	devTestBootstrap2IrohCloudInitYaml, err := os.ReadFile("dev-test-bootstrap2-iroh/cloud-init.yaml")
 	if err != nil {
-		log.Fatalf("failed to load dev-test-iroh/cloud-init.yaml: %s", err)
+		log.Fatalf("failed to load dev-test-bootstrap2-iroh/cloud-init.yaml: %s", err)
 	}
 
 	hcAuthIrohUnytCloudInitBytes, err := os.ReadFile("hc-auth-iroh-unyt/cloud-init.yaml.tmpl")
@@ -32,7 +32,7 @@ func main() {
 			return err
 		}
 
-		if err := configureDevTestIroh(ctx, string(devTestIrohCloudInitYaml)); err != nil {
+		if err := configureDevTestBootstrap2Iroh(ctx, string(devTestBootstrap2IrohCloudInitYaml)); err != nil {
 			return err
 		}
 
@@ -77,7 +77,7 @@ func configureDevTestBootstrapSrv(ctx *pulumi.Context) error {
 	return nil
 }
 
-func configureDevTestIroh(ctx *pulumi.Context, devTestIrohCloudInitYaml string) error {
+func configureDevTestBootstrap2Iroh(ctx *pulumi.Context, devTestBootstrap2IrohCloudInitYaml string) error {
 	cfg := pulumiConfig.New(ctx, "dns")
 	zoneId := cfg.Require("cloudflare-zone-id")
 
@@ -91,23 +91,23 @@ func configureDevTestIroh(ctx *pulumi.Context, devTestIrohCloudInitYaml string)
 		sshFingerprints = append(sshFingerprints, key.Fingerprint)
 	}
 
-	droplet, err := digitalocean.NewDroplet(ctx, "dev-test-iroh", &digitalocean.DropletArgs{
+	droplet, err := digitalocean.NewDroplet(ctx, "dev-test-bootstrap2-iroh", &digitalocean.DropletArgs{
 		Image:    pulumi.String("ubuntu-24-04-x64"),
-		Name:     pulumi.String("dev-test-iroh"),
+		Name:     pulumi.String("dev-test-bootstrap2-iroh"),
 		Region:   pulumi.String(digitalocean.RegionFRA1),
 		Size:     pulumi.String(digitalocean.DropletSlugDropletS2VCPU2GB),
 		Ipv6:     pulumi.Bool(true),
 		Tags:     pulumi.StringArray{pulumi.String("network-services")},
 		SshKeys:  pulumi.ToStringArray(sshFingerprints),
-		UserData: pulumi.String(devTestIrohCloudInitYaml),
+		UserData: pulumi.String(devTestBootstrap2IrohCloudInitYaml),
 	}, pulumi.IgnoreChanges([]string{"sshKeys"}))
 	if err != nil {
 		return err
 	}
 
-	_, err = cloudflare.NewRecord(ctx, "dev-test-iroh-A", &cloudflare.RecordArgs{
+	_, err = cloudflare.NewRecord(ctx, "dev-test-bootstrap2-iroh-A", &cloudflare.RecordArgs{
 		ZoneId:  pulumi.String(zoneId),
-		Name:    pulumi.String("dev-test-iroh"),
+		Name:    pulumi.String("dev-test-bootstrap2-iroh"),
 		Type:    pulumi.String("A"),
 		Content: droplet.Ipv4Address,
 		Ttl:     pulumi.Int(300),
@@ -117,9 +117,9 @@ func configureDevTestIroh(ctx *pulumi.Context, devTestIrohCloudInitYaml string)
 		return err
 	}
 
-	_, err = cloudflare.NewRecord(ctx, "dev-test-iroh-AAAA", &cloudflare.RecordArgs{
+	_, err = cloudflare.NewRecord(ctx, "dev-test-bootstrap2-iroh-AAAA", &cloudflare.RecordArgs{
 		ZoneId:  pulumi.String(zoneId),
-		Name:    pulumi.String("dev-test-iroh"),
+		Name:    pulumi.String("dev-test-bootstrap2-iroh"),
 		Type:    pulumi.String("AAAA"),
 		Content: droplet.Ipv6Address,
 		Ttl:     pulumi.Int(300),