Browse Source

Setting pleroma initial background

Bob Mottram 7 years ago
parent
commit
98e2865f33
2 changed files with 18 additions and 17 deletions
  1. 7
    11
      src/freedombone-app-pleroma
  2. 11
    6
      src/freedombone-utils-gnusocialtools

+ 7
- 11
src/freedombone-app-pleroma View File

@@ -727,22 +727,18 @@ function install_pleroma {
727 727
 
728 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 735
         echo $"$PLEROMA_DIR/static/config.json file missing"
735 736
         exit 323689
736 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 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 742
     fi
747 743
 
748 744
 

+ 11
- 6
src/freedombone-utils-gnusocialtools View File

@@ -268,26 +268,31 @@ function install_gnusocial_default_background {
268 268
     gnusocial_type=$1
269 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 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 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 280
         else
276 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 283
             fi
279 284
         fi
280 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 288
         return
284 289
     fi
285 290
 
286 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 293
     else
289 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 296
         fi
292 297
     fi
293 298
 }