Skip to content

Commit

Permalink
api-config-cleanup (#64)
Browse files Browse the repository at this point in the history
* api-config-cleanup

* update text as per Tom's suggestion

* update licnse

* update as per proposal

* fix test add terms_of_service

* force string postal code

* align with license

* set e-mail to not-defined

* set email to empty string
  • Loading branch information
maaikelimper authored Aug 16, 2024
1 parent 929acce commit 465acac
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wis2box_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ jobs:
working-directory: docker_compose_test
if: ${{ failure() }}
run: |
docker-compose logs
docker compose logs
8 changes: 4 additions & 4 deletions docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ set +e
#ensure environment-variables are available for cronjob
printenv | grep -v "no_proxy" >> /etc/environment

# ensure cron is running
service cron start
service cron status

# gunicorn env settings with defaults
SCRIPT_NAME="/"
CONTAINER_NAME="wis2box-api"
Expand Down Expand Up @@ -65,6 +61,10 @@ pygeoapi openapi generate ${PYGEOAPI_CONFIG} --output-file ${PYGEOAPI_OPENAPI}

echo "openapi.yml generated continue to pygeoapi"

# ensure cron is running
service cron start
service cron status

case ${entry_cmd} in
# Run pygeoapi server
run)
Expand Down
75 changes: 21 additions & 54 deletions docker/pygeoapi-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,70 +26,38 @@ logging:
metadata:
identification:
title:
en: WIS 2.0 in a box
en: WIS2 in a box API
description:
en: |-
WIS 2.0 in a box provides a platform with the capabilities
WIS 2.0 in a box (wis2box) provides a platform with the capabilities
for centres to integrate their data holdings and publish them
to the WMO Information System with a plug and play capability
supporting data publishing, discovery and access
supporting data publishing, discovery and access.
wis2box-api provides an API providing data and processes for interactive
visualization, data transformation and publication.
keywords:
en:
- wmo
- wis 2.0
keywords_type: theme
terms_of_service: https://public.wmo.int/en/our-mandate/what-we-do/observations/Unified-WMO-Data-Policy-Resolution
url: https://community.wmo.int/activity-areas/wis/wis2-implementation
license:
name: Unified WMO Data Policy
url: https://public.wmo.int/en/our-mandate/what-we-do/observations/Unified-WMO-Data-Policy-Resolution
- wis2box
- WIS2 Node
url: https://docs.wis2box.wis.wmo.int
terms_of_service: https://www.apache.org/licenses/LICENSE-2.0
provider:
name: Organization Name
url: https://pygeoapi.io
name: WIS 2.0 in a box
url: https://docs.wis2box.wis.wmo.int
contact:
name: Lastname, Firstname
position: Position Title
address: Mailing Address
city: City
stateorprovince: Administrative Area
postalcode: Zip or Postal Code
country: Country
phone: +xx-xxx-xxx-xxxx
fax: +xx-xxx-xxx-xxxx
email: you@example.org
url: https://example.org
hours: Mo-Fr 08:00-17:00
instructions: During hours of service. Off on weekends.
name: World Meteorological Organization
address: 7bis, avenue de la Paix
city: Geneva
postalcode: "1211"
country: Switzerland
email: ''
url: https://wmo.int/contact-us
role: pointOfContact
license:
name: Apache License 2.0
url: https://www.apache.org/licenses/LICENSE-2.0

resources:
data:
type: stac-collection
title:
en: Data assets
description:
en: Data assets
keywords:
en:
- wmo
- wis 2.0
- bufr
- observations
links:
- type: text/html
rel: canonical
title: information
href: https://example.org
extents:
spatial:
bbox: [-180,-90,180,90]
crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84
providers:
- type: stac
name: FileSystem
data: ${WIS2BOX_DATADIR}/data
file_types:
- .bufr4
station-info:
type: process
processor:
Expand Down Expand Up @@ -159,4 +127,3 @@ resources:
type: process
processor:
name: wis2box_api.plugins.process.bufr2bufr.BufrPublishProcessor

0 comments on commit 465acac

Please sign in to comment.