浏览代码

Disable pixelfed for now

It needs a later version of php than exists in debian
Bob Mottram 6 年前
父节点
当前提交
713b433cd3
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7
    2
      src/freedombone-app-pixelfed

+ 7
- 2
src/freedombone-app-pixelfed 查看文件

@@ -7,6 +7,10 @@
7 7
 #
8 8
 #                              Freedom in the Cloud
9 9
 #
10
+# Pixeldef app
11
+#
12
+# Requires php 7.1.3 but debian version is 7.0.27
13
+#
10 14
 # License
11 15
 # =======
12 16
 #
@@ -25,7 +29,7 @@
25 29
 # You should have received a copy of the GNU Affero General Public License
26 30
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
27 31
 
28
-VARIANTS='full full-vim'
32
+VARIANTS=''
29 33
 
30 34
 IN_DEFAULT_INSTALL=0
31 35
 SHOW_ON_ABOUT=1
@@ -316,6 +320,8 @@ function install_pixelfed {
316 320
     git checkout "$PIXELFED_COMMIT" -b "$PIXELFED_COMMIT"
317 321
     set_completion_param "pixelfed commit" "$PIXELFED_COMMIT"
318 322
 
323
+    install_composer
324
+
319 325
     chmod g+w "/var/www/$PIXELFED_DOMAIN_NAME/htdocs"
320 326
     chown -R www-data:www-data "/var/www/$PIXELFED_DOMAIN_NAME/htdocs"
321 327
 
@@ -409,7 +415,6 @@ function install_pixelfed {
409 415
     sed -i "s|MAIL_HOST=.*|MAIL_HOST=localhost|g" "/var/www/$PIXELFED_DOMAIN_NAME/htdocs/.env"
410 416
     sed -i "s|MAIL_PORT=.*|MAIL_PORT=25|g" "/var/www/$PIXELFED_DOMAIN_NAME/htdocs/.env"
411 417
 
412
-    install_composer
413 418
     chown -R www-data:www-data "/var/www/$PIXELFED_DOMAIN_NAME/htdocs"
414 419
 
415 420
     create_site_certificate "$PIXELFED_DOMAIN_NAME" 'yes'