diff --git a/dockerize/.env.template b/dockerize/.env.template index f7fc8963..fc1c9391 100644 --- a/dockerize/.env.template +++ b/dockerize/.env.template @@ -1,3 +1,4 @@ +COMPOSE_PROJECT_NAME=qgis-plugins # RabbitMQ host RABBITMQ_HOST=rabbitmq diff --git a/dockerize/Makefile b/dockerize/Makefile index 1522cfbc..7618d718 100644 --- a/dockerize/Makefile +++ b/dockerize/Makefile @@ -176,14 +176,14 @@ web-logs: @echo "------------------------------------------------------------------" @echo "Tailing logs in NGINX/WEB container(s)" @echo "------------------------------------------------------------------" - @docker compose -p $(PROJECT_ID) logs -f web + @docker compose -p $(PROJECT_ID) logs -f --tail=10 web logs: @echo @echo "------------------------------------------------------------------" @echo "Tailing all logs or a specific container" @echo "------------------------------------------------------------------" - @docker compose -p $(PROJECT_ID) logs -f $(c) + @docker compose -p $(PROJECT_ID) logs -f --tail=10 $(c) shell: @echo diff --git a/dockerize/sites-enabled/prod-ssl.conf b/dockerize/sites-enabled/prod-ssl.conf index f3eeb44a..57343533 100644 --- a/dockerize/sites-enabled/prod-ssl.conf +++ b/dockerize/sites-enabled/prod-ssl.conf @@ -7,19 +7,6 @@ upstream uwsgi { # Define the rate limit zone: 10 requests per second for each IP address limit_req_zone $binary_remote_addr zone=one:10m rate=10r/s; -# Redirect requests on analytics.qgis.org over to the feed -# This is just a conveneience in case we ever decide to host -# metabase on its own server. -# Note that we also have a cloudflare trasnform rule in place -# which will redirect users from analytics.qgis.org over to the public dashboard -# https://dash.cloudflare.com/a2cec2d89cc90579a20a30365bedcaf7/qgis.org/rules/transform-rules -server { - listen 80; - listen 443 ssl; - server_name plugins-analytics.qgis.org; - return 301 $scheme://plugins.qgis.org$request_uri; -} - server { # OTF gzip compression gzip on; @@ -242,4 +229,19 @@ server { } root /var/www/webroot; +} + +# Redirect requests on analytics.qgis.org over to the feed +# This is just a conveneience in case we ever decide to host +# metabase on its own server. +# Note that we also have a cloudflare trasnform rule in place +# which will redirect users from analytics.qgis.org over to the public dashboard +# https://dash.cloudflare.com/a2cec2d89cc90579a20a30365bedcaf7/qgis.org/rules/transform-rules +server { + listen 80; + listen 443 ssl; + server_name plugins-analytics.qgis.org; + ssl_certificate /etc/letsencrypt/live/plugins-analytics.qgis.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/plugins-analytics.qgis.org/privkey.pem; + return 301 $scheme://plugins.qgis.org/org/metabase/public/dashboard/7ecd345f-7321-423d-9844-71e526a454a9; } \ No newline at end of file diff --git a/dockerize/sites-enabled/prod.conf b/dockerize/sites-enabled/prod.conf index 16d387b9..0014d80e 100644 --- a/dockerize/sites-enabled/prod.conf +++ b/dockerize/sites-enabled/prod.conf @@ -7,18 +7,6 @@ upstream uwsgi { # Define the rate limit zone: 10 requests per second for each IP address limit_req_zone $binary_remote_addr zone=one:10m rate=10r/s; -# Redirect requests on analytics.qgis.org over to the feed -# This is just a conveneience in case we ever decide to host -# metabase on its own server. -# Note that we also have a cloudflare trasnform rule in place -# which will redirect users from analytics.qgis.org over to the public dashboard -# https://dash.cloudflare.com/a2cec2d89cc90579a20a30365bedcaf7/qgis.org/rules/transform-rules -server { - listen 80; - listen 443 ssl; - server_name plugins-analytics.qgis.org; - return 301 $scheme://plugins.qgis.org$request_uri; -} server { # OTF gzip compression @@ -122,3 +110,17 @@ server { allow all; } } + +# Redirect requests on analytics.qgis.org over to the feed +# This is just a conveneience in case we ever decide to host +# metabase on its own server. +# Note that we also have a cloudflare trasnform rule in place +# which will redirect users from analytics.qgis.org over to the public dashboard +# https://dash.cloudflare.com/a2cec2d89cc90579a20a30365bedcaf7/qgis.org/rules/transform-rules +server { + listen 80; + server_name plugins-analytics.qgis.org; + ssl_certificate /etc/letsencrypt/live/plugins-analytics.qgis.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/plugins-analytics.qgis.org/privkey.pem; + return 301 $scheme://plugins.qgis.org/org/metabase/public/dashboard/7ecd345f-7321-423d-9844-71e526a454a9; +} \ No newline at end of file