From f76c22e843b85ba0ad99d0db9dd31f2969892d97 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Mon, 17 Jul 2023 19:25:40 +0300 Subject: moving dev configs to _deploy/ --- _deploy/debian-laptops/os-trog.sh | 70 +++++++++++ _deploy/debian-laptops/venv-trog-crowley.sh | 173 ++++++++++++++++++++++++++++ _deploy/ubuntu-dev/localsettingsubuntu.py | 72 ++++++++++++ _deploy/ubuntu/localsettingsubuntu.py | 72 ------------ _deploy/wsl/requirements-devupgrade.txt | 20 ++++ _deploy/wsl/venv-trog.sh | 171 +++++++++++++++++++++++++++ _deploy/xubuntu/pre-push-barbie.sh | 46 ++++++++ 7 files changed, 552 insertions(+), 72 deletions(-) create mode 100644 _deploy/debian-laptops/os-trog.sh create mode 100644 _deploy/debian-laptops/venv-trog-crowley.sh create mode 100644 _deploy/ubuntu-dev/localsettingsubuntu.py delete mode 100644 _deploy/ubuntu/localsettingsubuntu.py create mode 100644 _deploy/wsl/requirements-devupgrade.txt create mode 100644 _deploy/wsl/venv-trog.sh create mode 100644 _deploy/xubuntu/pre-push-barbie.sh (limited to '_deploy') diff --git a/_deploy/debian-laptops/os-trog.sh b/_deploy/debian-laptops/os-trog.sh new file mode 100644 index 0000000..3c5dd36 --- /dev/null +++ b/_deploy/debian-laptops/os-trog.sh @@ -0,0 +1,70 @@ +#!/bin/bash +# Run this in a terminal in the troggle directory: 'bash os-trog.sh' +# On WSL, do Shift-click in the file explorer on the troggle folder to open a Linux command line +# 'Open Linux shell here' +echo 'Run this in a terminal in the troggle directory: "bash venv-trog.sh"' +cat /etc/os-release +# Expects an Ubuntu 22.04 relatively clean install. + +sudo apt install python-is-python3 -y +python --version : ensure python is an alias for python3 not python2.7 +sudo apt update -y +sudo apt dist-upgrade -y +sudo apt autoremove -y +sudo apt install sqlite3 -y +sudo apt install python3-pip -y + +# this installs a shed-load of other stuff: binutils etc.sudo apt install survex-aven +sudo apt install git openssh-client -y +# On a clean debian 11 (bullseye) installation with Xfce & ssh, + + #on ubuntu 20.04: + #Package sftp is not available, but is referred to by another package. + #This may mean that the package is missing, has been obsoleted, or + #is only available from another source + #E: Package 'sftp' has no installation candidate + + +# On Ubuntu 20.04, with python10, the pip install fails. +# So you need to get the pip from source +# sudo curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10 +# but really you should be using 22.04 +# and also, isf using debian, +# sudo python3.10 -m pip install -U virtualenv + +# as debian does not install everything that ubuntu does, you need: +sudo useradd expo +sudo usermod -a -G sudo expo # to put expo in sudoers group, re-login required +sudo apt install python3-venv -y +sudo apt install python3-dev -y + +# default since 22.04 +# sudo apt install python3.10 +sudo apt install python3.10-venv -y +sudo apt install python3.10-dev -y +sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.10 1 + +sudo apt install mariadb-server -y +sudo apt install libmariadb-dev -y + +sudo python -m pip install --upgrade pip + +sudo apt install sftp -y +echo '###' +echo '### NOW INSTALLING tunnel and therion, go and have a cup of tea. Or a 3-course meal.' +echo '###' +sudo apt install tunnelx therion -y + +# Go to https://expo.survex.com/handbook/troggle/troglaptop.html#dbtools +# sudo service mysql start + +git config --global user.email "you@example.com" +git config --global user.name "Your Name" + +echo '###' +echo '### Currently set version of python' +python --version + +echo '###' +echo '### Now YOU have to configure the git settings for YOURSELF (not "expo")' + diff --git a/_deploy/debian-laptops/venv-trog-crowley.sh b/_deploy/debian-laptops/venv-trog-crowley.sh new file mode 100644 index 0000000..b2d0987 --- /dev/null +++ b/_deploy/debian-laptops/venv-trog-crowley.sh @@ -0,0 +1,173 @@ +#!/bin/bash +# Crowley has python 3.9.2 +# Taken from: footled lots to make this work with python 3.10 & 3.11 and WSL1 and WSL2 on Ubuntu 22.04 +# Run this in a terminal in the troggle directory: 'bash venv-trog-crowley.sh' +echo '-- DONT RUN THIS - messes up permissions!' + + +echo '-- Run this in a terminal in the real troggle directory: "bash venv-trog-crowley.sh"' +# use the script os-trog-crowley.sh + +# If you are using Debian, then stick with the default version of python +# If you are using Ubuntu, then it is easy to use a later version of python, e.g. 3.11 + + +# NOW we set up troggle +PYTHON=python3.9 +VENAME=p9d4 # python3.x and django 4 +echo "** You are logged in as `id -u -n`" +echo "The 50MB pip cache will be in /home/`id -u -n`/.cache/" +echo "The 150MB venv will created in /home/`id -u -n`/$VENAME/" +TROGDIR=$(cd $(dirname $0) && pwd) +echo "-- Troggle folder (this script location): ${TROGDIR}" + +if [ -d requirements.txt ]; then + echo "-- No requirements.txt found. Copy it from your most recent installation." + exit 1 +fi +echo ## Using requirements.txt : +cat requirements.txt +echo ## + + +$PYTHON --version + +# NOTE that when using a later or earlier verison of python, you MUST also +# use the allowed version of Pillow, see https://pillow.readthedocs.io/en/latest/installation.html + +# NOW set up link from expo user folder +# needed for WSL2 +echo Creating links from Linux filesystem user +# These links only need making once, for many venv +cd ~ + +if [ ! -d $VENAME ]; then + echo "## Creating venv $VENAME. (If this fails with a pip error, you need to ensure you have python3.11-venv installed and/or use a Ubuntu window)" + $PYTHON -m venv $VENAME +else + echo "## /$VENAME/ already exists ! Delete it first." + exit 1 +fi + + # Activate the virtual env and see what the default packages are +echo "### Activating $VENAME" + +cd $VENAME +echo "-- now in: ${PWD}" +source bin/activate +echo "### Activated." + # update local version of pip, more recent than OS version + # debian bullseye installs pip 20.3.4 which barfs, we want >22.0.3 + + # update local version of setuptools, more recent than OS version, needed for packages without wheels + +echo "### installing later version of pip inside $VENAME" +$PYTHON -m pip install --upgrade pip +$PYTHON -m pip install --upgrade setuptools + +PIP=pip + +$PIP list > original-pip.list +$PIP freeze >original.txt + +# we are in /home/$USER/$VENAME/ +ln -s ${TROGDIR} troggle +ln -s ${TROGDIR}/../expoweb expoweb +ln -s ${TROGDIR}/../loser loser +ln -s ${TROGDIR}/../drawings drawings + +# fudge for philip's machine +if [ -d ${TROGDIR}/../expofiles ]; then + ln -s ${TROGDIR}/../expofiles expofiles +else + if [ ! -d /mnt/f/expofiles ]; then + sudo mkdir /mnt/f + sudo mount -t drvfs F: /mnt/f + else + ln -s /mnt/f/expofiles expofiles + fi +fi + +echo "### Setting file permissions.. may take a while.." +git config --global --add safe.directory '*' +#sudo chmod -R 0777 * + +echo "### links to expoweb, troggle etc. complete:" +ls -tla + +echo "###" +echo "### now installing ${TROGDIR}/requirements.txt" +echo "###" + +# NOW THERE IS A PERMISSIONS FAILURE THAT DIDN'T HAPPEN BEFORE +# seen on wsl2 as well as wsl1 +# which ALSO ruins EXISTING permissions ! +# Guessing it is to do with pip not liking non-standard py 3.11 installation on Ubuntu 22.04 + +$PIP install -r ${TROGDIR}/requirements.txt +echo '### install from requirements.txt completed.' +echo '### ' + +$PIP freeze > requirements.txt +# so that we can track requirements more easily with git +# because we do not install these with pip, but they are listed by the freeze command +# Now find out what we actually installed by subtracting the stuff venv installed anyway +sort original.txt > 1 +sort requirements.txt >2 +comm -3 1 2 --check-order | awk '{ print $1}'>fresh-requirements.txt +rm 1 +rm 2 + +cp requirements.txt requirements-$VENAME.txt +cp requirements-$VENAME.txt troggle/requirements-$VENAME.txt + +$PIP list > installed-pip.list +$PIP list -o > installed-pip-o.list + +REQ=installation-record +mkdir $REQ +mv requirements-$VENAME.txt $REQ +mv original.txt $REQ +mv requirements.txt $REQ +mv original-pip.list $REQ +mv installed-pip.list $REQ +mv installed-pip-o.list $REQ +cp fresh-requirements.txt ../requirements.txt +mv fresh-requirements.txt $REQ +cp troggle/`basename "$0"` $REQ + + +$PYTHON --version +python --version +echo "Django version:`django-admin --version`" + +echo "### Now do + '[sudo service mysql start]' + '[sudo service mariadb restart]' + '[sudo mysql_secure_installation]' + 'cd ~/$VENAME' + 'source bin/activate' + 'cd troggle' + 'django-admin' + 'python manage.py check' +## this tests if you have set up ssh correcting. Refer to documentation https://expo.survex.com/handbook/computing/keyexchange.html +## you need to follow the Linux instructions. + 'ssh expo@expo.survex.com' + +## the next tests will fail unless ~/expofiles is set correctly to a folder on your machine +## the tests may ALSO fail because of ssh and permissions errors +# Ran 85 tests in 83.492s +# FAILED (failures=5) +## So you will need to run +#$sudo chown -Rhv philip:philip ~/$VENAME (if your username is philip) +# and then REBOOT (or at least, exit WSL and terminate and restart WSL) +# because this chmod only takes effect then. + + './pre-run.sh' (runs the migrations and then the tests) + + 'python databaseReset.py reset $VENAME' + 'python manage.py runserver 0.0.0.0:8000 (and allow access when the firewall window pops up)' + " +if [ ! -d /mnt/f/expofiles ]; then +echo '### No valid expofiles directory. Fix this before any tests will work. +fi diff --git a/_deploy/ubuntu-dev/localsettingsubuntu.py b/_deploy/ubuntu-dev/localsettingsubuntu.py new file mode 100644 index 0000000..63d3ecc --- /dev/null +++ b/_deploy/ubuntu-dev/localsettingsubuntu.py @@ -0,0 +1,72 @@ +import sys + +# link localsettings to this file for use on expo computer in austria + +# This will ALL NEED TO BE CHANGED to match localsettingsWSL / python3 / Django v2.2 +# This WILL NOT WORK as it is for an earlier version of Django +# consult localsettingsWSL for updates required. + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. + 'NAME' : 'troggle', # Or path to database file if using sqlite3. + 'USER' : 'expo', # Not used with sqlite3. + 'PASSWORD' : 'sekrit', # Not used with sqlite3. + 'HOST' : '', # Set to empty string for localhost. Not used with sqlite3. + 'PORT' : '', # Set to empty string for default. Not used with sqlite3. + } +} + +EXPOUSER = 'expo' +EXPOUSERPASS = "nnn:gggggg" +EXPOUSER_EMAIL = 'wookey@wookware.org' + +REPOS_ROOT_PATH = '/home/expo/expofiles/' + +sys.path.append(REPOS_ROOT_PATH) +sys.path.append(REPOS_ROOT_PATH + 'troggle') + +PUBLIC_SITE = False + +SURVEX_DATA = REPOS_ROOT_PATH + 'loser/' +DRAWINGS_DATA = REPOS_ROOT_PATH + 'drawings/' +THREEDCACHEDIR = REPOS_ROOT_PATH + 'expowebcache/3d/' + +CAVERN = 'cavern' +THREEDTOPOS = '3dtopos' +EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' +SURVEYS = REPOS_ROOT_PATH +SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/' +FILES = REPOS_ROOT_PATH + 'expofiles' + +EXPOWEB_URL = '/' +SURVEYS_URL = '/survey_scans/' + +PYTHON_PATH = REPOS_ROOT_PATH + 'troggle/' + +#URL_ROOT = 'http://127.0.0.1:8000' +URL_ROOT = "http://expoweb/" +DIR_ROOT = ''#this should end in / if a value is given + + + +MEDIA_URL = URL_ROOT + DIR_ROOT + '/site_media/' +MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' +MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/' + +STATIC_URL = URL_ROOT +STATIC_ROOT = DIR_ROOT + +JSLIB_URL = URL_ROOT + 'javascript/' + +TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' +TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + '/tinymce_media/' + +TEMPLATE_DIRS = ( + PYTHON_PATH + "templates", + # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. +) + +LOGFILE = PYTHON_PATH + 'troggle_log.txt' diff --git a/_deploy/ubuntu/localsettingsubuntu.py b/_deploy/ubuntu/localsettingsubuntu.py deleted file mode 100644 index 63d3ecc..0000000 --- a/_deploy/ubuntu/localsettingsubuntu.py +++ /dev/null @@ -1,72 +0,0 @@ -import sys - -# link localsettings to this file for use on expo computer in austria - -# This will ALL NEED TO BE CHANGED to match localsettingsWSL / python3 / Django v2.2 -# This WILL NOT WORK as it is for an earlier version of Django -# consult localsettingsWSL for updates required. - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.mysql', # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME' : 'troggle', # Or path to database file if using sqlite3. - 'USER' : 'expo', # Not used with sqlite3. - 'PASSWORD' : 'sekrit', # Not used with sqlite3. - 'HOST' : '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT' : '', # Set to empty string for default. Not used with sqlite3. - } -} - -EXPOUSER = 'expo' -EXPOUSERPASS = "nnn:gggggg" -EXPOUSER_EMAIL = 'wookey@wookware.org' - -REPOS_ROOT_PATH = '/home/expo/expofiles/' - -sys.path.append(REPOS_ROOT_PATH) -sys.path.append(REPOS_ROOT_PATH + 'troggle') - -PUBLIC_SITE = False - -SURVEX_DATA = REPOS_ROOT_PATH + 'loser/' -DRAWINGS_DATA = REPOS_ROOT_PATH + 'drawings/' -THREEDCACHEDIR = REPOS_ROOT_PATH + 'expowebcache/3d/' - -CAVERN = 'cavern' -THREEDTOPOS = '3dtopos' -EXPOWEB = REPOS_ROOT_PATH + 'expoweb/' -SURVEYS = REPOS_ROOT_PATH -SURVEY_SCANS = REPOS_ROOT_PATH + 'expofiles/' -FILES = REPOS_ROOT_PATH + 'expofiles' - -EXPOWEB_URL = '/' -SURVEYS_URL = '/survey_scans/' - -PYTHON_PATH = REPOS_ROOT_PATH + 'troggle/' - -#URL_ROOT = 'http://127.0.0.1:8000' -URL_ROOT = "http://expoweb/" -DIR_ROOT = ''#this should end in / if a value is given - - - -MEDIA_URL = URL_ROOT + DIR_ROOT + '/site_media/' -MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' -MEDIA_ADMIN_DIR = '/usr/lib/python2.4/site-packages/django/contrib/admin/media/' - -STATIC_URL = URL_ROOT -STATIC_ROOT = DIR_ROOT - -JSLIB_URL = URL_ROOT + 'javascript/' - -TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' -TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + '/tinymce_media/' - -TEMPLATE_DIRS = ( - PYTHON_PATH + "templates", - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -LOGFILE = PYTHON_PATH + 'troggle_log.txt' diff --git a/_deploy/wsl/requirements-devupgrade.txt b/_deploy/wsl/requirements-devupgrade.txt new file mode 100644 index 0000000..19fe6d8 --- /dev/null +++ b/_deploy/wsl/requirements-devupgrade.txt @@ -0,0 +1,20 @@ +# Philip bleeding edge config +asgiref==3.6.0 +beautifulsoup4==4.12.2 +black==23.1.0 +click==8.1.3 +coverage==7.1.0 +Django==4.2 +docutils==0.19 +isort==5.12.0 +mypy-extensions==1.0.0 +packaging==23.0 +pathspec==0.11.0 +Pillow==9.4.0 +platformdirs==3.0.0 +pytz==2022.7 +ruff==0.0.245 +soupsieve==2.4.1 +sqlparse==0.4.3 +Unidecode==1.3.6 +piexif==1.1.3 \ No newline at end of file diff --git a/_deploy/wsl/venv-trog.sh b/_deploy/wsl/venv-trog.sh new file mode 100644 index 0000000..2133bef --- /dev/null +++ b/_deploy/wsl/venv-trog.sh @@ -0,0 +1,171 @@ +#!/bin/bash +# footled lots to make this work with python 3.10 & 3.11 and WSL1 and WSL2 on Ubuntu 22.04 +# Run this in a terminal in the troggle directory: 'bash venv-trog.sh' +echo '-- Run this in a terminal in the real troggle directory: "bash venv-trog.sh"' + +# Expects an Ubuntu 22.04 (or 20.04) relatively clean install. +# If you have not already installed these on your clean Ubuntu install DO THIS FIRST +# use the script os-trog.sh + +# If you are using Debian, then stick with the default version of python +# If you are using Ubuntu, then it is easy to use a later version of python, e.g. 3.11 + +# NOW we set up troggle +PYTHON=python3.11 +VENAME=p11d4 # python3.x and django 4.2 +echo "** You are logged in as `id -u -n`" +echo "The 50MB pip cache will be in /home/`id -u -n`/.cache/" +echo "The 150MB venv will created in /home/`id -u -n`/$VENAME/" +TROGDIR=$(cd $(dirname $0) && pwd) +echo "-- Troggle folder (this script location): ${TROGDIR}" + +if [ -d requirements.txt ]; then + echo "-- No requirements.txt found. You should be in the /troggle/ folder. Copy it from your most recent installation." + exit 1 +fi +echo ## Using requirements.txt : +cat requirements.txt +echo ## + + +$PYTHON --version + +# NOTE that when using a later or earlier verison of python, you MUST also +# use the allowed version of Pillow, see https://pillow.readthedocs.io/en/latest/installation.html + +# NOW set up link from expo user folder +# needed for WSL2 +echo Creating links from Linux filesystem user +# These links only need making once, for many venv +cd ~ + +if [ ! -d $VENAME ]; then + echo "## Creating venv $VENAME. (If this fails with a pip error, you need to ensure you have python3.11-venv installed and/or use a Ubuntu window)" + $PYTHON -m venv $VENAME +else + echo "## /$VENAME/ already exists ! Delete it first." + exit 1 +fi + + # Activate the virtual env and see what the default packages are +echo "### Activating $VENAME" + +cd $VENAME +echo "-- now in: ${PWD}" +source bin/activate +echo "### Activated." + # update local version of pip, more recent than OS version + # debian bullseye installs pip 20.3.4 which barfs, we want >22.0.3 + + # update local version of setuptools, more recent than OS version, needed for packages without wheels + +echo "### installing later version of pip inside $VENAME" +$PYTHON -m pip install --upgrade pip +$PYTHON -m pip install --upgrade setuptools + +PIP=pip + +$PIP list > original-pip.list +$PIP freeze >original.txt + +# we are in /home/$USER/$VENAME/ +ln -s ${TROGDIR} troggle +ln -s ${TROGDIR}/../expoweb expoweb +ln -s ${TROGDIR}/../loser loser +ln -s ${TROGDIR}/../drawings drawings +#ln -s ${TROGDIR}/../expofiles expofiles + +# fudge for philip's machine +if [ ! -d /mnt/d/EXPO ]; then + sudo mkdir /mnt/d + sudo mount -t drvfs D: /mnt/d +fi + +if [ -d ${TROGDIR}/../expofiles ]; then + ln -s ${TROGDIR}/../expofiles expofiles +else + ln -s /mnt/d/EXPO/expofiles expofiles +fi + +echo "### Setting file permissions.. may take a while.." +git config --global --add safe.directory '*' +sudo chmod -R 777 * + +echo "### links to expoweb, troggle etc. complete:" +ls -tla +echo "###" +echo "### now installing ${TROGDIR}/requirements.txt" +echo "###" + +# NOW THERE IS A PERMISSIONS FAILURE THAT DIDN'T HAPPEN BEFORE +# seen on wsl2 as well as wsl1 +# which ALSO ruins EXISTING permissions ! +# Guessing it is to do with pip not liking non-standard py 3.11 installation on Ubuntu 22.04 + +$PIP install -r ${TROGDIR}/requirements.txt +echo '### install from requirements.txt completed.' +echo '### ' + +$PIP freeze > requirements.txt +# so that we can track requirements more easily with git +# because we do not install these with pip, but they are listed by the freeze command +# Now find out what we actually installed by subtracting the stuff venv installed anyway +sort original.txt > 1 +sort requirements.txt >2 +comm -3 1 2 --check-order | awk '{ print $1}'>fresh-requirements.txt +rm 1 +rm 2 + +cp requirements.txt requirements-$VENAME.txt +cp requirements-$VENAME.txt troggle/requirements-$VENAME.txt + +$PIP list > installed-pip.list +$PIP list -o > installed-pip-o.list + +REQ=installation-record +mkdir $REQ +mv requirements-$VENAME.txt $REQ +mv original.txt $REQ +mv requirements.txt $REQ +mv original-pip.list $REQ +mv installed-pip.list $REQ +mv installed-pip-o.list $REQ +cp fresh-requirements.txt ../requirements.txt +mv fresh-requirements.txt $REQ +cp troggle/`basename "$0"` $REQ + + +$PYTHON --version +python --version +echo "Django version:`django-admin --version`" + +echo "### Now do + '[sudo service mysql start]' + '[sudo service mariadb restart]' + '[sudo mysql_secure_installation]' + 'cd ~/$VENAME' + 'source bin/activate' + 'cd troggle' + 'django-admin' + 'python manage.py check' +## this tests if you have set up ssh correcting. Refer to documentation https://expo.survex.com/handbook/computing/keyexchange.html +## you need to follow the Linux instructions. + 'ssh expo@expo.survex.com' + +## the next tests will fail unless ~/expofiles is set correctly to a folder on your machine +## the tests may ALSO fail because of ssh and permissions errors + +## So you will need to run +$sudo chown -Rhv philip:philip ~/$VENAME (if your username is philip) +# and then REBOOT (or at least, exit WSL and terminate and restart WSL) +# because this chmod only takes effect then. + + 'python manage.py test -v 2' + './pre-run.sh' (runs the tests again) + + 'python databaseReset.py reset $VENAME' + 'python manage.py runserver 0.0.0.0:8000 (and allow access when the firewall window pops up)' + " +if [ ! -d /mnt/d/expofiles ]; then + echo '### No valid expofiles directory on /mnt/d . Fix this before any tests will work.' +fi \ No newline at end of file diff --git a/_deploy/xubuntu/pre-push-barbie.sh b/_deploy/xubuntu/pre-push-barbie.sh new file mode 100644 index 0000000..5ea1aa0 --- /dev/null +++ b/_deploy/xubuntu/pre-push-barbie.sh @@ -0,0 +1,46 @@ +#! /bin/sh +# create and sanitise files for pushing to repo, for Babie laptop + +echo deprecations. +python -Wall manage.py check -v 3 2>deprecations.txt >/dev/null +echo diffsettings. +rm diffsettings.txt +if test -f "diffsettings.txt"; then + echo "diffsettings.txt not deleted. You have a serious permissions problem. Aborting.." + exit +fi +python manage.py diffsettings | grep "###" > diffsettings.txt +echo pip freeze. +pip freeze > requirements.txt +echo inspectdb. +# this next line requires database setting to be troggle.sqlite: +python manage.py inspectdb > troggle-inspectdb.py +#egrep -in "unable|error" troggle-inspectdb.py +echo remove passwords. +cp localsettings.py localsettingsXubuntu.py +sed -i '/EXPOUSERPASS/ s/^.*$/EXPOUSERPASS = "nnn:gggggg - real-expo-password---imported-from-localsettings.py"/' diffsettings.txt +sed -i '/EXPOUSERPASS/ s/^.*$/EXPOUSERPASS = "nnn:gggggg - real-expo-password---imported-from-localsettings.py"/' localsettingsXubuntu.py +echo " reset: EXPOUSERPASS = \"nnn:gggggg\" - real-expo-password---imported-from-localsettings.py" + +sed -i '/EXPOADMINUSERPASS/ s/^.*$/EXPOADMINUSERPASS = "gggggg:nnn - real-expo-password---imported-from-localsettings.py"/' diffsettings.txt +sed -i '/EXPOADMINUSERPASS/ s/^.*$/EXPOADMINUSERPASS = "gggggg:nnn - real-expo-password---imported-from-localsettings.py"/' localsettingsXubuntu.py +echo " reset: EXPOUSERPASS = \"gggggg:nnn\" - real-expo-password---imported-from-localsettings.py" + +sed -i '/EMAIL_HOST_PASSWORD/ s/^.*$/EMAIL_HOST_PASSWORD = "real-email-password---imported-from-localsettings.py"/' diffsettings.txt +sed -i '/EMAIL_HOST_PASSWORD/ s/^.*$/EMAIL_HOST_PASSWORD = "real-email-password---imported-from-localsettings.py"/' localsettingsXubuntu.py +echo " reset: EMAIL_HOST_PASSWORD = \"real-email-password--imported-from-localsettings.py\"" + +sed -i '/SECRET_KEY/ s/^.*$/SECRET_KEY = "real-SECRET_KEY--imported-from-localsettings.py"/' diffsettings.txt +sed -i '/SECRET_KEY/ s/^.*$/SECRET_KEY = "real-SECRET_KEY--imported-from-localsettings.py"/' localsettingsXubuntu.py +echo " reset: SECRET_KEY = \"real-SECRET_KEY--imported-from-localsettings.py\"" + +mv _deploy/xubuntu/localsettingsXubuntu.py _deploy/xubuntu/localsettingsXubuntu.py.bak +mv localsettingsXubuntu.py _deploy/xubuntu +# +# Do these before final testing, *not* just before pushing: +# in ./pre-run.sh +# python reset-django.py +# python manage.py makemigrations +# python manage.py test +# python manage.py inspectdb > troggle-inspectdb.py +# egrep -i "unable|error" troggle-inspectdb.py -- cgit v1.2.3