From 5aaeb59f569447b1cc46f9e496b307d883d8cb43 Mon Sep 17 00:00:00 2001 From: Antonio Cerciello Date: Mon, 21 Aug 2023 18:00:46 +0200 Subject: [PATCH] Adding metadata push API --- apache-httpd/httpd-ssl.conf | 17 +++++++++++++++++ apache-httpd/httpd.conf | 15 +++++++++++++++ docker-compose-local.yml | 20 ++++++++++++++++++++ docker-compose.yml | 20 ++++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/apache-httpd/httpd-ssl.conf b/apache-httpd/httpd-ssl.conf index 3a322c0..55db3f5 100644 --- a/apache-httpd/httpd-ssl.conf +++ b/apache-httpd/httpd-ssl.conf @@ -582,6 +582,20 @@ SSLRandomSeed connect builtin Satisfy Any + + + + Order deny,allow + Allow from all + Authtype Basic + Authname "Password Required" + AuthUserFile /usr/local/apache2/.htpasswd + Require valid-user + + Satisfy Any + + + Order deny,allow @@ -610,6 +624,9 @@ SSLRandomSeed connect builtin ProxyPass /FROST-Server http://frost:8080/FROST-Server Keepalive=On ProxyPassReverse /FROST-Server http://frost:8080/FROST-Server + + ProxyPass /sisyphus http://sisyphus:80/sisyphus Keepalive=On + ProxyPassReverse /sisyphus http://sisyphus:80/sisyphus ProxyPass / http://pygeoapi_es:80/ Keepalive=On ProxyPassReverse / http://pygeoapi_es:80/ diff --git a/apache-httpd/httpd.conf b/apache-httpd/httpd.conf index b9a4ad1..2836f7e 100644 --- a/apache-httpd/httpd.conf +++ b/apache-httpd/httpd.conf @@ -561,6 +561,18 @@ SSLRandomSeed connect builtin + + Order deny,allow + Allow from all + Authtype Basic + Authname "Password Required" + AuthUserFile /usr/local/apache2/.htpasswd + Require valid-user + + Satisfy Any + + + Order deny,allow Allow from all @@ -591,5 +603,8 @@ ProxyPassReverse /dashboard http://kibana:5601 ProxyPass /FROST-Server http://frost:8080/FROST-Server Keepalive=On ProxyPassReverse /FROST-Server http://frost:8080/FROST-Server +ProxyPass /sisyphus http://sisyphus:80/sisyphus Keepalive=On +ProxyPassReverse /sisyphus http://sisyphus:80/sisyphus + ProxyPass / http://pygeoapi_es:80/ Keepalive=On ProxyPassReverse / http://pygeoapi_es:80/ diff --git a/docker-compose-local.yml b/docker-compose-local.yml index f688c31..294cbd9 100644 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -211,6 +211,26 @@ services: - ./frost/sensorthings.sh:/docker-entrypoint-initdb.d/sensorthings.sh container_name: postgis_frost + sisyphus: + image: ghcr.io/emotional-cities/sisyphusapi:main + + container_name: sisyphus + + environment: + ENV_STATE: "dev" + DEV_ELASTIC_HOST: "elastic" + DEV_ELASTIC_PORT: "9200" + DEV_ELASTIC_INDEX: "ec_catalog" + DEV_LOG_PATH: "./logs" + DEV_LOG_FILENAME: "sisyphus.log" + DEV_LOG_LEVEL: "DEBUG" + DEV_LOG_ROTATION: "500 MB" + DEV_LOG_RETENTION: "10 days" + DEV_LOG_FORMAT: "{time} {level} {message}" + + expose: + - 80 + volumes: elastic_search_data: {} postgis_data: diff --git a/docker-compose.yml b/docker-compose.yml index 90f34a5..fce3dcf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -234,6 +234,26 @@ services: - ./frost/sensorthings.sh:/docker-entrypoint-initdb.d/sensorthings.sh container_name: postgis_frost + sisyphus: + image: ghcr.io/emotional-cities/sisyphusapi:main + + container_name: sisyphus + + environment: + ENV_STATE: "dev" + DEV_ELASTIC_HOST: "elastic" + DEV_ELASTIC_PORT: "9200" + DEV_ELASTIC_INDEX: "ec_catalog" + DEV_LOG_PATH: "./logs" + DEV_LOG_FILENAME: "sisyphus.log" + DEV_LOG_LEVEL: "DEBUG" + DEV_LOG_ROTATION: "500 MB" + DEV_LOG_RETENTION: "10 days" + DEV_LOG_FORMAT: "{time} {level} {message}" + + expose: + - 80 + volumes: elastic_search_data: {} postgis_data: