Bladeren bron

update to populate qvitter notifications table

Bob Mottram 8 jaren geleden
bovenliggende
commit
1e5784cd8e
3 gewijzigde bestanden met toevoegingen van 18 en 5 verwijderingen
  1. 1
    3
      src/freedombone-app-gnusocial
  2. 12
    2
      src/freedombone-app-postactiv
  3. 5
    0
      src/freedombone-utils-gnusocialtools

+ 1
- 3
src/freedombone-app-gnusocial Bestand weergeven

470
         rm /etc/cron.hourly/gnusocial-daemons
470
         rm /etc/cron.hourly/gnusocial-daemons
471
     fi
471
     fi
472
     remove_backup_database_local gnusocial
472
     remove_backup_database_local gnusocial
473
-    if [ -d $INSTALL_DIR/pleroma ]; then
474
-        rm -rf $INSTALL_DIR/pleroma
475
-    fi
476
 
473
 
477
     function_check remove_ddns_domain
474
     function_check remove_ddns_domain
478
     remove_ddns_domain $GNUSOCIAL_DOMAIN_NAME
475
     remove_ddns_domain $GNUSOCIAL_DOMAIN_NAME
779
     cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/local/plugins/Sharings
776
     cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/local/plugins/Sharings
780
     php scripts/seedsharings.php
777
     php scripts/seedsharings.php
781
     cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs
778
     cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs
779
+    php scripts/upgrade.php
782
     php scripts/checkschema.php
780
     php scripts/checkschema.php
783
 
781
 
784
     # Languages
782
     # Languages

+ 12
- 2
src/freedombone-app-postactiv Bestand weergeven

771
     fi
771
     fi
772
 
772
 
773
     install_postactiv_main
773
     install_postactiv_main
774
+    install_qvitter "$POSTACTIV_DOMAIN_NAME" "postactiv"
774
 
775
 
775
-    #install_qvitter "$POSTACTIV_DOMAIN_NAME" "postactiv"
776
     #function_check install_nodejs
776
     #function_check install_nodejs
777
     #install_nodejs pleroma-postactiv
777
     #install_nodejs pleroma-postactiv
778
-    #install_pleroma "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
778
+
779
+    # Currently Pleroma won't install on ARM systems
780
+    # because it uses node-sass which doesn't support ARM
781
+    if [[ "$(arch)" == "arm"* ]]; then
782
+        echo -m $'WARNING: Pleroma currently does not support ARM '
783
+        echo $'architecture, so it will not be installed'
784
+    else
785
+        function_check install_nodejs
786
+        install_nodejs pleroma-gnusocial
787
+        install_pleroma "postactiv" "$POSTACTIV_DOMAIN_NAME" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE"
788
+    fi
779
 
789
 
780
     expire_postactiv_posts
790
     expire_postactiv_posts
781
 
791
 

+ 5
- 0
src/freedombone-utils-gnusocialtools Bestand weergeven

150
 
150
 
151
     chown -R www-data:www-data /var/www/${domain_name}/htdocs
151
     chown -R www-data:www-data /var/www/${domain_name}/htdocs
152
 
152
 
153
+    cd /var/www/${domain_name}/htdocs
154
+    php scripts/upgrade.php
155
+    php scripts/checkschema.php
156
+    chown -R www-data:www-data /var/www/${domain_name}/htdocs
157
+
153
     set_completion_param "${app_name} theme commit" "$QVITTER_THEME_COMMIT"
158
     set_completion_param "${app_name} theme commit" "$QVITTER_THEME_COMMIT"
154
 
159
 
155
     install_completed ${app_name}_theme
160
     install_completed ${app_name}_theme