From 24fdc4d28ad4377c56e6a966c7cf2c1811ca2724 Mon Sep 17 00:00:00 2001 From: Diego Ripley Date: Thu, 12 Feb 2026 16:33:54 -0500 Subject: [PATCH] Update infrastructure. Still need to put costs for rsync.net and Maptiler Pro --- content/docs/getting_started/_index.md | 31 ---------- content/infrastructure/_index.md | 80 +++++++++----------------- 2 files changed, 28 insertions(+), 83 deletions(-) delete mode 100644 content/docs/getting_started/_index.md diff --git a/content/docs/getting_started/_index.md b/content/docs/getting_started/_index.md deleted file mode 100644 index 7883081..0000000 --- a/content/docs/getting_started/_index.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -title: 🚀 Getting Started -weight: 1 -next: /docs/gettings_started/file_naming_convention/ -sidebar: - open: true ---- - -Look through our [GitHub Organization](https://github.com/orgs/dataforcanada/repositories) to see ongoing work being done in this project. - -## Start Here - -{{< cards cols="2" >}} - {{< card link="/docs/getting_started/file_naming_convention/" title="File Naming Convention" icon="cog" >}} - {{< card link="/docs/dissemination/" title="Data Dissemination Strategy" icon="globe" >}} - {{< card link="/docs/processes/" title="Processes" icon="cube" >}} - {{< card link="/infrastructure/" title="Infrastructure" icon="office-building" >}} -{{< /cards >}} - -## Our Data - -{{< cards cols="3" >}} - {{< card link="https://data-01.labs.dataforcanada.org/processed/" title="Data in The Lab" icon="cloud-download" >}} - {{< card link="https://data-01.dataforcanada.org/processed/" title="Production Data" icon="check-circle" >}} -{{< /cards >}} - -{{< cards cols="1" >}} - {{< card link="https://source.coop/dataforcanada/" title="Source Cooperative Mirror" icon="beaker" >}} - {{< card link="https://zenodo.org/communities/dataforcanada/records/" title="Zenodo Mirror" icon="academic-cap" >}} - {{< card link="https://archive.org/details/@diegoripley/uploads/" title="Internet Archive Mirror" icon="library" >}} -{{< /cards >}} diff --git a/content/infrastructure/_index.md b/content/infrastructure/_index.md index 8d329aa..0d96e02 100644 --- a/content/infrastructure/_index.md +++ b/content/infrastructure/_index.md @@ -72,10 +72,20 @@ sidebar: location: 'Toronto, Ontario, Canada', coords: [-79.38, 43.65], specs: '50Gbps / 50Gbps, 950GB Flash Storage', - protocol: 'P2P', + protocol: 'P2P, SSH', jurisdiction: 'Singapore', color: '#9966CC' }, + { + id: 'geo-services-01', + name: 'Geo Services 01', + location: 'Tottenham, Ontario, Canada', + coords: [-77, 45], + specs: '2.5GBps / 200MBit, 60TB HDD Storage, 14TB Flash Storage', + protocol: 'All', + jurisdiction: 'Canada', + color: '#EA2839' + }, { id: 'vancouver', name: 'Internet Archive Mirror', @@ -120,17 +130,27 @@ sidebar: location: 'Manassas, Virginia, USA', coords: [-77.48, 38.75], specs: '2.5Gbps / 2.5Gbps, 512GB Flash Storage', - protocol: 'HTTP & P2P', + protocol: 'All', jurisdiction: 'Germany', color: '#FFCC00' }, + { + id: 'backup-node-01', + name: 'Backup Node 01', + location: 'Fremont, California, USA', + specs: '10Gbps / 10Gbps, 2TB Storage', + coords: [-121, 40], + protocol: 'SSH, Multi', + jurisdiction: 'USA', + color: '#002147' + }, { id: 'smart-node-02', name: 'Smart Node 02', location: 'Amsterdam, Netherlands', coords: [4.90, 52.37], specs: '50Gbps / 50Gbps, 950GB Flash Storage', - protocol: 'P2P', + protocol: 'P2P, SSH', jurisdiction: 'Singapore', color: '#9966CC' }, @@ -140,7 +160,7 @@ sidebar: location: 'Amsterdam, Netherlands', coords: [4.90, 52.37], specs: '50Gbps / 50Gbps, 6TB HDD Storage', - protocol: 'P2P', + protocol: 'P2P, SSH', jurisdiction: 'Singapore', color: '#9966CC' }, @@ -152,7 +172,7 @@ sidebar: specs: 'Replicated in Budapest', protocol: 'HTTP', jurisdiction: 'Switzerland', - color: '#D52B1E' + color: '#FFFFFF' }, { id: 'budapest', @@ -161,38 +181,10 @@ sidebar: coords: [19.04, 47.50], protocol: 'HTTP', jurisdiction: 'Switzerland', - color: '#D52B1E' + color: '#FFFFFF' } ]; - // Connections between nodes - const connections = [ - { source: 'smart-node-01', target: 'smart-node-02', color: '#9966CC' }, - { source: 'smart-node-01', target: 'smart-node-03', color: '#9966CC' }, - { source: 'san-francisco', target: 'vancouver', color: '#999' }, - { source: 'geneva', target: 'budapest', color: '#D52B1E' }, - { source: 'smart-node-01', target: 'source-cooperative-oregon', color: '#9966CC' }, - { source: 'smart-node-01', target: 'r2', color: '#9966CC' }, - { source: 'smart-node-01', target: 'geneva', color: '#9966CC' }, - { source: 'smart-node-01', target: 'san-francisco', color: '#9966CC' }, - { source: 'smart-node-01', target: 'vps-01', color: '#9966CC' }, - { source: 'smart-node-02', target: 'source-cooperative-oregon', color: '#9966CC' }, - { source: 'smart-node-02', target: 'r2', color: '#9966CC' }, - { source: 'smart-node-02', target: 'geneva', color: '#9966CC' }, - { source: 'smart-node-02', target: 'san-francisco', color: '#9966CC' }, - { source: 'smart-node-02', target: 'vps-01', color: '#9966CC' }, - { source: 'smart-node-03', target: 'source-cooperative-oregon', color: '#9966CC' }, - { source: 'smart-node-03', target: 'r2', color: '#9966CC' }, - { source: 'smart-node-03', target: 'geneva', color: '#9966CC' }, - { source: 'smart-node-03', target: 'san-francisco', color: '#9966CC' }, - { source: 'smart-node-03', target: 'vps-01', color: '#9966CC' }, - { source: 'vps-01', target: 'smart-node-02', color: '#FFCC00' }, - { source: 'vps-01', target: 'smart-node-03', color: '#FFCC00' }, - { source: 'vps-01', target: 'r2', color: '#FFCC00' }, - { source: 'vps-01', target: 'san-francisco', color: '#FFCC00' }, - { source: 'vps-01', target: 'source-cooperative-oregon', color: '#FFCC00' }, - { source: 'vps-01', target: 'geneva', color: '#FFCC00' } - ]; const width = 960; const height = 600; @@ -202,7 +194,8 @@ sidebar: .attr('height', height); const projection = d3.geoNaturalEarth1() - .scale(180) + .scale(355) + .center([-30, 50]) .translate([width / 2, height / 2]); const path = d3.geoPath().projection(projection); @@ -279,23 +272,6 @@ sidebar: .attr('class', 'land') .attr('d', path); - // Draw connections - const connectionGroup = g.append('g'); - connections.forEach(conn => { - const source = nodes.find(n => n.id === conn.source); - const target = nodes.find(n => n.id === conn.target); - if (source && target) { - connectionGroup.append('path') - .datum({ - type: 'LineString', - coordinates: [source.coords, target.coords] - }) - .attr('class', 'connection') - .attr('d', path) - .attr('stroke', conn.color); - } - }); - // Draw nodes with offsets for overlapping positions const nodeGroup = g.append('g');