From 2a624305964542f9f807ba2a79365fa9b5a74b26 Mon Sep 17 00:00:00 2001 From: netkas Date: Thu, 9 Jan 2025 15:06:29 -0500 Subject: [PATCH] Update DNS mock data and add key files for Coffee and Teapot --- .env | 4 ++-- docker-compose.test.yml | 8 ++++---- docker_test_keys/coffee.json | 20 ++++++++++++++++++++ docker_test_keys/coffee.txt | 1 + docker_test_keys/teapot.json | 20 ++++++++++++++++++++ docker_test_keys/teapot.txt | 1 + entrypoint.sh | 1 - 7 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 docker_test_keys/coffee.json create mode 100644 docker_test_keys/coffee.txt create mode 100644 docker_test_keys/teapot.json create mode 100644 docker_test_keys/teapot.txt diff --git a/.env b/.env index 903fd2e..94b5d60 100644 --- a/.env +++ b/.env @@ -29,8 +29,8 @@ REDIS_PASSWORD=root SB_COFFEE_NAME=coffee SB_COFFEE_DOMAIN=coffee.com SB_COFFEE_RPC_ENDPOINT=http://127.0.0.0:8086/ -SB_INSTANCE_DNS_MOCK_COFFEE="coffee.com " +SB_INSTANCE_DNS_MOCK_COFFEE="coffee.com v=socialbox;sb-rpc=http://127.0.0.0:8086/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0" SB_TEAPOT_DOMAIN=teapot.com SB_TEAPOT_RPC_ENDPOINT=http://127.0.0.0:8087/ -SB_INSTANCE_DNS_MOCK_TEAPOT="teapot.com " \ No newline at end of file +SB_INSTANCE_DNS_MOCK_TEAPOT="teapot.com v=socialbox;sb-rpc=http://127.0.0.0:8087/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0" \ No newline at end of file diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 955d552..b8d5fa2 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -59,8 +59,8 @@ services: # Usage: SB_INSTANCE_DNS_MOCK_: # Environment Variable name is ignored, only the value is used with the prefix being used to detect # the instance name and the suffix being used to detect the TXT record - SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com "} - SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com "} + SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com v=socialbox;sb-rpc=http://127.0.0.0:8086/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0"} + SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com v=socialbox;sb-rpc=http://127.0.0.0:8087/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0"} healthcheck: test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://127.0.0.0:8086/}"] interval: 30s @@ -162,8 +162,8 @@ services: # Usage: SB_INSTANCE_DNS_MOCK_: # Environment Variable name is ignored, only the value is used with the prefix being used to detect # the instance name and the suffix being used to detect the TXT record - SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com "} - SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com "} + SB_INSTANCE_DNS_MOCK_COFFEE: ${SB_INSTANCE_DNS_MOCK_COFFEE:-"coffee.com v=socialbox;sb-rpc=http://127.0.0.0:8086/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0"} + SB_INSTANCE_DNS_MOCK_TEAPOT: ${SB_INSTANCE_DNS_MOCK_TEAPOT:-"teapot.com v=socialbox;sb-rpc=http://127.0.0.0:8087/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0"} healthcheck: test: ["CMD", "curl", "-f", "-H", "Request-Type: ping", "${SB_INSTANCE_RPC_ENDPOINT-http://127.0.0.0:8087/}"] interval: 30s diff --git a/docker_test_keys/coffee.json b/docker_test_keys/coffee.json new file mode 100644 index 0000000..c0371f8 --- /dev/null +++ b/docker_test_keys/coffee.json @@ -0,0 +1,20 @@ +{ + "host_keypair_expires": 0, + "host_public_key": "sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc", + "host_private_key": "sig:tTVe59Ko5XuwgS8PneR92FAOqbgSHTKYn8U-lQRB9KODn0J_yPXCZCZGDUyS95hul2Jn7X7-EVT15FEmZADCZw", + "internal_encryption_keys": [ + "c2cpdTkYqIWI93cJPpAuCsoQJcHi9l37lYHA2TpUo9A", + "XUuWyWcKmtCUNVZ7Y0ZDbCE72klHZIniRihIIo78Vbs", + "SGg4GM_0-hO95Q6hBq2UjzGrp9mhVHyklNTHo-OZSNw", + "43WrkV6rDyc04S41E4uwJ1nQFhlll_CflsPW_hMOiqE", + "QDh9KecIdU-6be5ScPagL_WrWp8hQAersLQvLv9YtNQ", + "z4SnLU9Xw9F3yjPH_TmV4HuvZrpaVE0bqxzUGHyXQ-k", + "vg7lWOzkL_59u3o2RKcdrdwc7KVh07NrZRQzBPoJXEU", + "UW6X3XGGLj_e8xYd1bUwX9KYPTczHFtYTmy4FfiqfG0", + "sh-sRIQ3lWgkqR87wcTtZkDrgDKY2FOLuzdtpAvi9Wg", + "SDweTV1kNH0s5Ah1pwbfDo3ThAXAVKo9qJ4V9-hsHIs" + ], + "encryption_keys_count": 10, + "encryption_keys_algorithm": "xchacha20", + "transport_encryption_algorithm": "chacha20" +} \ No newline at end of file diff --git a/docker_test_keys/coffee.txt b/docker_test_keys/coffee.txt new file mode 100644 index 0000000..ae0e32a --- /dev/null +++ b/docker_test_keys/coffee.txt @@ -0,0 +1 @@ +v=socialbox;sb-rpc=http://127.0.0.0:8086/;sb-key=sig:g59Cf8j1wmQmRg1MkveYbpdiZ-1-_hFU9eRRJmQAwmc;sb-exp=0 \ No newline at end of file diff --git a/docker_test_keys/teapot.json b/docker_test_keys/teapot.json new file mode 100644 index 0000000..8b69e65 --- /dev/null +++ b/docker_test_keys/teapot.json @@ -0,0 +1,20 @@ +{ + "host_keypair_expires": 0, + "host_public_key": "sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY", + "host_private_key": "sig:kPfGxpsnisJIp5pKuD1AI7-T1bLk1S-EGOr7jBq5AO4wNdS6uKkCj8gC_4RlMSgWGkh2GxfF8ws26dKdDPFiJg", + "internal_encryption_keys": [ + "ql5xP8OmKbSm_Fj4uz28aJ2Dpxdpg994Ker9Yp6eWVc", + "1mbn_MrV_XlPG7bqTrLXHd8H9bBUN27Rm-oIZmldOYQ", + "PL5YB2_C3I3gZAzrA2AP37tZKPsM5BQg0RH7LAgREGs", + "VEU4sF9v3AzDKEBLEJCbhirERouNdvMjGBoLLn0A9M4", + "5HeBwyDdUh8rbF5EKM9rQ0uU8PyzMIljoGKnn9CPk1U", + "YOGrfjs2dYnf7OL6FLhCMmfig-xCHNjGF7Gny7DisEQ", + "N-ouk7GBRqn1wLXtJ7BCcE5kPh4X0kgHuKzgOJ6i3Oo", + "bTo0YnNOVB4XtqiFpSx9kRaufDRDoYt6or-MRodngWQ", + "HTAvX3Nnf61-UOFQYcJOqfGcJVps_EOxo7KUf5Z0Zk0", + "UelTVnfWENEZEt6a7j5jxWq_pXWZ4X9pF8lOrdb6PKc" + ], + "encryption_keys_count": 10, + "encryption_keys_algorithm": "xchacha20", + "transport_encryption_algorithm": "chacha20" +} \ No newline at end of file diff --git a/docker_test_keys/teapot.txt b/docker_test_keys/teapot.txt new file mode 100644 index 0000000..c3ea413 --- /dev/null +++ b/docker_test_keys/teapot.txt @@ -0,0 +1 @@ +v=socialbox;sb-rpc=http://127.0.0.0:8087/;sb-key=sig:MDXUuripAo_IAv-EZTEoFhpIdhsXxfMLNunSnQzxYiY;sb-exp=0 \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index 22a954b..6eaf44b 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -19,5 +19,4 @@ echo "Initializing Socialbox..." /usr/bin/socialbox init --log-level=${LOG_LEVEL-INFO} # Run supervisord, final command -echo "Starting supervisord..." /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf \ No newline at end of file