Page MenuHomePhabricator
Files F3362194

D9398.diff
No OneTemporary
Actions

D9398.diff
View Options

diff --git a/keyserver/src/database/migration-config.js b/keyserver/src/database/migration-config.js
--- a/keyserver/src/database/migration-config.js
+++ b/keyserver/src/database/migration-config.js
@@ -627,6 +627,13 @@
writeJSONToFile(defaultCorsConfig, 'facts/webapp_cors.json');
},
],
+ [
+ 50,
+ async () => {
+ moveToNonApacheConfig('facts/webapp_url.json', '/webapp/');
+ moveToNonApacheConfig('facts/keyserver_url.json', '/keyserver/');
+ },
+ ],
]);
const newDatabaseVersion: number = Math.max(...migrations.keys());
diff --git a/scripts/create_url_facts.sh b/scripts/create_url_facts.sh
--- a/scripts/create_url_facts.sh
+++ b/scripts/create_url_facts.sh
@@ -5,25 +5,25 @@
SCRIPT_DIR=$(cd "$(dirname "$0")" || true; pwd -P)
ROOT_DIR="${SCRIPT_DIR}/.."
KEYSERVER_FACTS_DIR="${ROOT_DIR}/keyserver/facts"
-COMMAPP_URL_PATH="${KEYSERVER_FACTS_DIR}/commapp_url.json"
LANDING_URL_PATH="${KEYSERVER_FACTS_DIR}/landing_url.json"
-SQUADCAL_URL_PATH="${KEYSERVER_FACTS_DIR}/squadcal_url.json"
+WEBAPP_URL_PATH="${KEYSERVER_FACTS_DIR}/webapp_url.json"
+KEYSERVER_URL_PATH="${KEYSERVER_FACTS_DIR}/keyserver_url.json"
WEBAPP_CORS_PATH="${KEYSERVER_FACTS_DIR}/webapp_cors.json"
if [[ ! -d "$KEYSERVER_FACTS_DIR" ]]; then
mkdir -p "$KEYSERVER_FACTS_DIR"
fi
-if [[ ! -f "$COMMAPP_URL_PATH" ]]; then
- cp "$SCRIPT_DIR/templates/commapp_url.json" "$COMMAPP_URL_PATH"
-fi
-
if [[ ! -f "$LANDING_URL_PATH" ]]; then
cp "$SCRIPT_DIR/templates/landing_url.json" "$LANDING_URL_PATH"
fi
-if [[ ! -f "$SQUADCAL_URL_PATH" ]]; then
- cp "$SCRIPT_DIR/templates/squadcal_url.json" "$SQUADCAL_URL_PATH"
+if [[ ! -f "$WEBAPP_URL_PATH" ]]; then
+ cp "$SCRIPT_DIR/templates/webapp_url.json" "$WEBAPP_URL_PATH"
+fi
+
+if [[ ! -f "$KEYSERVER_URL_PATH" ]]; then
+ cp "$SCRIPT_DIR/templates/keyserver_url.json" "$KEYSERVER_URL_PATH"
fi
if [[ ! -f "$WEBAPP_CORS_PATH" ]]; then
diff --git a/scripts/templates/commapp_url.json b/scripts/templates/keyserver_url.json
rename from scripts/templates/commapp_url.json
rename to scripts/templates/keyserver_url.json
--- a/scripts/templates/commapp_url.json
+++ b/scripts/templates/keyserver_url.json
@@ -1,7 +1,7 @@
{
"baseDomain": "http://localhost:3000",
- "basePath": "/comm/",
- "baseRoutePath": "/comm/",
+ "basePath": "/keyserver/",
+ "baseRoutePath": "/keyserver/",
"https": false,
"proxy": "none"
}
diff --git a/scripts/templates/squadcal_url.json b/scripts/templates/squadcal_url.json
deleted file mode 100644
--- a/scripts/templates/squadcal_url.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "baseDomain": "http://localhost:3000",
- "basePath": "/comm/",
- "https": false,
- "baseRoutePath": "/",
- "proxy": "apache"
-}
diff --git a/scripts/templates/commapp_url.json b/scripts/templates/webapp_url.json
rename from scripts/templates/commapp_url.json
rename to scripts/templates/webapp_url.json
--- a/scripts/templates/commapp_url.json
+++ b/scripts/templates/webapp_url.json
@@ -1,7 +1,7 @@
{
"baseDomain": "http://localhost:3000",
- "basePath": "/comm/",
- "baseRoutePath": "/comm/",
+ "basePath": "/webapp/",
+ "baseRoutePath": "/webapp/",
"https": false,
"proxy": "none"
}

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 9:46 PM (21 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2581061
Default Alt Text
D9398.diff (3 KB)

Event Timeline