authoravatarclover caruso<git@paperclover.net>2026-10-19 17:25:21-07:00
committeravatarclover caruso<git@paperclover.net>2026-10-21 02:52:29-07:00
log9980b1fb6b031ee32f458b5f17b8fc33b536c1cf
tree7a4652ab9145514e69973c36db9f9e503eda3ca6
parentb2655181e9b34cb6018cb3105a88bf703cfdfd15
signature Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

Update Shale to r1824 and preserve its public clone URLs


3 files changed, 4 insertions(+), 3 deletions(-)

service/shale/service.pkl+1-1
...@@ -18,7 +18,7 @@ prepare = "prepare.py"...@@ -18,7 +18,7 @@ prepare = "prepare.py"
1818
19container {19container {
20 memory = 409620 memory = 4096
21 image = "docker.io/astheno/shale@sha256:4aa7db75ab5e47e9fef68bc88357e2fef014c8cfd8a6fb7e14203f23e8aa80de"21 image = "docker.io/astheno/shale@sha256:3b46dbd32567b5008af96f75ca0e15dea4e728305902f69ed69c4c036d57fab1"
2222
23 http {23 http {
24 containerPort = 800024 containerPort = 8000
tools/router-shale-gateway-test.py+2-1
...@@ -40,9 +40,10 @@ class GatewayAssociation(unittest.TestCase):...@@ -40,9 +40,10 @@ class GatewayAssociation(unittest.TestCase):
40 return {'http': {'Status': 'success'}}40 return {'http': {'Status': 'success'}}
4141
42 environment = {'SNOWGLOBE_DOMAIN': 'paperclover.net', 'SNOWGLOBE_DASHBOARD_PORT': '4444',42 environment = {'SNOWGLOBE_DOMAIN': 'paperclover.net', 'SNOWGLOBE_DASHBOARD_PORT': '4444',
43 'SNOWGLOBE_PROXY_TOKEN_FILE': str(proof), 'SNOWGLOBE_STATE': temporary}43 'SNOWGLOBE_INTERNAL_PORT': '8448', 'SNOWGLOBE_PROXY_TOKEN_FILE': str(proof), 'SNOWGLOBE_STATE': temporary}
44 with patch.dict(os.environ, environment, clear=True), patch.object(router, 'nomad', nomad), patch.object(router, 'ROUTE_DIR', str(root / 'routes')):44 with patch.dict(os.environ, environment, clear=True), patch.object(router, 'nomad', nomad), patch.object(router, 'ROUTE_DIR', str(root / 'routes')):
45 rendered = router.render('fixture')45 rendered = router.render('fixture')
46 self.assertIn('header_up X-Forwarded-Host ' + shale + '.paperclover.net', rendered)
46 dashboard_route = rendered.split(dashboard + '.paperclover.net {', 1)[1].split('\n}\n', 1)[0]47 dashboard_route = rendered.split(dashboard + '.paperclover.net {', 1)[1].split('\n}\n', 1)[0]
47 self.assertIn('request_header Snowglobe-Proxy-Token ' + 'b' * 64, dashboard_route)48 self.assertIn('request_header Snowglobe-Proxy-Token ' + 'b' * 64, dashboard_route)
48 shale_route = rendered.split(shale + '.paperclover.net {', 1)[1].split('\n}\n', 1)[0]49 shale_route = rendered.split(shale + '.paperclover.net {', 1)[1].split('\n}\n', 1)[0]
tools/router.py+1-1
...@@ -34,7 +34,7 @@ def proxy(upstreams, indent, uncompressed=False, host=None):...@@ -34,7 +34,7 @@ def proxy(upstreams, indent, uncompressed=False, host=None):
34 if uncompressed:34 if uncompressed:
35 lines.append(f"{indent} header_up Accept-Encoding identity")35 lines.append(f"{indent} header_up Accept-Encoding identity")
36 if host:36 if host:
37 lines.append(f"{indent} header_up Host {host}")37 lines += [f"{indent} header_up Host {host}", f"{indent} header_up X-Forwarded-Host {host}"]
38 return [*lines, f"{indent}}}"]38 return [*lines, f"{indent}}}"]
3939
4040