From 713b433cd3b9d916fb8394c743f8e252937410c2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 1 Jun 2018 18:42:40 +0100
Subject: [PATCH] Disable pixelfed for now

It needs a later version of php than exists in debian
---
 src/freedombone-app-pixelfed | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/freedombone-app-pixelfed b/src/freedombone-app-pixelfed
index d69372f9..74b7e149 100755
--- a/src/freedombone-app-pixelfed
+++ b/src/freedombone-app-pixelfed
@@ -7,6 +7,10 @@
 #
 #                              Freedom in the Cloud
 #
+# Pixeldef app
+#
+# Requires php 7.1.3 but debian version is 7.0.27
+#
 # License
 # =======
 #
@@ -25,7 +29,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VARIANTS='full full-vim'
+VARIANTS=''
 
 IN_DEFAULT_INSTALL=0
 SHOW_ON_ABOUT=1
@@ -316,6 +320,8 @@ function install_pixelfed {
     git checkout "$PIXELFED_COMMIT" -b "$PIXELFED_COMMIT"
     set_completion_param "pixelfed commit" "$PIXELFED_COMMIT"
 
+    install_composer
+
     chmod g+w "/var/www/$PIXELFED_DOMAIN_NAME/htdocs"
     chown -R www-data:www-data "/var/www/$PIXELFED_DOMAIN_NAME/htdocs"
 
@@ -409,7 +415,6 @@ function install_pixelfed {
     sed -i "s|MAIL_HOST=.*|MAIL_HOST=localhost|g" "/var/www/$PIXELFED_DOMAIN_NAME/htdocs/.env"
     sed -i "s|MAIL_PORT=.*|MAIL_PORT=25|g" "/var/www/$PIXELFED_DOMAIN_NAME/htdocs/.env"
 
-    install_composer
     chown -R www-data:www-data "/var/www/$PIXELFED_DOMAIN_NAME/htdocs"
 
     create_site_certificate "$PIXELFED_DOMAIN_NAME" 'yes'