From f5f852fe40963bb9246fe9ed89b63fd71cb6afe3 Mon Sep 17 00:00:00 2001
From: James <james@jongsma.me>
Date: Sun, 29 Mar 2026 07:16:12 -0400
Subject: [PATCH] rebrand: rename vault1984 references to clavitor in Makefile
 and pop-sync (C-005)

---
 clavis/Makefile             |  4 ++--
 operations/pop-sync/main.go | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/clavis/Makefile b/clavis/Makefile
index 85b92b9..78668df 100644
--- a/clavis/Makefile
+++ b/clavis/Makefile
@@ -31,8 +31,8 @@ GOFLAGS     := -trimpath
 all: vault cli
 
 vault:
-	cp $(CRYPTO_DIR)/*.js $(VAULT_DIR)/cmd/vault1984/web/ 2>/dev/null || true
-	sed -i 's/__BUILD_TIME__/$(shell date -u +%Y%m%d-%H%M%S)/' $(VAULT_DIR)/cmd/vault1984/web/index.html 2>/dev/null || true
+	cp $(CRYPTO_DIR)/*.js $(VAULT_DIR)/cmd/clavitor/web/ 2>/dev/null || true
+	sed -i 's/__BUILD_TIME__/$(shell date -u +%Y%m%d-%H%M%S)/' $(VAULT_DIR)/cmd/clavitor/web/index.html 2>/dev/null || true
 	cd $(VAULT_DIR) && go build $(GOFLAGS) -ldflags '$(LDFLAGS)' -o clavitor $(VAULT_ENTRY)
 	@echo "built $(VAULT_BIN) (FIPS)"
 
diff --git a/operations/pop-sync/main.go b/operations/pop-sync/main.go
index 4828c28..69214ea 100644
--- a/operations/pop-sync/main.go
+++ b/operations/pop-sync/main.go
@@ -903,7 +903,7 @@ func provisionNode(cfg Config, pop POP) NodeResult {
 		MaxCount:     int32Ptr(1),
 		SecurityGroupIds: []string{sgID},
 		IamInstanceProfile: &ec2types.IamInstanceProfileSpecification{
-			Name: strPtr("vault1984-ssm-profile"),
+			Name: strPtr("clavitor-ssm-profile"), // NOTE: existing AWS IAM profile may still be named vault1984-ssm-profile — rename in AWS console to match
 		},
 		TagSpecifications: []ec2types.TagSpecification{{
 			ResourceType: ec2types.ResourceTypeInstance,
@@ -1476,21 +1476,23 @@ func provisionISHosting(cfg Config, pop POP) NodeResult {
 }
 
 func ensureSecurityGroup(ctx context.Context, client *ec2.Client, region, city string, cfg Config) (string, error) {
-	// Check if vault1984-pop exists in this region
-	descOut, err := client.DescribeSecurityGroups(ctx, &ec2.DescribeSecurityGroupsInput{
-		Filters: []ec2types.Filter{{
-			Name:   strPtr("group-name"),
-			Values: []string{"vault1984-pop"},
-		}},
-	})
-	if err == nil && len(descOut.SecurityGroups) > 0 {
-		return *descOut.SecurityGroups[0].GroupId, nil
+	// Check if clavitor-pop exists in this region (also check old vault1984-pop name for backward compat)
+	for _, name := range []string{"clavitor-pop", "vault1984-pop"} {
+		descOut, err := client.DescribeSecurityGroups(ctx, &ec2.DescribeSecurityGroupsInput{
+			Filters: []ec2types.Filter{{
+				Name:   strPtr("group-name"),
+				Values: []string{name},
+			}},
+		})
+		if err == nil && len(descOut.SecurityGroups) > 0 {
+			return *descOut.SecurityGroups[0].GroupId, nil
+		}
 	}
 
 	// Create it
-	log(cfg, "  [%s] creating security group vault1984-pop in %s...", city, region)
+	log(cfg, "  [%s] creating security group clavitor-pop in %s...", city, region)
 	createOut, err := client.CreateSecurityGroup(ctx, &ec2.CreateSecurityGroupInput{
-		GroupName:   strPtr("vault1984-pop"),
+		GroupName:   strPtr("clavitor-pop"),
 		Description: strPtr("Clavitor POP - port 1984 only"),
 	})
 	if err != nil {