Merge branch 'stretch' of https://github.com/bashrc/freedombone

src/freedombone-app-matrix

@@ -51,7 +51,7 @@ MATRIX_PORT=8009
 MATRIX_FEDERATION_ONION_PORT=8111
 MATRIX_ONION_PORT=8109
 MATRIX_REPO="https://github.com/matrix-org/synapse"
-MATRIX_COMMIT='552f123bea1014680ab798b7e34cd1b23424a189'
+MATRIX_COMMIT='ddb00efc1ddec646d02e8def6053003f04d077d7'
 REPORT_STATS="no"
 MATRIX_SECRET=
 MATRIX_EXPIRE_MONTHS=1
@@ -422,6 +422,7 @@ function upgrade_matrix {
     set_repo_commit /etc/matrix "matrix commit" "$MATRIX_COMMIT" $MATRIX_REPO
     cd /etc/matrix || exit 62476724
     pip install --upgrade --process-dependency-links .
+    pip install --upgrade --force "pynacl>=1.2.1"
 
     sed -i 's/ssl.PROTOCOL_SSLv23/ssl.PROTOCOL_TLSv1/g' /usr/local/bin/register_new_matrix_user
 

src/freedombone-app-pleroma

@@ -47,7 +47,7 @@ PLEROMA_CODE=
 PLEROMA_PORT=4000
 PLEROMA_ONION_PORT=8011
 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git"
-PLEROMA_COMMIT='312a8783f8dbf563ea9d5af3cc7991ca553dc286'
+PLEROMA_COMMIT='59a76ea464998476f8c4814324647f4ae4a7f2cb'
 PLEROMA_ADMIN_PASSWORD=
 PLEROMA_DIR=/etc/pleroma
 PLEROMA_SECRET_KEY=""
@@ -938,6 +938,18 @@ function remove_pleroma {
     remove_ddns_domain "$PLEROMA_DOMAIN_NAME"
 }
 
+function image_install_pleroma {
+    if [[ "$SOCIALINSTANCE" != 'pleroma' ]]; then
+        return
+    fi
+
+    # shellcheck disable=SC2154
+    chroot "$rootdir" apt-get -yq install wget imagemagick
+
+    image_install_elixir
+    image_install_postgresql
+}
+
 function install_pleroma {
     if [ ! $ONION_ONLY ]; then
         ONION_ONLY='no'
@@ -1019,7 +1031,7 @@ function install_pleroma {
         function_check nginx_security_options
         nginx_security_options "$PLEROMA_DOMAIN_NAME"
 
-        { echo '  add_header Strict-Transport-Security max-age=15768000;';
+        { echo '  add_header Strict-Transport-Security max-age=0;';
           echo '';
           echo '  # Logs';
           echo '  access_log /dev/null;';

src/freedombone-image-customise

@@ -2162,12 +2162,12 @@ create_generic_image
 atheros_wifi
 continue_installation
 image_install_nodejs
-image_install_elixir
 initialise_mesh
 configure_wifi
 configure_user_interface
 image_setup_utils
 image_install_inadyn
+image_install_pleroma
 image_preinstall_repos
 
 # remove downloaded packages

src/freedombone-utils-postgresql

@@ -49,7 +49,7 @@ function get_postgresql_password {
     fi
 }
 
-function mesh_install_postgresql {
+function image_install_postgresql {
     # shellcheck disable=SC2154,SC2086
     chroot "$rootdir" apt-get -yq install $POSTGRESQL_PACKAGES
 
@@ -66,7 +66,7 @@ function mesh_install_postgresql {
 
 function install_postgresql {
     if [[ $VARIANT == "mesh"* ]]; then
-        mesh_install_postgresql
+        image_install_postgresql
         return
     fi