diff --git a/.env.example b/.env.example index 5f83664..11dd700 100644 --- a/.env.example +++ b/.env.example @@ -5,10 +5,12 @@ APP_DIR=/srv/app # Host Ports CKAN_PORT_HOST=5000 -# Common proxy server for Apache or NGINX +# Common proxy server for Apache or NGINX. +# Change all the PROXY_SERVER_PORT_HOST to PROXY_SERVER_HTTPS_PORT_HOST if you can use HTTPS instead of HTTP (Only for NGINX and not development compose) PROXY_SERVER_PORT_HOST=81 +PROXY_SERVER_HTTPS_PORT_HOST=8443 NGINX_PORT_HOST=${PROXY_SERVER_PORT_HOST} -NGINX_SSLPORT_HOST=8443 +NGINX_SSLPORT_HOST=${PROXY_SERVER_HTTPS_PORT_HOST} APACHE_PORT_HOST=${PROXY_SERVER_PORT_HOST} PYCSW_PORT_HOST=8000 @@ -91,7 +93,6 @@ CKAN_SITE_ID=default # CKAN_SITE_URL = http:/ or https:/ + PROXY_SERVER_NAME. Optionally the APACHE_HOST_PORT if different from 80 CKAN_SITE_URL=${PROXY_SERVER_URL} CKAN__ROOT_PATH=${PROXY_CKAN_LOCATION}/{{LANG}} -CKAN_PORT=5000 CKAN__FAVICON=${PROXY_CKAN_LOCATION}/base/images/ckan.ico CKAN__SITE_LOGO=/images/default/ckan-logo.png # Custom licenses that are aligned with DCAT-AP @@ -137,7 +138,7 @@ CKAN__LOCALE_ORDER="en es pt_BR ja it cs_CZ ca fr el sv sr sr@latin no sk fi ru CKAN__LOCALES_OFFERED="en es pt_BR ja it cs_CZ ca fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv" # Extensions -CKAN__PLUGINS="envvars stats image_view text_view recline_view webpage_view resourcedictionary datastore xloader spatial_metadata spatial_query spatial_harvest_metadata_api csw_harvester waf_harvester doc_harvester resource_proxy geo_view geojson_view wmts_view shp_view dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface schemingdcat_datasets schemingdcat_groups schemingdcat_organizations schemingdcat schemingdcat_ckan_harvester schemingdcat_xls_harvester harvest pdf_view pages fluent" +CKAN__PLUGINS="stats image_view text_view recline_view webpage_view resourcedictionary datastore xloader spatial_metadata spatial_query spatial_harvest_metadata_api csw_harvester waf_harvester doc_harvester resource_proxy geo_view geojson_view wmts_view shp_view dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface schemingdcat_datasets schemingdcat_groups schemingdcat_organizations schemingdcat schemingdcat_ckan_harvester schemingdcat_xls_harvester harvest pdf_view pages fluent envvars" # ckanext-harvest CKAN__HARVEST__MQ__TYPE=redis diff --git a/README.md b/README.md index 1e70560..3af86f2 100644 --- a/README.md +++ b/README.md @@ -435,9 +435,6 @@ You can now set breakpoints and remote debug your CKAN development instance usin Add these lines to the `ckan-dev` service in the docker compose.dev.yml file ```yaml -ports: - - "0.0.0.0:${CKAN_PORT}:5000" - stdin_open: true tty: true ``` diff --git a/doc/info_envfile.md b/doc/info_envfile.md index 1732872..9d379b1 100644 --- a/doc/info_envfile.md +++ b/doc/info_envfile.md @@ -101,7 +101,6 @@ This section contains configurations related to the core CKAN application. It in - `CKAN_SITE_ID`: The site ID for CKAN. - `CKAN_SITE_URL`: The URL of the CKAN site. - `CKAN__ROOT_PATH`: The root path for CKAN. -- `CKAN_PORT`: The port on which CKAN is running. - `CKAN__FAVICON`: The path to the favicon for CKAN. - `CKAN__SITE_LOGO`: The path to the logo for CKAN. - `CKAN___BEAKER__SESSION__SECRET`: The secret for the Beaker session. diff --git a/docker-compose.apache.yml b/docker-compose.apache.yml index 4fda7f5..c518706 100644 --- a/docker-compose.apache.yml +++ b/docker-compose.apache.yml @@ -57,7 +57,7 @@ services: - site_packages:/usr/lib/python3.9/site-packages restart: unless-stopped healthcheck: - test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:${CKAN_PORT}"] + test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] pycsw: build: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 7635a30..1e6bf87 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -17,7 +17,7 @@ services: - .env environment: - CKAN_COMPOSE_SERVICE=${CKAN_DEV_COMPOSE_SERVICE} - - PROXY_CKAN_PROXY_PASS=http://${CKAN_DEV_COMPOSE_SERVICE}:${CKAN_PORT} + - PROXY_CKAN_PROXY_PASS=http://${CKAN_DEV_COMPOSE_SERVICE}:5000 depends_on: - ${CKAN_DEV_COMPOSE_SERVICE} ports: @@ -42,7 +42,7 @@ services: - solr - redis ports: - - "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}" + - "0.0.0.0:${CKAN_PORT_HOST}:5000" volumes: - ckan_storage:/var/lib/ckan - ckan_logs:/var/log @@ -52,7 +52,7 @@ services: - vscode_server:/root/.vscode-server restart: unless-stopped healthcheck: - test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:${CKAN_PORT}"] + test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] pycsw: build: diff --git a/docker-compose.ghcr.apache.yml b/docker-compose.ghcr.apache.yml index 761d70f..22f5a72 100644 --- a/docker-compose.ghcr.apache.yml +++ b/docker-compose.ghcr.apache.yml @@ -57,7 +57,7 @@ services: - site_packages:/usr/lib/python3.9/site-packages restart: unless-stopped healthcheck: - test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:${CKAN_PORT}"] + test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] pycsw: build: diff --git a/docker-compose.ghcr.yml b/docker-compose.ghcr.yml index 94b7219..e96b1f6 100644 --- a/docker-compose.ghcr.yml +++ b/docker-compose.ghcr.yml @@ -58,7 +58,7 @@ services: - site_packages:/usr/lib/python3.9/site-packages restart: unless-stopped healthcheck: - test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:${CKAN_PORT}"] + test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] pycsw: build: diff --git a/docker-compose.yml b/docker-compose.yml index c087ac8..f4e1b2a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,7 +58,7 @@ services: - site_packages:/usr/lib/python3.9/site-packages restart: unless-stopped healthcheck: - test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:${CKAN_PORT}"] + test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] pycsw: build: diff --git a/samples/.env.es.example b/samples/.env.es.example index 6d51ba0..5555403 100644 --- a/samples/.env.es.example +++ b/samples/.env.es.example @@ -5,12 +5,14 @@ APP_DIR=/srv/app # Host Ports CKAN_PORT_HOST=5000 -# Common proxy server for Apache or NGINX +# Common proxy server for Apache or NGINX. +# Change all the PROXY_SERVER_PORT_HOST to PROXY_SERVER_HTTPS_PORT_HOST if you can use HTTPS instead of HTTP (Only for NGINX and not development compose) PROXY_SERVER_PORT_HOST=81 +PROXY_SERVER_HTTPS_PORT_HOST=8443 NGINX_PORT_HOST=${PROXY_SERVER_PORT_HOST} -NGINX_SSLPORT_HOST=8443 +NGINX_SSLPORT_HOST=${PROXY_SERVER_HTTPS_PORT_HOST} APACHE_PORT_HOST=${PROXY_SERVER_PORT_HOST} -PYCSW_PORT_HOST=8802 +PYCSW_PORT_HOST=8000 # Solr SOLR_IMAGE_VERSION=2.9-solr9-spatial @@ -45,8 +47,8 @@ PROXY_PYCSW_LOCATION=/csw # pycsw PYCSW_PORT=8000 -CKAN_URL=${PROXY_SERVER_URL}/${PROXY_CKAN_LOCATION} -PYCSW_URL=${PROXY_SERVER_URL}/${PROXY_PYCSW_LOCATION} +CKAN_URL=${PROXY_SERVER_URL}${PROXY_CKAN_LOCATION} +PYCSW_URL=${PROXY_SERVER_URL}${PROXY_PYCSW_LOCATION} # SCHEMAS: ckan2pycsw/model/dataset.py - Dataset type PYCSW_CKAN_SCHEMA=iso19139_geodcatap PYCSW_OUPUT_SCHEMA=iso19139_inspire @@ -86,12 +88,11 @@ CKAN_DEV_COMPOSE_SERVICE=ckan-dev # CKAN core ## If use docker-compose.ghcr.yml only "*.*.*" versions available in: https://github.com/mjanez/ckan-docker/pkgs/container/ckan-docker -CKAN_VERSION=2.9.12 +CKAN_VERSION=2.9.11 CKAN_SITE_ID=default # CKAN_SITE_URL = http:/ or https:/ + PROXY_SERVER_NAME. Optionally the APACHE_HOST_PORT if different from 80 CKAN_SITE_URL=${PROXY_SERVER_URL} CKAN__ROOT_PATH=${PROXY_CKAN_LOCATION}/{{LANG}} -CKAN_PORT=5000 CKAN__FAVICON=${PROXY_CKAN_LOCATION}/base/images/ckan.ico CKAN__SITE_LOGO=/images/default/ckan-logo.png # Custom licenses that are aligned with DCAT-AP @@ -136,7 +137,7 @@ CKAN__LOCALE_DEFAULT="es" CKAN__LOCALE_ORDER="es en pt_BR ja it cs_CZ ca fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv" # Extensions -CKAN__PLUGINS="envvars stats image_view text_view recline_view webpage_view resourcedictionary datastore xloader spatial_metadata spatial_query spatial_harvest_metadata_api csw_harvester waf_harvester doc_harvester resource_proxy geo_view geojson_view wmts_view shp_view dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface schemingdcat_datasets schemingdcat_groups schemingdcat_organizations schemingdcat schemingdcat_ckan_harvester schemingdcat_xls_harvester harvest pdf_view pages fluent" +CKAN__PLUGINS="stats image_view text_view recline_view webpage_view resourcedictionary datastore xloader spatial_metadata spatial_query spatial_harvest_metadata_api csw_harvester waf_harvester doc_harvester resource_proxy geo_view geojson_view wmts_view shp_view dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface schemingdcat_datasets schemingdcat_groups schemingdcat_organizations schemingdcat schemingdcat_ckan_harvester schemingdcat_xls_harvester harvest pdf_view pages fluent envvars" # ckanext-harvest CKAN__HARVEST__MQ__TYPE=redis @@ -153,7 +154,7 @@ CKANEXT__XLOADER__JOBS__DB_URI=postgresql://${CKAN_DB_USER}:${CKAN_DB_PASSWORD}@ # ckanext-dcat CKANEXT__DCAT__BASE_URI=${CKAN_URL} # Default profile(s). Instead of this envvar, it's possible to specify all the profile(s) availables to be used for serialization using the profiles parameter: http://localhost:5000/catalog.xml?profiles=eu_dcat_ap_2,es_dcat -CKANEXT__DCAT__RDF_PROFILES='eu_dcat_ap_2' +CKANEXT__DCAT__RDF_PROFILES='eu_dcat_ap_2 eu_dcat_ap_scheming' # The custom endpoint **must** start with a forward slash (`/`) and contain the `{_format}` placeholder. The endpoint is added to the CKAN_SITE_URL and CKAN__ROOT_PATH, example: http://localhost:5000/catalog/catalog.rdf CKANEXT__DCAT__DEFAULT_CATALOG_ENDPOINT='/catalog.{_format}' @@ -194,8 +195,4 @@ CKANEXT__PAGES__ORGANIZATION=True CKANEXT__PAGES__GROUP=True CKANEXT__PAGES__ABOUT_MENU=False CKANEXT__PAGES__GROUP_MENU=True -CKANEXT__PAGES__ORGANIZATION_MENU=True - -# WIP: ckanext-sparql_interface -CKANEXT__SPARQL__ENDPOINT_URL=https://dbpedia.org/sparql -CKANEXT__SPARQL__HIDE_ENDPOINT_URL=False \ No newline at end of file +CKANEXT__PAGES__ORGANIZATION_MENU=True \ No newline at end of file diff --git a/samples/.env.localhost b/samples/.env.localhost index 2fc71ea..11dd700 100644 --- a/samples/.env.localhost +++ b/samples/.env.localhost @@ -5,10 +5,12 @@ APP_DIR=/srv/app # Host Ports CKAN_PORT_HOST=5000 -# Common proxy server for Apache or NGINX +# Common proxy server for Apache or NGINX. +# Change all the PROXY_SERVER_PORT_HOST to PROXY_SERVER_HTTPS_PORT_HOST if you can use HTTPS instead of HTTP (Only for NGINX and not development compose) PROXY_SERVER_PORT_HOST=81 +PROXY_SERVER_HTTPS_PORT_HOST=8443 NGINX_PORT_HOST=${PROXY_SERVER_PORT_HOST} -NGINX_SSLPORT_HOST=8443 +NGINX_SSLPORT_HOST=${PROXY_SERVER_HTTPS_PORT_HOST} APACHE_PORT_HOST=${PROXY_SERVER_PORT_HOST} PYCSW_PORT_HOST=8000 @@ -45,8 +47,8 @@ PROXY_PYCSW_LOCATION=/csw # pycsw PYCSW_PORT=8000 -CKAN_URL=${PROXY_SERVER_URL}/${PROXY_CKAN_LOCATION} -PYCSW_URL=${PROXY_SERVER_URL}/${PROXY_PYCSW_LOCATION} +CKAN_URL=${PROXY_SERVER_URL}${PROXY_CKAN_LOCATION} +PYCSW_URL=${PROXY_SERVER_URL}${PROXY_PYCSW_LOCATION} # SCHEMAS: ckan2pycsw/model/dataset.py - Dataset type PYCSW_CKAN_SCHEMA=iso19139_geodcatap PYCSW_OUPUT_SCHEMA=iso19139_inspire @@ -86,12 +88,11 @@ CKAN_DEV_COMPOSE_SERVICE=ckan-dev # CKAN core ## If use docker-compose.ghcr.yml only "*.*.*" versions available in: https://github.com/mjanez/ckan-docker/pkgs/container/ckan-docker -CKAN_VERSION=2.9.12 +CKAN_VERSION=2.9.11 CKAN_SITE_ID=default # CKAN_SITE_URL = http:/ or https:/ + PROXY_SERVER_NAME. Optionally the APACHE_HOST_PORT if different from 80 CKAN_SITE_URL=${PROXY_SERVER_URL} CKAN__ROOT_PATH=${PROXY_CKAN_LOCATION}/{{LANG}} -CKAN_PORT=5000 CKAN__FAVICON=${PROXY_CKAN_LOCATION}/base/images/ckan.ico CKAN__SITE_LOGO=/images/default/ckan-logo.png # Custom licenses that are aligned with DCAT-AP @@ -137,7 +138,7 @@ CKAN__LOCALE_ORDER="en es pt_BR ja it cs_CZ ca fr el sv sr sr@latin no sk fi ru CKAN__LOCALES_OFFERED="en es pt_BR ja it cs_CZ ca fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv" # Extensions -CKAN__PLUGINS="envvars stats image_view text_view recline_view webpage_view resourcedictionary datastore xloader spatial_metadata spatial_query spatial_harvest_metadata_api csw_harvester waf_harvester doc_harvester resource_proxy geo_view geojson_view wmts_view shp_view dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface schemingdcat_datasets schemingdcat_groups schemingdcat_organizations schemingdcat schemingdcat_ckan_harvester schemingdcat_xls_harvester harvest pdf_view pages fluent" +CKAN__PLUGINS="stats image_view text_view recline_view webpage_view resourcedictionary datastore xloader spatial_metadata spatial_query spatial_harvest_metadata_api csw_harvester waf_harvester doc_harvester resource_proxy geo_view geojson_view wmts_view shp_view dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface schemingdcat_datasets schemingdcat_groups schemingdcat_organizations schemingdcat schemingdcat_ckan_harvester schemingdcat_xls_harvester harvest pdf_view pages fluent envvars" # ckanext-harvest CKAN__HARVEST__MQ__TYPE=redis @@ -154,7 +155,7 @@ CKANEXT__XLOADER__JOBS__DB_URI=postgresql://${CKAN_DB_USER}:${CKAN_DB_PASSWORD}@ # ckanext-dcat CKANEXT__DCAT__BASE_URI=${CKAN_URL} # Default profile(s). Instead of this envvar, it's possible to specify all the profile(s) availables to be used for serialization using the profiles parameter: http://localhost:5000/catalog.xml?profiles=eu_dcat_ap_2,es_dcat -CKANEXT__DCAT__RDF_PROFILES='eu_dcat_ap_2' +CKANEXT__DCAT__RDF_PROFILES='eu_dcat_ap_2 eu_dcat_ap_scheming' # The custom endpoint **must** start with a forward slash (`/`) and contain the `{_format}` placeholder. The endpoint is added to the CKAN_SITE_URL and CKAN__ROOT_PATH, example: http://localhost:5000/catalog/catalog.rdf CKANEXT__DCAT__DEFAULT_CATALOG_ENDPOINT='/catalog.{_format}'