Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .defaults.env
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ SHORTLINK_DOMAIN="hub.link"

# The Reticulum backend to connect to. Used for storing information about active hubs.
# See here for the server code: https://github.com/Hubs-Foundation/reticulum
RETICULUM_SERVER="dev.reticulum.io"
RETICULUM_SERVER="dev.reticulum.io.invalid"

# CORS proxy.
CORS_PROXY_SERVER="hubs-proxy.com"

# The thumbnailing backend to connect to.
# See here for the server code: https://github.com/Hubs-Foundation/farspark or https://github.com/Hubs-Foundation/nearspark
THUMBNAIL_SERVER="nearspark-dev.reticulum.io"
THUMBNAIL_SERVER="nearspark-dev.reticulum.io.invalid"

# The root URL under which Hubs expects environment GLTF bundles to be served.
ASSET_BUNDLE_SERVER="https://asset-bundles-prod.reticulum.io"
ASSET_BUNDLE_SERVER="https://asset-bundles-prod.reticulum.io.invalid"

# Comma-separated list of domains which are known to not need CORS proxying
NON_CORS_PROXY_DOMAINS="hubs.local,hubs-proxy.local,dev.reticulum.io,hubs-upload-cdn.com"
NON_CORS_PROXY_DOMAINS="hubs.local,hubs-proxy.local,dev.reticulum.io.invalid,hubs-upload-cdn.com"

# The root URL under which Hubs expects static assets to be served.
BASE_ASSETS_PATH=/
Expand Down
2 changes: 1 addition & 1 deletion admin/.defaults.env
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ITA_SERVER="http://hubs.local:3333"

# The Reticulum backend to connect to. Used for storing information about active hubs.
# See here for the server code: https://github.com/Hubs-Foundation/reticulum
RETICULUM_SERVER="dev.reticulum.io"
RETICULUM_SERVER="dev.reticulum.io.invalid"

# PostgREST server configured to allow administrative access to the db.
POSTGREST_SERVER="https://hubs.local:3000"
2 changes: 1 addition & 1 deletion admin/src/react-components/avatar-listings.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const AvatarListingList = props => (
<OwnedFileImage
source="thumbnail_owned_file_id"
aspect="tall"
defaultImage="https://asset-bundles-prod.reticulum.io/bots/avatar_unavailable.png"
defaultImage="https://asset-bundles-prod.reticulum.io.invalid/bots/avatar_unavailable.png"
/>
<TextField source="name" />
<TextField source="order" />
Expand Down
4 changes: 2 additions & 2 deletions admin/src/react-components/avatars.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const AvatarList = props => (
<OwnedFileImage
source="thumbnail_owned_file_id"
aspect="tall"
defaultImage="https://asset-bundles-prod.reticulum.io/bots/avatar_unavailable.png"
defaultImage="https://asset-bundles-prod.reticulum.io.invalid/bots/avatar_unavailable.png"
/>
</ConditionalReferenceField>
<ConditionalReferenceField label="live preview" reference="avatar_listings" source="avatar_listing_id">
Expand All @@ -92,7 +92,7 @@ export const AvatarList = props => (
label="thumbnail"
source="thumbnail_owned_file_id"
aspect="tall"
defaultImage="https://asset-bundles-prod.reticulum.io/bots/avatar_unavailable.png"
defaultImage="https://asset-bundles-prod.reticulum.io.invalid/bots/avatar_unavailable.png"
/>
<Preview label="preview" />
<TextField source="name" />
Expand Down
2 changes: 1 addition & 1 deletion admin/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ module.exports = (env, argv) => {
HOST: "hubs.local",
RETICULUM_SOCKET_SERVER: "hubs.local",
CORS_PROXY_SERVER: "hubs-proxy.local:4000",
NON_CORS_PROXY_DOMAINS: "hubs.local,dev.reticulum.io",
NON_CORS_PROXY_DOMAINS: "hubs.local,dev.reticulum.io.invalid",
BASE_ASSETS_PATH: "https://hubs.local:8989/",
RETICULUM_SERVER: "hubs.local:4000",
POSTGREST_SERVER: "",
Expand Down
8 changes: 4 additions & 4 deletions habitat/default.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[general]
shortlink_domain = "hub.link"
reticulum_server = "dev.reticulum.io"
cors_proxy_server = "cors-proxy-dev.reticulum.io"
thumbnail_server = "nearspark-dev.reticulum.io"
non_cors_proxy_domains = "hubs.local,dev.reticulum.io"
reticulum_server = "dev.reticulum.io.invalid"
cors_proxy_server = "cors-proxy-dev.reticulum.io.invalid"
thumbnail_server = "nearspark-dev.reticulum.io.invalid"
non_cors_proxy_domains = "hubs.local,dev.reticulum.io.invalid"
postgrest_server = "https://hubs.local:3000"
ita_server = ""
base_assets_path = "/"
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/run.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#cheatsheet
#if [ -z ${var1+x} ]; then echo "is unset"; else echo " is set to '$var1'"; fi
if [ -z ${turkeyCfg_thumbnail_server+x} ]; then export turkeyCfg_thumbnail_server="nearspark.reticulum.io"; fi
if [ -z ${turkeyCfg_thumbnail_server+x} ]; then export turkeyCfg_thumbnail_server="nearspark.reticulum.io.invalid"; fi
if [ -z ${turkeyCfg_base_assets_path+x} ]; then export turkeyCfg_base_assets_path="https://$SUB_DOMAIN-assets.$DOMAIN/hubs/"; fi
if [ -z ${turkeyCfg_non_cors_proxy_domains+x} ]; then export turkeyCfg_non_cors_proxy_domains="$SUB_DOMAIN.$DOMAIN,$SUB_DOMAIN-assets.$DOMAIN"; fi
if [ -z ${turkeyCfg_reticulum_server+x} ]; then export turkeyCfg_reticulum_server="$SUB_DOMAIN.$DOMAIN"; fi
Expand Down
4 changes: 2 additions & 2 deletions scripts/hab-wrap-and-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ EOF
bio pkg build -k hubsfoundation .

### upload
echo "### upload hab pkg to bldr.reticulum.io"
export HAB_BLDR_URL="https://bldr.reticulum.io"
echo "### upload hab pkg to bldr.reticulum.io.invalid"
export HAB_BLDR_URL="https://bldr.reticulum.io.invalid"
export HAB_AUTH_TOKEN=$BLDR_RET_TOKEN
echo $BLDR_RET_PUB_B64 | base64 -d > /hab/cache/keys/hubsfoundation-20190117233449.pub
hart="/hab/cache/artifacts/hubsfoundation-hubs*.hart"
Expand Down
8 changes: 4 additions & 4 deletions src/react-components/room/MediaBrowser.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ const avatarListing = {
attributions: { creator: "" },
description: null,
gltfs: {
avatar: "https://dev.reticulum.io/api/v1/avatars/yUXsaby/avatar.gltf?v=63734422084",
base: "https://dev.reticulum.io/api/v1/avatars/yUXsaby/base.gltf?v=63734422084"
avatar: "https://dev.reticulum.io.invalid/api/v1/avatars/yUXsaby/avatar.gltf?v=63734422084",
base: "https://dev.reticulum.io.invalid/api/v1/avatars/yUXsaby/base.gltf?v=63734422084"
},
id: "123",
images: {
Expand All @@ -195,8 +195,8 @@ const avatar = {
attributions: null,
description: null,
gltfs: {
avatar: "https://dev.reticulum.io/api/v1/avatars/XUbGngS/avatar.gltf?v=63773070094",
base: "https://dev.reticulum.io/api/v1/avatars/XUbGngS/base.gltf?v=63773070094"
avatar: "https://dev.reticulum.io.invalid/api/v1/avatars/XUbGngS/avatar.gltf?v=63773070094",
base: "https://dev.reticulum.io.invalid/api/v1/avatars/XUbGngS/base.gltf?v=63773070094"
},
id: "123",
images: {
Expand Down
2 changes: 1 addition & 1 deletion src/systems/bit-media-frames.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// https://dev.reticulum.io/scenes/7vGnzkM/outdoor-meetup
// https://dev.reticulum.io.invalid/scenes/7vGnzkM/outdoor-meetup
// A scene with media-frames

import {
Expand Down
8 changes: 4 additions & 4 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ async function fetchAppConfigAndEnvironmentVars() {
appConfig.theme.themes = JSON.parse(appConfig.theme.themes);
}

// dev.reticulum.io doesn't run ita
if (host === "dev.reticulum.io") {
// dev.reticulum.io.invalid doesn't run ita
if (host === "dev.reticulum.io.invalid") {
return appConfig;
}

Expand Down Expand Up @@ -239,7 +239,7 @@ module.exports = async (env, argv) => {
if (env.loadAppConfig || process.env.LOAD_APP_CONFIG) {
if (!env.localDev) {
// Load and set the app config and environment variables from the remote server.
// A Hubs Cloud server or dev.reticulum.io can be used.
// A Hubs Cloud server or dev.reticulum.io.invalid can be used.
appConfig = await fetchAppConfigAndEnvironmentVars();
}
} else {
Expand All @@ -256,7 +256,7 @@ module.exports = async (env, argv) => {
HOST: localDevHost,
RETICULUM_SOCKET_SERVER: localDevHost,
CORS_PROXY_SERVER: "hubs-proxy.local:4000",
NON_CORS_PROXY_DOMAINS: `${localDevHost},dev.reticulum.io`,
NON_CORS_PROXY_DOMAINS: `${localDevHost},dev.reticulum.io.invalid`,
BASE_ASSETS_PATH: `https://${localDevHost}:8080/`,
RETICULUM_SERVER: `${localDevHost}:4000`,
POSTGREST_SERVER: "",
Expand Down