From 7b2b3c02660bf465035a3f6e96541cac4e0e121c Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 16 Feb 2016 10:37:41 +0100 Subject: [PATCH 1/2] Make comments, statements more readable --- setup/management.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup/management.sh b/setup/management.sh index d4d22638..284ce3d2 100755 --- a/setup/management.sh +++ b/setup/management.sh @@ -8,15 +8,16 @@ echo "Installing Mail-in-a-Box system management daemon..." if [ -f /usr/local/lib/python2.7/dist-packages/boto/__init__.py ]; then hide_output pip uninstall -y boto; fi # duplicity uses python 2 so we need to use the python 2 package of boto -# build-essential libssl-dev libffi-dev python3-dev: Required to pip install cryptography. -apt_install python3-flask links duplicity python-boto libyaml-dev python3-dnspython python3-dateutil \ - build-essential libssl-dev libffi-dev python3-dev python-pip +apt_install python3-flask links duplicity python-boto libyaml-dev python3-dnspython python3-dateutil + +# These packages are required for pip to install cryptography. +apt_install build-essential libssl-dev libffi-dev python3-dev python-pip # Install other Python packages. The first line is the packages that Josh maintains himself! +# Fixme: email_validator is repeated in setup/questions.sh hide_output pip3 install --upgrade \ rtyaml "email_validator>=1.0.0" free_tls_certificates \ "idna>=2.0.0" "cryptography>=1.0.2" boto psutil -# email_validator is repeated in setup/questions.sh # Create a backup directory and a random key for encrypting backups. mkdir -p $STORAGE_ROOT/backup From 16aa19187bc9d01f754ac3abf5a42b77cd212eb8 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 16 Feb 2016 10:47:57 +0100 Subject: [PATCH 2/2] Reverting changes introduced in b32cb6 We need to use the pypi version of boto, the other one doesn't work correctly with SIGv4 aws locations --- setup/management.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup/management.sh b/setup/management.sh index 284ce3d2..2e984e1f 100755 --- a/setup/management.sh +++ b/setup/management.sh @@ -4,11 +4,7 @@ source setup/functions.sh echo "Installing Mail-in-a-Box system management daemon..." -# Switching python 2 boto to package manager's, not pypi's. -if [ -f /usr/local/lib/python2.7/dist-packages/boto/__init__.py ]; then hide_output pip uninstall -y boto; fi - -# duplicity uses python 2 so we need to use the python 2 package of boto -apt_install python3-flask links duplicity python-boto libyaml-dev python3-dnspython python3-dateutil +apt_install python3-flask links duplicity libyaml-dev python3-dnspython python3-dateutil # These packages are required for pip to install cryptography. apt_install build-essential libssl-dev libffi-dev python3-dev python-pip @@ -19,6 +15,10 @@ hide_output pip3 install --upgrade \ rtyaml "email_validator>=1.0.0" free_tls_certificates \ "idna>=2.0.0" "cryptography>=1.0.2" boto psutil +# Duplicity uses python2 and requires boto. Thus we need to use the python 2 package of boto. +# The apt-get package lags behind and misses some important bug fixes. +hide_output pip install --upgrade boto + # Create a backup directory and a random key for encrypting backups. mkdir -p $STORAGE_ROOT/backup if [ ! -f $STORAGE_ROOT/backup/secret_key.txt ]; then