Bläddra i källkod

Move pleroma frontend to backend directory

Bob Mottram 7 år sedan
förälder
incheckning
35bd3d34a5

+ 2
- 2
src/freedombone-app-gnusocial Visa fil

232
             if [ ${#temp_background} -gt 0 ]; then
232
             if [ ${#temp_background} -gt 0 ]; then
233
                 GNUSOCIAL_BACKGROUND_IMAGE_URL="$temp_background"
233
                 GNUSOCIAL_BACKGROUND_IMAGE_URL="$temp_background"
234
                 write_config_param "GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_BACKGROUND_IMAGE_URL"
234
                 write_config_param "GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_BACKGROUND_IMAGE_URL"
235
-                if [[ $(pleroma_set_background_image_from_url "$GNUSOCIAL_DOMAIN_NAME" "$GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_TITLE" | tail -n 1) == "0" ]]; then
235
+                if [[ $(pleroma_set_background_image_from_url /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs "$GNUSOCIAL_DOMAIN_NAME" "$GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_TITLE" | tail -n 1) == "0" ]]; then
236
                     dialog --title $"Set GNU Social login background" \
236
                     dialog --title $"Set GNU Social login background" \
237
                            --msgbox $"The background image has been set" 6 60
237
                            --msgbox $"The background image has been set" 6 60
238
                 fi
238
                 fi
924
     gnusocial_use_qvitter gnusocial
924
     gnusocial_use_qvitter gnusocial
925
 
925
 
926
     if [ $GNUSOCIAL_BACKGROUND_IMAGE_URL ]; then
926
     if [ $GNUSOCIAL_BACKGROUND_IMAGE_URL ]; then
927
-        pleroma_set_background_image_from_url "$GNUSOCIAL_DOMAIN_NAME" "$GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_TITLE"
927
+        pleroma_set_background_image_from_url /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs "$GNUSOCIAL_DOMAIN_NAME" "$GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_TITLE"
928
     fi
928
     fi
929
 
929
 
930
     APP_INSTALLED=1
930
     APP_INSTALLED=1

+ 28
- 18
src/freedombone-app-pleroma Visa fil

238
             if [ ${#temp_background} -gt 0 ]; then
238
             if [ ${#temp_background} -gt 0 ]; then
239
                 PLEROMA_BACKGROUND_IMAGE_URL="$temp_background"
239
                 PLEROMA_BACKGROUND_IMAGE_URL="$temp_background"
240
                 write_config_param "PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_BACKGROUND_IMAGE_URL"
240
                 write_config_param "PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_BACKGROUND_IMAGE_URL"
241
-                if [[ $(pleroma_set_background_image_from_url "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE" | tail -n 1) == "0" ]]; then
241
+                if [[ $(pleroma_set_background_image_from_url $PLEROMA_DIR "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE" | tail -n 1) == "0" ]]; then
242
                     dialog --title $"Set Pleroma login background" \
242
                     dialog --title $"Set Pleroma login background" \
243
                            --msgbox $"The background image has been set" 6 60
243
                            --msgbox $"The background image has been set" 6 60
244
                 fi
244
                 fi
262
                 PLEROMA_TITLE="$new_title"
262
                 PLEROMA_TITLE="$new_title"
263
                 PLEROMA_DOMAIN_NAME=$(get_completion_param "pleroma domain")
263
                 PLEROMA_DOMAIN_NAME=$(get_completion_param "pleroma domain")
264
                 write_config_param "PLEROMA_TITLE" "$PLEROMA_TITLE"
264
                 write_config_param "PLEROMA_TITLE" "$PLEROMA_TITLE"
265
-                cd /var/www/$PLEROMA_DOMAIN_NAME/htdocs/static
266
-                sed -i "s|\"name\":.*|\"name\": \"${PLEROMA_TITLE}\",|g" config.json
265
+                sed -i "s|\"name\":.*|\"name\": \"${PLEROMA_TITLE}\",|g" $PLEROMA_DIR/static/config.json
267
                 sed -i "s|name: .*|name: \"${PLEROMA_TITLE}\",|g" $PLEROMA_DIR/config/config.exs
266
                 sed -i "s|name: .*|name: \"${PLEROMA_TITLE}\",|g" $PLEROMA_DIR/config/config.exs
268
                 systemctl restart pleroma
267
                 systemctl restart pleroma
269
                 dialog --title $"Set Pleroma title" \
268
                 dialog --title $"Set Pleroma title" \
527
     install_nodejs pleroma-backend
526
     install_nodejs pleroma-backend
528
     install_postgresql
527
     install_postgresql
529
 
528
 
530
-    if [ ! -d /var/www/$PLEROMA_DOMAIN_NAME ]; then
531
-        mkdir /var/www/$PLEROMA_DOMAIN_NAME
529
+    if [ ! -d /var/www/${PLEROMA_DOMAIN_NAME}/htdocs ]; then
530
+        mkdir -p /var/www/${PLEROMA_DOMAIN_NAME}/htdocs
532
     fi
531
     fi
533
     if [ -d $PLEROMA_DIR ]; then
532
     if [ -d $PLEROMA_DIR ]; then
534
         rm -rf $PLEROMA_DIR
533
         rm -rf $PLEROMA_DIR
635
     echo '  # include snippets/well-known.conf;' >> $pleroma_nginx_site
634
     echo '  # include snippets/well-known.conf;' >> $pleroma_nginx_site
636
     echo '}' >> $pleroma_nginx_site
635
     echo '}' >> $pleroma_nginx_site
637
 
636
 
638
-    function_check create_site_certificate
639
-    create_site_certificate $PLEROMA_DOMAIN_NAME 'yes'
640
-
641
-    function_check nginx_ensite
642
-    nginx_ensite $PLEROMA_DOMAIN_NAME
643
-
644
-    systemctl restart postgresql
645
-    systemctl restart nginx
646
-
647
-    set_completion_param "pleroma domain" "$PLEROMA_DOMAIN_NAME"
648
-
649
 
637
 
650
     # back end
638
     # back end
651
     cd $PLEROMA_DIR
639
     cd $PLEROMA_DIR
668
     # front end
656
     # front end
669
     install_pleroma_front_end "pleroma" "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE"
657
     install_pleroma_front_end "pleroma" "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE"
670
     install_gnusocial_default_background "gnusocial" "$PLEROMA_DOMAIN_NAME"
658
     install_gnusocial_default_background "gnusocial" "$PLEROMA_DOMAIN_NAME"
671
-    sed -i 's|"theme":.*|"theme": "base16-apathy.css",|g' /var/www/${PLEROMA_DOMAIN_NAME}/htdocs/static/config.json
659
+    if [ ! -f $PLEROMA_DIR/static/config.json ]; then
660
+        echo $"$PLEROMA_DIR/static/config.json file missing"
661
+        exit 323689
662
+    fi
663
+    sed -i 's|"theme":.*|"theme": "base16-apathy.css",|g' $PLEROMA_DIR/static/config.json
672
 
664
 
673
     if [ $PLEROMA_BACKGROUND_IMAGE_URL ]; then
665
     if [ $PLEROMA_BACKGROUND_IMAGE_URL ]; then
674
-        pleroma_set_background_image_from_url "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE"
666
+        pleroma_set_background_image_from_url $PLEROMA_DIR "$PLEROMA_DOMAIN_NAME" "$PLEROMA_BACKGROUND_IMAGE_URL" "$PLEROMA_TITLE"
667
+    fi
668
+
669
+    if [ ! -f $PLEROMA_DIR/index.html ]; then
670
+        echo $'Pleroma index file missing'
671
+        exit 7825393
675
     fi
672
     fi
676
 
673
 
677
 
674
 
675
+    # Get certificate
676
+    function_check create_site_certificate
677
+    create_site_certificate $PLEROMA_DOMAIN_NAME 'yes'
678
+
679
+    function_check nginx_ensite
680
+    nginx_ensite $PLEROMA_DOMAIN_NAME
681
+
682
+    systemctl restart postgresql
683
+    systemctl restart nginx
684
+
685
+    set_completion_param "pleroma domain" "$PLEROMA_DOMAIN_NAME"
686
+
687
+
678
     # daemon
688
     # daemon
679
     echo '[Unit]' > /etc/systemd/system/pleroma.service
689
     echo '[Unit]' > /etc/systemd/system/pleroma.service
680
     echo 'Description=Pleroma social network' >> /etc/systemd/system/pleroma.service
690
     echo 'Description=Pleroma social network' >> /etc/systemd/system/pleroma.service

+ 2
- 2
src/freedombone-app-postactiv Visa fil

248
                 POSTACTIV_BACKGROUND_IMAGE_URL="$temp_background"
248
                 POSTACTIV_BACKGROUND_IMAGE_URL="$temp_background"
249
                 write_config_param "POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_BACKGROUND_IMAGE_URL"
249
                 write_config_param "POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_BACKGROUND_IMAGE_URL"
250
 
250
 
251
-                if [[ $(pleroma_set_background_image_from_url "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE" | tail -n 1) == "0" ]]; then
251
+                if [[ $(pleroma_set_background_image_from_url /var/www/$POSTACTIV_DOMAIN_NAME/htdocs "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE" | tail -n 1) == "0" ]]; then
252
                     dialog --title $"Set PostActiv background" \
252
                     dialog --title $"Set PostActiv background" \
253
                            --msgbox $"The background image has been set" 6 60
253
                            --msgbox $"The background image has been set" 6 60
254
                 fi
254
                 fi
945
     gnusocial_use_qvitter postactiv
945
     gnusocial_use_qvitter postactiv
946
 
946
 
947
     if [ $POSTACTIV_BACKGROUND_IMAGE_URL ]; then
947
     if [ $POSTACTIV_BACKGROUND_IMAGE_URL ]; then
948
-        pleroma_set_background_image_from_url "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
948
+        pleroma_set_background_image_from_url /var/www/$POSTACTIV_DOMAIN_NAME/htdocs "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
949
     fi
949
     fi
950
 
950
 
951
     APP_INSTALLED=1
951
     APP_INSTALLED=1

+ 26
- 14
src/freedombone-utils-gnusocialtools Visa fil

88
 }
88
 }
89
 
89
 
90
 function pleroma_set_background_image_from_url {
90
 function pleroma_set_background_image_from_url {
91
-    domain_name="$1"
92
-    url="$2"
93
-    title="$3"
91
+    basedir="$1"
92
+    domain_name="$2"
93
+    url="$3"
94
+    title="$4"
94
 
95
 
95
     if [ ${#domain_name} -eq 0 ]; then
96
     if [ ${#domain_name} -eq 0 ]; then
96
         echo "1"
97
         echo "1"
111
     fi
112
     fi
112
 
113
 
113
     if [ ${#ext} -gt 0 ]; then
114
     if [ ${#ext} -gt 0 ]; then
114
-        cd /var/www/${domain_name}/htdocs
115
+        cd $basedir
115
 
116
 
116
         # remove any existing image
117
         # remove any existing image
117
         if [ -f bg_custom.${ext} ]; then
118
         if [ -f bg_custom.${ext} ]; then
127
             return
128
             return
128
         fi
129
         fi
129
 
130
 
130
-        if [ -d /var/www/${domain_name}/htdocs/static ]; then
131
+        if [ -d $basedir/static ]; then
131
             cp bg_custom.${ext} static/bg_custom.${ext}
132
             cp bg_custom.${ext} static/bg_custom.${ext}
132
             chown www-data:www-data static/bg_custom.${ext}
133
             chown www-data:www-data static/bg_custom.${ext}
133
             sed -i "s|\"background\":.*|\"background\": \"/static/bg_custom.${ext}\",|g" static/config.json
134
             sed -i "s|\"background\":.*|\"background\": \"/static/bg_custom.${ext}\",|g" static/config.json
134
         fi
135
         fi
135
 
136
 
136
-        qvitter_update_background ${domain_name} ${ext}
137
+        if [[ "$basedir" != $PLEROMA_DIR ]]; then
138
+            qvitter_update_background ${domain_name} ${ext}
139
+        fi
137
 
140
 
138
         rm bg_custom.${ext}
141
         rm bg_custom.${ext}
139
     else
142
     else
142
     fi
145
     fi
143
 
146
 
144
     # customise the logo
147
     # customise the logo
145
-    if [ -f /var/www/${domain_name}/htdocs/static/logo.png ]; then
148
+    if [ -f $basedir/static/logo.png ]; then
146
         if [ -f ~/freedombone/img/logo_fbone3.png ]; then
149
         if [ -f ~/freedombone/img/logo_fbone3.png ]; then
147
-            cp ~/freedombone/img/logo_fbone3.png /var/www/${domain_name}/htdocs/static/logo.png
150
+            cp ~/freedombone/img/logo_fbone3.png $basedir/static/logo.png
148
         else
151
         else
149
             if [ -f /home/$MY_USERNAME/freedombone/img/logo_fbone3.png ]; then
152
             if [ -f /home/$MY_USERNAME/freedombone/img/logo_fbone3.png ]; then
150
-                cp /home/$MY_USERNAME/freedombone/img/logo_fbone3.png /var/www/${domain_name}/htdocs/static/logo.png
153
+                cp /home/$MY_USERNAME/freedombone/img/logo_fbone3.png $basedir/static/logo.png
151
             fi
154
             fi
152
         fi
155
         fi
153
     fi
156
     fi
154
 
157
 
155
     # customise the title
158
     # customise the title
156
-    if [ -f /var/www/${domain_name}/htdocs/static/config.json ]; then
157
-        sed -i "s|\"name\":.*|\"name\": \"${title}\",|g" /var/www/${domain_name}/htdocs/static/config.json
159
+    if [ -f $basedir/static/config.json ]; then
160
+        sed -i "s|\"name\":.*|\"name\": \"${title}\",|g" $basedir/static/config.json
158
     fi
161
     fi
159
 
162
 
160
     echo "0"
163
     echo "0"
328
         exit 5282682
331
         exit 5282682
329
     fi
332
     fi
330
 
333
 
331
-    cp -r $INSTALL_DIR/pleroma/dist/* /var/www/${pleroma_domain}/htdocs/
334
+    if [[ "$app_name" != 'pleroma' ]]; then
335
+        cp -r $INSTALL_DIR/pleroma/dist/* /var/www/${pleroma_domain}/htdocs/
336
+        pleroma_set_background_image_from_url /var/www/${pleroma_domain}/htdocs "$pleroma_domain" "$background_url" "$title"
337
+    else
338
+        cp -r $INSTALL_DIR/pleroma/dist/* $PLEROMA_DIR
339
+        pleroma_set_background_image_from_url $PLEROMA_DIR "$pleroma_domain" "$background_url" "$title"
340
+    fi
332
 
341
 
333
-    pleroma_set_background_image_from_url "$pleroma_domain" "$background_url" "$title"
334
 
342
 
335
     nginx_site=/etc/nginx/sites-available/${pleroma_domain}
343
     nginx_site=/etc/nginx/sites-available/${pleroma_domain}
336
     sed -i 's|index index.php;|index index.html;|g' $nginx_site
344
     sed -i 's|index index.php;|index index.html;|g' $nginx_site
345
         rm -rf /root/.cache/yarn
353
         rm -rf /root/.cache/yarn
346
     fi
354
     fi
347
 
355
 
348
-    chown -R www-data:www-data /var/www/${pleroma_domain}/htdocs
356
+    if [[ "$app_name" != 'pleroma' ]]; then
357
+        chown -R www-data:www-data /var/www/${pleroma_domain}/htdocs
358
+    else
359
+        chown -R pleroma:pleroma $PLEROMA_DIR
360
+    fi
349
 }
361
 }
350
 
362
 
351
 function upgrade_pleroma_frontend {
363
 function upgrade_pleroma_frontend {