浏览代码

Setting pleroma initial background

Bob Mottram 7 年前
父节点
当前提交
98e2865f33
共有 2 个文件被更改,包括 18 次插入17 次删除
  1. 7
    11
      src/freedombone-app-pleroma
  2. 11
    6
      src/freedombone-utils-gnusocialtools

+ 7
- 11
src/freedombone-app-pleroma 查看文件

727
 
727
 
728
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a pleroma -p "$PLEROMA_ADMIN_PASSWORD"
728
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a pleroma -p "$PLEROMA_ADMIN_PASSWORD"
729
 
729
 
730
-    # front end
731
-    install_pleroma_front_end "pleroma" "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE"
732
-    install_gnusocial_default_background "gnusocial" "$PLEROMA_DOMAIN_NAME"
733
-    if [ ! -f $PLEROMA_DIR/static/config.json ]; then
730
+    # NOTE: we don't need to install the frontend separately,
731
+    # since the backend contains a precompiled version of it
732
+
733
+    install_gnusocial_default_background "pleroma" "$PLEROMA_DOMAIN_NAME"
734
+    if [ ! -f $PLEROMA_DIR/priv/static/static/config.json ]; then
734
         echo $"$PLEROMA_DIR/static/config.json file missing"
735
         echo $"$PLEROMA_DIR/static/config.json file missing"
735
         exit 323689
736
         exit 323689
736
     fi
737
     fi
737
-    sed -i 's|"theme":.*|"theme": "base16-apathy.css",|g' $PLEROMA_DIR/static/config.json
738
+    sed -i 's|"theme":.*|"theme": "base16-apathy.css",|g' $PLEROMA_DIR/priv/static/static/config.json
738
 
739
 
739
     if [ $PLEROMA_BACKGROUND_IMAGE_URL ]; then
740
     if [ $PLEROMA_BACKGROUND_IMAGE_URL ]; then
740
-        pleroma_set_background_image_from_url $PLEROMA_DIR "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE"
741
-    fi
742
-
743
-    if [ ! -f $PLEROMA_DIR/index.html ]; then
744
-        echo $'Pleroma index file missing'
745
-        exit 7825393
741
+        pleroma_set_background_image_from_url $PLEROMA_DIR/priv/static "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE"
746
     fi
742
     fi
747
 
743
 
748
 
744
 

+ 11
- 6
src/freedombone-utils-gnusocialtools 查看文件

268
     gnusocial_type=$1
268
     gnusocial_type=$1
269
     domain_name=$2
269
     domain_name=$2
270
 
270
 
271
+    basedir=/var/www/${domain_name}/htdocs
272
+    if [[ "$gnusocial_type" == 'pleroma' ]]; then
273
+        basedir=$PLEROMA_DIR/priv/static
274
+    fi
275
+
271
     # customise the logo
276
     # customise the logo
272
-    if [ -f /var/www/${domain_name}/htdocs/static/logo.png ]; then
277
+    if [ -f $basedir/static/logo.png ]; then
273
         if [ -f ~/freedombone/img/logo_fbone3.png ]; then
278
         if [ -f ~/freedombone/img/logo_fbone3.png ]; then
274
-            cp ~/freedombone/img/logo_fbone3.png /var/www/${domain_name}/htdocs/static/logo.png
279
+            cp ~/freedombone/img/logo_fbone3.png $basedir/static/logo.png
275
         else
280
         else
276
             if [ -f /home/$MY_USERNAME/freedombone/img/logo_fbone3.png ]; then
281
             if [ -f /home/$MY_USERNAME/freedombone/img/logo_fbone3.png ]; then
277
-                cp /home/$MY_USERNAME/freedombone/img/logo_fbone3.png /var/www/${domain_name}/htdocs/static/logo.png
282
+                cp /home/$MY_USERNAME/freedombone/img/logo_fbone3.png $basedir/static/logo.png
278
             fi
283
             fi
279
         fi
284
         fi
280
     fi
285
     fi
281
 
286
 
282
-    if [ ! -f /var/www/${domain_name}/htdocs/static/bg.jpg ]; then
287
+    if [ ! -f $basedir/static/bg.jpg ]; then
283
         return
288
         return
284
     fi
289
     fi
285
 
290
 
286
     if [ -f ~/freedombone/img/backgrounds/${gnusocial_type}.jpg ]; then
291
     if [ -f ~/freedombone/img/backgrounds/${gnusocial_type}.jpg ]; then
287
-        cp ~/freedombone/img/backgrounds/${gnusocial_type}.jpg /var/www/${domain_name}/htdocs/static/bg.jpg
292
+        cp ~/freedombone/img/backgrounds/${gnusocial_type}.jpg $basedir/static/bg.jpg
288
     else
293
     else
289
         if [ -f /home/$MY_USERNAME/freedombone/img/backgrounds/${gnusocial_type}.jpg ]; then
294
         if [ -f /home/$MY_USERNAME/freedombone/img/backgrounds/${gnusocial_type}.jpg ]; then
290
-            cp /home/$MY_USERNAME/freedombone/img/backgrounds/${gnusocial_type}.jpg /var/www/${domain_name}/htdocs/static/bg.jpg
295
+            cp /home/$MY_USERNAME/freedombone/img/backgrounds/${gnusocial_type}.jpg $basedir/static/bg.jpg
291
         fi
296
         fi
292
     fi
297
     fi
293
 }
298
 }