Kill rsync (#5336)

automerge

net/gce.sh

@@ -128,8 +128,8 @@ Manage testnet instances
                               DNS name (useful only when the -a and -P options
                               are also provided)
    --fullnode-additional-disk-size-gb [number]
-                    - Add an additional [number] GB SSD to all fullnodes to store the config-local directory.
-                      If not set, config-local will be written to the boot disk by default.
+                    - Add an additional [number] GB SSD to all fullnodes to store the config directory.
+                      If not set, config will be written to the boot disk by default.
                       Only supported on GCE.
  config-specific options:
    -P               - Use public network IP addresses (default: $publicNetwork)

net/remote/remote-deploy-update.sh

@@ -35,5 +35,5 @@ PATH="$HOME"/.cargo/bin:"$PATH"
 
 set -x
 scripts/solana-install-deploy.sh \
-  --keypair config-local/mint-keypair.json \
+  --keypair config/mint-keypair.json \
   localhost "$releaseChannel" "$updatePlatform"

net/remote/remote-node.sh

@@ -83,12 +83,6 @@ local|tar|skip)
   PATH="$HOME"/.cargo/bin:"$PATH"
   export USE_INSTALL=1
 
-  # Setup `/var/snap/solana/current` symlink so rsyncing the genesis
-  # ledger works (reference: `net/scripts/install-rsync.sh`)
-  sudo rm -rf /var/snap/solana/current
-  sudo mkdir -p /var/snap/solana
-  sudo ln -sT /home/solana/solana /var/snap/solana/current
-
   ./fetch-perf-libs.sh
   # shellcheck source=/dev/null
   source ./target/perf-libs/env.sh
@@ -233,7 +227,7 @@ local|tar|skip)
       # with it on the blockstreamer node.  Typically the blockstreamer node has
       # a static IP/DNS name for hosting the blockexplorer web app, and is
       # a location that somebody would expect to be able to airdrop from
-      scp "$entrypointIp":~/solana/config-local/mint-keypair.json config-local/
+      scp "$entrypointIp":~/solana/config/mint-keypair.json config/
       if [[ $airdropsEnabled = true ]]; then
         ./multinode-demo/drone.sh > drone.log 2>&1 &
       fi

net/remote/remote-sanity.sh

@@ -82,8 +82,8 @@ local|tar|skip)
   solana_keygen=solana-keygen
   solana_ledger_tool=solana-ledger-tool
 
-  ledger=config-local/bootstrap-leader-ledger
-  client_id=config-local/client-id.json
+  ledger=config/bootstrap-leader/ledger
+  client_id=config/client-id.json
   ;;
 *)
   echo "Unknown deployment method: $deployMethod"

net/scripts/ec2-security-group-config.json

@@ -57,25 +57,6 @@
                 }
             ]
         },
-        {
-            "PrefixListIds": [],
-            "FromPort": 873,
-            "IpRanges": [
-                {
-                    "Description": "rsync",
-                    "CidrIp": "0.0.0.0/0"
-                }
-            ],
-            "ToPort": 873,
-            "IpProtocol": "tcp",
-            "UserIdGroupPairs": [],
-            "Ipv6Ranges": [
-                {
-                    "CidrIpv6": "::/0",
-                    "Description": "rsync"
-                }
-            ]
-        },
         {
             "PrefixListIds": [],
             "FromPort": 3001,

net/scripts/install-rsync.sh

@@ -8,13 +8,3 @@ set -ex
 [[ $USER = root ]] || exit 1
 
 apt-get --assume-yes install rsync
-cat > /etc/rsyncd.conf <<-EOF
-[config]
-path = /var/snap/solana/current/config
-hosts allow = *
-read only = true
-EOF
-
-systemctl enable rsync
-systemctl start rsync
-