Merge pull request #16 from Xpirix/prod_tweaks

Update Makefile and Docker Compose configuration

Author: Xpirix

deployment/Makefile

@@ -25,7 +25,7 @@ web:
 	@# Dont confuse this with the dbbackup make command below
 	@# This one runs the postgis-backup cron container
 	@# We add --no-recreate so that it does not destroy & recreate the db container
-	# @docker compose up --no-recreate --no-deps -d dbbackups
+	@docker compose up --no-recreate --no-deps -d dbbackups
 
 permissions:
 	# Probably we want something more granular here....
@@ -134,13 +134,6 @@ status:
 	@echo "------------------------------------------------------------------"
 	@docker compose ps
 
-kill:
-	@echo
-	@echo "------------------------------------------------------------------"
-	@echo "Killing in production mode"
-	@echo "------------------------------------------------------------------"
-	@docker compose kill
-
 rm: dbbackup rm-only
 
 

deployment/docker-compose.override.example.yml

@@ -7,6 +7,11 @@ volumes:
       type: none
       device: ${PWD}/pg/postgres_data
       o: bind
+  db-backups:
+    driver_opts:
+      type: none
+      device: ${BACKUPS_VOLUME}
+      o: bind
   static-data:
     driver_opts:
       type: none

deployment/sites-enabled/prod.conf

@@ -24,9 +24,6 @@ server {
     # the domain name it will serve for
     server_name changelog.qgis.org;
 
-    # Redirect all HTTP traffic to HTTPS
-    return 301 https://$server_name$request_uri;
-
     charset     utf-8;
 
     # Optimized for generating certificates