diff --git a/.buildkite/env/secrets.ejson b/.buildkite/env/secrets.ejson index 580c5555d7..aca13e1f2d 100644 --- a/.buildkite/env/secrets.ejson +++ b/.buildkite/env/secrets.ejson @@ -4,7 +4,6 @@ "environment": { "CODECOV_TOKEN": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:3K68mE38LJ2RB98VWmjuNLFBNn1XTGR4:cR4r05/TOZQKmEZp1v4CSgUJtC6QJiOaL85QjXW0qZ061fMnsBA8AtAPMDoDq4WCGOZM1A==]", "CRATES_IO_TOKEN": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:GGRTYDjMXksevzR6kq4Jx+FaIQZz50RU:xkbwDxcgoCyU+aT2tiI9mymigrEl6YiOr3axe3aX70ELIBKbCdPGilXP/wixvKi94g2u]", - "GEOLOCATION_API_KEY": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:U2PZLi5MU3Ru/zK1SilianEeizcMvxml:AJKf2OAtDHmJh0KyXrBnNnistItZvVVP3cZ7ZLtrVupjmWN/PzmKwSsXeCNObWS+]", "GITHUB_TOKEN": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:0NJNlpD/O19mvOakCGBYDhIDfySxWFSC:Dz4NXv9x6ncRQ1u9sVoWOcqmkg0sI09qmefghB0GXZgPcFGgn6T0mw7ynNnbUvjyH8dLruKHauk=]", "INFLUX_DATABASE": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:SzwHIeOVpmbTcGQOGngoFgYumsLZJUGq:t7Rpk49njsWvoM+ztv5Uwuiz]", "INFLUX_PASSWORD": "EJ[1:Z7OneT3RdJJ0DipCHQ7rC84snQ+FPbgHwZADQiz54wk=:/MUs+q7pdGrUjzwcq+6pgIFxur4hxdqu:am22z2E2dtmw1f1J1Mq5JLcUHZsrEjQAJ0pp21M4AZeJbNO6bVb44d9zSkHj7xdN6U+GNlCk+wU=]", diff --git a/net/net.sh b/net/net.sh index 21193f1048..524cd7c2f9 100755 --- a/net/net.sh +++ b/net/net.sh @@ -282,7 +282,6 @@ startBootstrapLeader() { \"$genesisOptions\" \ \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \ \"$gpuMode\" \ - \"$GEOLOCATION_API_KEY\" \ \"$maybeWarpSlot\" \ \"$waitForNodeInit\" \ " @@ -353,7 +352,6 @@ startNode() { \"$genesisOptions\" \ \"$maybeNoSnapshot $maybeSkipLedgerVerify $maybeLimitLedgerSize $maybeWaitForSupermajority\" \ \"$gpuMode\" \ - \"$GEOLOCATION_API_KEY\" \ \"$maybeWarpSlot\" \ \"$waitForNodeInit\" \ " diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh index 17407341bc..825690d596 100755 --- a/net/remote/remote-node.sh +++ b/net/remote/remote-node.sh @@ -25,9 +25,8 @@ benchExchangeExtraArgs="${16}" genesisOptions="${17}" extraNodeArgs="${18}" gpuMode="${19:-auto}" -GEOLOCATION_API_KEY="${20}" -maybeWarpSlot="${21}" -waitForNodeInit="${22}" +maybeWarpSlot="${20}" +waitForNodeInit="${21}" set +x missing() { @@ -319,41 +318,6 @@ EOF sudo install -o $UID -m 400 /.cert.pem /.key.pem . ls -l .cert.pem .key.pem fi - - cat > ~/solana/restart-explorer < blockexplorer.log 2>&1 & - echo \$! > blockexplorer.pid - - # Redirect port 80 to port 5000 - sudo iptables -A INPUT -p tcp --dport 80 -j ACCEPT - sudo iptables -A INPUT -p tcp --dport 5000 -j ACCEPT - sudo iptables -A PREROUTING -t nat -p tcp --dport 80 -j REDIRECT --to-port 5000 - - # Confirm the explorer is accessible - curl --head --retry 3 --retry-connrefused http://localhost:5000/ - - # Confirm the explorer is now globally accessible - curl --head "\$(curl ifconfig.io)" -EOF - chmod +x ~/solana/restart-explorer - -cat >> ~/solana/on-reboot <