Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Add support for new version of django-allauth (#655)

Browse Source 
* Fix: Add support for new version of django-allauth

* Use full path for manage.py script
This commit is contained in:
Abhilash Raj
2023-10-02 21:28:36 +05:30
committed by GitHub
parent f45adbfd21
commit 022cb48778
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
postorius/mailman-web/settings.py
View File

@@ -99,6 +99,7 @@ MIDDLEWARE = (
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'django_mailman3.middleware.TimezoneMiddleware', 'django_mailman3.middleware.TimezoneMiddleware',
'allauth.account.middleware.AccountMiddleware',
'postorius.middleware.PostoriusMiddleware', 'postorius.middleware.PostoriusMiddleware',
) )

8
web/docker-entrypoint.sh
View File

@@ -118,12 +118,12 @@ echo "Compiling locale files in $SITE_DIR"
cd $SITE_DIR && /opt/mailman-web/manage.py compilemessages && cd - cd $SITE_DIR && /opt/mailman-web/manage.py compilemessages && cd -
# Compress static files. # Compress static files.
python3 manage.py compress --force python3 /opt/mailman-web/manage.py compress --force
# Migrate all the data to the database if this is a new installation, otherwise # Migrate all the data to the database if this is a new installation, otherwise
# this command will upgrade the database. # this command will upgrade the database.
python3 manage.py migrate python3 /opt/mailman-web/manage.py migrate
# If MAILMAN_ADMIN_USER and MAILMAN_ADMIN_EMAIL is defined create a new # If MAILMAN_ADMIN_USER and MAILMAN_ADMIN_EMAIL is defined create a new
# superuser for Django. There is no password setup so it can't login yet unless # superuser for Django. There is no password setup so it can't login yet unless
@@ -131,7 +131,7 @@ python3 manage.py migrate
if [[ -v MAILMAN_ADMIN_USER ]] && [[ -v MAILMAN_ADMIN_EMAIL ]]; if [[ -v MAILMAN_ADMIN_USER ]] && [[ -v MAILMAN_ADMIN_EMAIL ]];
then then
echo "Creating admin user $MAILMAN_ADMIN_USER ..." echo "Creating admin user $MAILMAN_ADMIN_USER ..."
python3 manage.py createsuperuser --noinput --username "$MAILMAN_ADMIN_USER"\ python3 /opt/mailman-web/manage.py createsuperuser --noinput --username "$MAILMAN_ADMIN_USER"\
--email "$MAILMAN_ADMIN_EMAIL" 2> /dev/null || \ --email "$MAILMAN_ADMIN_EMAIL" 2> /dev/null || \
echo "Superuser $MAILMAN_ADMIN_USER already exists" echo "Superuser $MAILMAN_ADMIN_USER already exists"
fi fi
@@ -141,7 +141,7 @@ fi
if [[ -v SERVE_FROM_DOMAIN ]]; if [[ -v SERVE_FROM_DOMAIN ]];
then then
echo "Setting $SERVE_FROM_DOMAIN as the default domain ..." echo "Setting $SERVE_FROM_DOMAIN as the default domain ..."
python3 manage.py shell -c \ python3 /opt/mailman-web/manage.py shell -c \
"from django.contrib.sites.models import Site; Site.objects.filter(domain='example.com').update(domain='$SERVE_FROM_DOMAIN', name='$SERVE_FROM_DOMAIN')" "from django.contrib.sites.models import Site; Site.objects.filter(domain='example.com').update(domain='$SERVE_FROM_DOMAIN', name='$SERVE_FROM_DOMAIN')"
fi fi

1
web/mailman-web/settings.py
View File

@@ -107,6 +107,7 @@ MIDDLEWARE = (
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'allauth.account.middleware.AccountMiddleware',
'django_mailman3.middleware.TimezoneMiddleware', 'django_mailman3.middleware.TimezoneMiddleware',
'postorius.middleware.PostoriusMiddleware', 'postorius.middleware.PostoriusMiddleware',
) )