Merge branch 'master' into playwright-ci-test-setup

.dockerignore

@@ -0,0 +1 @@
+dockerize/postgres_data

.github/workflows/test.yaml

@@ -50,17 +50,18 @@ jobs:
         with:
           node-version: 20
 
-      - name: Run docker-compose build
-        run: docker-compose build
+      - name: Generate the .env file
+        run: cp .env.template .env
+
 
       - name: Run the containers
         run: docker-compose up -d db devweb
-      
+
 
       - name: Wait for the containers to start
         run: sleep 15 
 
-      - name: Run test
+      - name: Run Django tests
         run: |
           docker-compose exec -T devweb bash -c '
             set -e  # Exit immediately if any command fails
@@ -70,7 +71,6 @@ jobs:
             python manage.py migrate &&
             python manage.py test
           '
-
       - name: Start Django server
         run: |
             docker-compose exec -T devweb bash -c "python manage.py loaddata fixtures/*.json"

.gitignore

@@ -43,6 +43,8 @@ static_media
 dockerize/static
 dockerize/media
 dockerize/logs
+dockerize/certbot-etc
+dockerize/webroot
 .editorconfig
 
 # test cache
@@ -54,3 +56,5 @@ qgis-app/whoosh_index/
 
 # playwright fixture
 !playwright/ci-test/tests/fixtures/qgis-logo.zip
+docker-compose.override.yml
+.env

INSTALL.md

@@ -43,6 +43,8 @@ $ make rebuild_index
 ```
 This command ensures that the search index accurately reflects the current state of the database, resolving the presence of 'None' in the search results. Automatic synchronization is currently managed in settings.py: `HAYSTACK_SIGNAL_PROCESSOR = "haystack.signals.RealtimeSignalProcessor"`.
 
+For more information about make commands, please see the full docs [here](./dockerize/README.md).
+
 ---
 
 ### Setup git-hooks and local linting
@@ -196,6 +198,8 @@ $ make dbrestore
 
 ## Deploy Update with Rancher
 
+**TO BE DEPRECATED**
+
 - Go to [https://rancher.qgis.org](https://rancher.qgis.org)
 - Click the home icon in the top left corner,  and choose the environment: `plugins.qgis.org`
 - You will be redirected to User Stacks page, choose the plugins stack by clicking on `plugins` link

REQUIREMENTS.txt

@@ -1,17 +1,21 @@
-Django==2.2.25
+Django==3.2.11
+
 # Currently broken with 'no module named defaults' error
 #Feedjack==0.9.18
 # So use George's fork rather
 # git+https://github.com/Erve1879/feedjack.git
-# George's is also broken: use my fork (django 1.8 ready)
-git+https://github.com/elpaso/feedjack.git
+# George's is also broken: use elpaso fork (django 1.8 ready)
+# git+https://github.com/elpaso/feedjack.git
+# His is also broken, use dimasciput (django 3.2 ready)
+git+https://github.com/dimasciput/feedjack.git
+
 Markdown==2.3.1
 #PIL==1.1.7
 Pillow
 Pygments==2.7.4
 
 # Updates for Django 2 & Python 3.7
-git+https://github.com/Xpirix/whoosh.git@a306553
+git+https://github.com/Xpirix/whoosh.git@main
 pickle5==0.0.12
 django-haystack==3.2.1
 
@@ -21,16 +25,18 @@ argparse==1.2.1
 django-annoying==0.7.7
 django-auth-ldap==1.2.6
 django-autoslug==1.7.1
-django-debug-toolbar==1.11.1
+django-debug-toolbar==3.2.4
 django-endless-pagination==2.0
 django-extensions==1.2.0
 django-generic-aggregation==0.3.2
 #django-olwidget==0.61.0 unmaintained, use this fork
 git+https://github.com/Christophe31/olwidget.git
 django-pagination==1.0.7
+
 # Unmaintained!
 #django-ratings==0.3.7
-git+https://github.com/enikesha/django-ratings.git
+git+https://github.com/gelo-zhukov/django-ratings.git
+
 django-simple-ratings==0.3.2
 # SIMPLEMENU
 git+https://github.com/elpaso/django-simplemenu.git
@@ -61,4 +67,5 @@ pyjwt==1.7.1
 djangorestframework-simplejwt==4.4 
 django-rest-auth==0.9.5
 drf-yasg
-django-matomo==0.1.6
+geoip2==4.5.0
+django-matomo==0.1.6

dockerize/.env.template

@@ -0,0 +1,37 @@
+# RabbitMQ host
+RABBITMQ_HOST=rabbitmq
+
+# Database variables
+DATABASE_NAME=gis
+DATABASE_USERNAME=docker
+DATABASE_PASSWORD=docker
+DATABASE_HOST=db
+
+# Django settings
+DJANGO_SETTINGS_MODULE=settings_docker
+DEBUG=False
+
+# Docker volumes
+QGISPLUGINS_STATIC_VOLUME=static-data
+QGISPLUGINS_MEDIA_VOLUME=media-data
+QGISPLUGINS_BACKUP_VOLUME=backups-data
+
+# Email variables
+EMAIL_BACKEND='django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST=''
+EMAIL_PORT=587
+EMAIL_USE_TLS=True
+EMAIL_HOST_USER=''
+EMAIL_HOST_PASSWORD=''
+
+# URL
+DEFAULT_PLUGINS_SITE='https://plugins.qgis.org/'
+
+# ENV: debug or prod
+QGISPLUGINS_ENV=debug
+
+# Ldap
+ENABLE_LDAP=False
+
+# Download stats URL
+METABASE_DOWNLOAD_STATS_URL='https://plugins.qgis.org/metabase/public/dashboard/<dashboard_id>'