diff --git a/update.py b/update.py index e1639f90..669f0981 100755 --- a/update.py +++ b/update.py @@ -282,6 +282,12 @@ if __name__ == "__main__": with open('pandora/local_settings.py', 'w') as f: f.write('\n'.join(local_settings)) if old <= 6313: + if sys.version_info[0:2] < (3, 6): + print('Python 3.6 or late is required now, upgrade your system and run:') + print('') + print('./update.py postupdate %s %s' % (6313, new)) + print('') + sys.exit(1) run('./bin/pip', 'uninstall', 'django-celery', '-y') run('./bin/pip', 'install', '-r', 'requirements.txt') if old <= 6315: diff --git a/vm/pandora_install.sh b/vm/pandora_install.sh index 5f957bb2..2d898c98 100755 --- a/vm/pandora_install.sh +++ b/vm/pandora_install.sh @@ -196,7 +196,10 @@ fi # configure nginx if [ "$NGINX" == "local" ]; then -cp "/srv/pandora/etc/nginx/pandora" "/etc/nginx/sites-available/default" +cp "/srv/pandora/etc/nginx/pandora" "/etc/nginx/sites-available/pandora" +rm /etc/nginx/sites-enabled/default +ln -s ../sites-available/pandora /etc/nginx/sites-enabled/pandora + read -r -d '' GZIP <