瀏覽代碼

Setting pleroma background

Bob Mottram 8 年之前
父節點
當前提交
3e8e274210
共有 2 個文件被更改,包括 11 次插入2 次删除
  1. 2
    2
      src/freedombone-app-postactiv
  2. 9
    0
      src/freedombone-utils-gnusocialtools

+ 2
- 2
src/freedombone-app-postactiv 查看文件

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

+ 9
- 0
src/freedombone-utils-gnusocialtools 查看文件

56
         if [ -d /var/www/${domain_name}/htdocs/static ]; then
56
         if [ -d /var/www/${domain_name}/htdocs/static ]; then
57
             cd /var/www/${domain_name}/htdocs/static
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
             wget $url -O bg_custom.${ext}
65
             wget $url -O bg_custom.${ext}
60
             if [ ! -f bg_custom.${ext} ]; then
66
             if [ ! -f bg_custom.${ext} ]; then
61
                 echo "$url"
67
                 echo "$url"
66
 
72
 
67
             sed -i "s|\"background\":.*|\"background\": \"bg_custom.${ext}\",|g" config.json
73
             sed -i "s|\"background\":.*|\"background\": \"bg_custom.${ext}\",|g" config.json
68
         fi
74
         fi
75
+    else
76
+        echo "2"
77
+        return
69
     fi
78
     fi
70
 
79
 
71
     # customise the logo
80
     # customise the logo