Ver código fonte

Setting pleroma background

Bob Mottram 8 anos atrás
pai
commit
3e8e274210

+ 2
- 2
src/freedombone-app-postactiv Ver arquivo

@@ -240,7 +240,7 @@ function postactiv_set_background_image {
240 240
             if [ ${#temp_background} -gt 0 ]; then
241 241
                 POSTACTIV_BACKGROUND_IMAGE_URL="$temp_background"
242 242
                 write_config_param "POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_BACKGROUND_IMAGE_URL"
243
-                if [[ $(pleroma_set_background_image_from_url "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE") == "0" ]]; then
243
+                if [[ $(pleroma_set_background_image_from_url "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE" | tail -n 1) == "0" ]]; then
244 244
                     dialog --title $"Set PostActiv background" \
245 245
                            --msgbox $"The background image has been set" 6 60
246 246
                 fi
@@ -518,7 +518,7 @@ function install_postactiv_main {
518 518
     postactiv_nginx_site=/etc/nginx/sites-available/$POSTACTIV_DOMAIN_NAME
519 519
     if [[ $ONION_ONLY == "no" ]]; then
520 520
         function_check nginx_http_redirect
521
-        nginx_http_redirect $POSTACTIV_DOMAIN_NAME
521
+        nginx_http_redirect $POSTACTIV_DOMAIN_NAME "index index.php"
522 522
         echo 'server {' >> $postactiv_nginx_site
523 523
         echo '  listen 443 ssl;' >> $postactiv_nginx_site
524 524
         echo '  listen [::]:443 ssl;' >> $postactiv_nginx_site

+ 9
- 0
src/freedombone-utils-gnusocialtools Ver arquivo

@@ -56,6 +56,12 @@ function pleroma_set_background_image_from_url {
56 56
         if [ -d /var/www/${domain_name}/htdocs/static ]; then
57 57
             cd /var/www/${domain_name}/htdocs/static
58 58
 
59
+            # remove any existing image
60
+            if [ -f bg_custom.${ext} ]; then
61
+                rm bg_custom.${ext}
62
+            fi
63
+
64
+            # get the new image
59 65
             wget $url -O bg_custom.${ext}
60 66
             if [ ! -f bg_custom.${ext} ]; then
61 67
                 echo "$url"
@@ -66,6 +72,9 @@ function pleroma_set_background_image_from_url {
66 72
 
67 73
             sed -i "s|\"background\":.*|\"background\": \"bg_custom.${ext}\",|g" config.json
68 74
         fi
75
+    else
76
+        echo "2"
77
+        return
69 78
     fi
70 79
 
71 80
     # customise the logo