diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index a20df877..d2f866a6 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -313,8 +313,15 @@ function upgrade_gnusocial { rm /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/install.php fi + if [ -d $INSTALL_DIR/pleroma ]; then + if [ -f /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index.php ]; then + mv /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index.php /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index_qvitter.php + fi + fi + gnusocial_hourly_script gnusocial $GNUSOCIAL_DOMAIN_NAME upgrade_pleroma "$GNUSOCIAL_DOMAIN_NAME" "gnusocial" "$GNUSOCIAL_BACKGROUND_IMAGE_URL" "$GNUSOCIAL_TITLE" + chown -R www-data:www-data /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs } diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv index 501e97a4..c2b3cf1e 100755 --- a/src/freedombone-app-postactiv +++ b/src/freedombone-app-postactiv @@ -295,10 +295,17 @@ function upgrade_postactiv { rm /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/install.php fi + if [ -d $INSTALL_DIR/pleroma ]; then + if [ -f /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index.php ]; then + mv /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index.php /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index_qvitter.php + fi + fi + function_check postactiv_running_script postactiv_running_script upgrade_pleroma "$POSTACTIV_DOMAIN_NAME" "postactiv" "$POSTACTIV_BACKGROUND_IMAGE_URL" "$POSTACTIV_TITLE" + chown -R www-data:www-data /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs } diff --git a/src/freedombone-utils-gnusocialtools b/src/freedombone-utils-gnusocialtools index 00367b67..23dee140 100755 --- a/src/freedombone-utils-gnusocialtools +++ b/src/freedombone-utils-gnusocialtools @@ -211,6 +211,13 @@ function install_pleroma { nginx_site=/etc/nginx/sites-available/${pleroma_domain} sed -i 's|index index.php;|index index.html;|g' $nginx_site + + if [ -f /var/www/${pleroma_domain}/htdocs/index.php ]; then + mv /var/www/${pleroma_domain}/htdocs/index.php /var/www/${pleroma_domain}/htdocs/index_qvitter.php + fi + sed -i 's|index.php|index_qvitter.php|g' $nginx_site + + chown -R www-data:www-data /var/www/${pleroma_domain}/htdocs } function upgrade_pleroma { @@ -229,6 +236,11 @@ function upgrade_pleroma { fi cp -r $INSTALL_DIR/pleroma/dist/* /var/www/${domain_name}/htdocs/ pleroma_set_background_image_from_url "$domain_name" "$background_url" "$title" + + if [ -f /var/www/${domain_name}/htdocs/index.php ]; then + mv /var/www/${domain_name}/htdocs/index.php /var/www/${domain_name}/htdocs/index_qvitter.php + fi + chown -R www-data:www-data /var/www/${domain_name}/htdocs else install_pleroma "${app_name}" "${domain_name}" "${background_url}" "${title}" fi