From 2e0417540d68008598240c3862ba98808f3772c5 Mon Sep 17 00:00:00 2001
From: spencer <swilbur@usgs.gov>
Date: Mon, 24 Apr 2023 14:06:27 -0600
Subject: [PATCH] changed the host in multiple scripts from cwbpub.cr to
edgecwb
---
docker-compose.yml | 2 +-
docs/algorithms/Adjusted_usage.md | 2 +-
docs/api.md | 2 +-
docs/io.md | 4 ++--
docs/io/Edge.md | 2 +-
docs/usage.md | 2 +-
geomagio/Controller.py | 6 +++---
geomagio/api/ws/data.py | 2 +-
geomagio/edge/EdgeFactory.py | 2 +-
geomagio/edge/MiniSeedFactory.py | 2 +-
geomagio/processing/magproc.py | 2 +-
scripts/custom.config.sh | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index f9be07832..5925cdd1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
web:
build: .
environment:
- - DATA_HOST=cwbpub.cr.usgs.gov
+ - DATA_HOST=edgecwb.usgs.gov
- DATA_PORT=2060
- DATA_TYPE=edge
- GEOMAG_VERSION=0.3.1
diff --git a/docs/algorithms/Adjusted_usage.md b/docs/algorithms/Adjusted_usage.md
index b3d9db952..202ac12b4 100644
--- a/docs/algorithms/Adjusted_usage.md
+++ b/docs/algorithms/Adjusted_usage.md
@@ -17,7 +17,7 @@ contained in the statefile. The pier correction is also currently
contained in the statefile.
bin/geomag.py \
- --input-edge cwbpub.cr.usgs.gov \
+ --input-edge edgecwb.usgs.gov \
--observatory BOU \
--inchannels H E Z F \
--starttime 2016-01-03T00:00:00 \
diff --git a/docs/api.md b/docs/api.md
index 7f65eee06..60da4a53c 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -66,7 +66,7 @@ from geomagio.edge import EdgeFactory
from obspy.core import UTCDateTime
# read data from the USGS EDGE server
-factory = EdgeFactory(host='cwbpub.cr.usgs.gov', port=2060)
+factory = EdgeFactory(host='edgecwb.usgs.gov', port=2060)
hezf = factory.get_timeseries(
observatory='BOU',
interval='minute',
diff --git a/docs/io.md b/docs/io.md
index 95f9e66a5..99cbfc02f 100644
--- a/docs/io.md
+++ b/docs/io.md
@@ -26,7 +26,7 @@ Specify input format.
For input format `edge`
`--input-host HOST`
- (Default `cwbpub.cr.usgs.gov`)
+ (Default `edgecwb.usgs.gov`)
`--input-port PORT`
(Default `2060`)
@@ -97,7 +97,7 @@ For output format `edge`
Unique identifier used for data being loaded.
`--output-host HOST`
- (Default `cwbpub.cr.usgs.gov`)
+ (Default `edgecwb.usgs.gov`)
`--output-port PORT`
(Default `2060`)
diff --git a/docs/io/Edge.md b/docs/io/Edge.md
index 988873090..49341fd8f 100644
--- a/docs/io/Edge.md
+++ b/docs/io/Edge.md
@@ -27,7 +27,7 @@ from __future__ import print_function
from geomagio.edge import EdgeFactory
from obspy.core import UTCDateTime
-factory = EdgeFactory(host='cwbpub.cr.usgs.gov', port=2060)
+factory = EdgeFactory(host='edgecwb.usgs.gov', port=2060)
data = factory.get_timeseries(
observatory='BOU',
channels=['H', 'E', 'Z', 'F'],
diff --git a/docs/usage.md b/docs/usage.md
index 78aea93ef..63df11d28 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -81,7 +81,7 @@ Here is the same example written for use in the Windows command line.
To retrieve all **_Dst 4 minute_**, and **_Dst 3 minute_** data from **_USGS_**
for the entire day of **_Oct 1st 2015_** from an **_edge server_** (at
-cwbpub.cr.usgs.gov) and output **_Dst 4 minute_**, and **_Dst 3 minute_**
+edgecwb.usgs.gov) and output **_Dst 4 minute_**, and **_Dst 3 minute_**
data to an **_iaga2002_** formatted file:
geomag.py \
diff --git a/geomagio/Controller.py b/geomagio/Controller.py
index d20aee0ea..4ef103ee4 100644
--- a/geomagio/Controller.py
+++ b/geomagio/Controller.py
@@ -803,8 +803,8 @@ def parse_args(args):
)
input_group.add_argument(
"--input-host",
- default="cwbpub.cr.usgs.gov",
- help='Hostname or IP address (Default "cwbpub.cr.usgs.gov")',
+ default="edgecwb.usgs.gov",
+ help='Hostname or IP address (Default "edgecwb.usgs.gov")',
metavar="HOST",
)
input_group.add_argument(
@@ -988,7 +988,7 @@ def parse_args(args):
)
output_group.add_argument(
"--output-host",
- default="cwbpub.cr.usgs.gov",
+ default="cedgecwb.usgs.gov",
help="Write to specified host",
metavar="HOST",
)
diff --git a/geomagio/api/ws/data.py b/geomagio/api/ws/data.py
index db204eee3..e6581a2f4 100644
--- a/geomagio/api/ws/data.py
+++ b/geomagio/api/ws/data.py
@@ -28,7 +28,7 @@ def get_data_factory(
data_factory
Edge or miniseed factory object
"""
- host = os.getenv("DATA_HOST", "cwbpub.cr.usgs.gov")
+ host = os.getenv("DATA_HOST", "edgecwb.usgs.gov")
sampling_period = query.sampling_period
if sampling_period in [
SamplingPeriod.TEN_HERTZ,
diff --git a/geomagio/edge/EdgeFactory.py b/geomagio/edge/EdgeFactory.py
index d07f3fa5e..7b18ac56b 100644
--- a/geomagio/edge/EdgeFactory.py
+++ b/geomagio/edge/EdgeFactory.py
@@ -79,7 +79,7 @@ class EdgeFactory(TimeseriesFactory):
def __init__(
self,
- host: str = "cwbpub.cr.usgs.gov",
+ host: str = "edgecwb.usgs.gov",
port: int = 2060,
write_port: int = 7981,
cwbport: int = 0,
diff --git a/geomagio/edge/MiniSeedFactory.py b/geomagio/edge/MiniSeedFactory.py
index daf02420c..f7a8ac839 100644
--- a/geomagio/edge/MiniSeedFactory.py
+++ b/geomagio/edge/MiniSeedFactory.py
@@ -69,7 +69,7 @@ class MiniSeedFactory(TimeseriesFactory):
def __init__(
self,
- host: str = "cwbpub.cr.usgs.gov",
+ host: str = "edgecwb.usgs.gov",
port: int = 2061,
write_port: int = 7974,
observatory: Optional[str] = None,
diff --git a/geomagio/processing/magproc.py b/geomagio/processing/magproc.py
index 748dc91a5..b3e98cb7f 100644
--- a/geomagio/processing/magproc.py
+++ b/geomagio/processing/magproc.py
@@ -35,7 +35,7 @@ def prepfiles(
second_path: str = os.getenv("SECOND_PATH", "file://c:/RAW"),
minute_path: str = os.getenv("MINUTE_PATH", "file://c:/USGSDCP"),
temperature_path: str = os.getenv("TEMPERATURE_PATH", "file://c:/DEG"),
- edge_host: str = os.getenv("EDGE_HOST", "cwbpub.cr.usgs.gov"),
+ edge_host: str = os.getenv("EDGE_HOST", "edgecwb.usgs.gov"),
):
month_start = datetime(year, month, 1)
month_end = month_start + relativedelta(months=1)
diff --git a/scripts/custom.config.sh b/scripts/custom.config.sh
index 7f41fafdd..30a09e3c7 100755
--- a/scripts/custom.config.sh
+++ b/scripts/custom.config.sh
@@ -16,7 +16,7 @@ export SERVICE_MAP=(
"/${BASE_HREF}:web"
);
# Algorithms Environment Variables
-export DATA_HOST=${DATA_HOST:-cwbpub.cr.usgs.gov};
+export DATA_HOST=${DATA_HOST:-edgecwb.usgs.gov};
export DATA_PORT=${DATA_PORT:-2060};
export DATA_TYPE=${DATA_TYPE:-edge};
--
GitLab