Error after updating (CLI)

ericosman

[root@srv1 public_html]# sudo -u mhinfra git status

On branch master

Your branch is up to date with 'origin/master'.

Untracked files:

(use "git add <file>..." to include in what will be committed)

    .user.ini

    account_add_modal.php

    account_edit_modal.php

    admin_api_key_add_modal.php

    admin_bulk_mail.php

    admin_category_add_modal.php

    admin_category_edit_modal.php

    admin_custom_link_add_modal.php

    admin_custom_link_edit_modal.php

    admin_document_template_add_modal.php

    admin_document_template_edit_modal.php

    admin_legacy_debug.php

    admin_mail_queue_message_view.php

    admin_project_template_add_modal.php

    admin_project_template_edit_modal.php

    admin_project_template_ticket_template_add_modal.php

    admin_role_add_modal.php

    admin_role_edit_modal.php

    admin_settings_maintenance.php

    admin_side_nav.php

    admin_software_template_add_modal.php

    admin_software_template_edit_modal.php

    admin_tag_add_modal.php

    admin_tag_edit_modal.php

    admin_tax_add_modal.php

    admin_tax_edit_modal.php

    admin_ticket_status_add_modal.php

    admin_ticket_status_edit_modal.php

    admin_ticket_template_add_modal.php

    admin_ticket_template_edit_modal.php

    admin_user_add_modal.php

    admin_user_all_reset_password_modal.php

    admin_user_archive_modal.php

    admin_user_edit_modal.php

    admin_user_export_modal.php

    admin_user_invite_modal.php

    admin_vendor_template_add_modal.php

    admin_vendor_template_edit_modal.php

    app_version.php

    base32static.php

    budget_create_modal.php

    budget_edit_modal.php

    calendar_add_modal.php

    calendar_edit_modal.php

    calendar_event_add_modal.php

    calendar_event_edit_modal.php

    calendar_events.php

    check_login.php

    client_add_modal.php

    client_asset_add_modal.php

    client_asset_bulk_add_ticket_modal.php

    client_asset_bulk_assign_contact_modal.php

    client_asset_bulk_assign_location_modal.php

    client_asset_bulk_edit_status_modal.php

    client_asset_copy_modal.php

    client_asset_details.php

    client_asset_documents_modal.php

    client_asset_edit_modal.php

    client_asset_export_modal.php

    client_asset_import_modal.php

    client_asset_interface_add_modal.php

    client_asset_interface_edit_modal.php

    client_asset_transfer_modal.php

    client_assets.php

    client_certificate_add_modal.php

    client_certificate_edit_modal.php

    client_certificate_export_modal.php

    client_certificates.php

    client_contact_add_modal.php

    client_contact_archive_modal.php

    client_contact_bulk_assign_location_modal.php

    client_contact_bulk_assign_tags_modal.php

    client_contact_bulk_edit_department_modal.php

    client_contact_bulk_edit_phone_modal.php

    client_contact_bulk_edit_role_modal.php

    client_contact_bulk_email_modal.php

    client_contact_create_note_modal.php

    client_contact_details.php

    client_contact_edit_modal.php

    client_contact_export_modal.php

    client_contact_import_modal.php

    client_contact_invite_modal.php

    client_contact_link_asset_modal.php

    client_contact_link_credential_modal.php

    client_contact_link_document_modal.php

    client_contact_link_file_modal.php

    client_contact_link_service_modal.php

    client_contact_link_software_modal.php

    client_contacts.php

    client_delete_modal.php

    client_document_add_file_relation_modal.php

    client_document_add_from_template_modal.php

    client_document_add_modal.php

    client_document_bulk_move_modal.php

    client_document_edit_modal.php

    client_document_link_asset_modal.php

    client_document_link_contact_modal.php

    client_document_link_file_modal.php

    client_document_link_software_modal.php

    client_document_link_vendor_modal.php

    client_document_move_modal.php

    client_document_rename_modal.php

    client_document_view_modal.php

    client_domain_add_modal.php

    client_domain_edit_modal.php

    client_domain_export_modal.php

    client_domains.php

    client_download_pdf_modal.php

    client_edit_modal.php

    client_events.php

    client_export_modal.php

    client_file_bulk_move_modal.php

    client_file_delete_modal.php

    client_file_link_asset_modal.php

    client_file_move_modal.php

    client_file_rename_modal.php

    client_file_upload_modal.php

    client_file_view_modal.php

    client_import_modal.php

    client_invoice_export_modal.php

    client_invoices.php

    client_location_add_modal.php

    client_location_bulk_assign_tags_modal.php

    client_location_edit_modal.php

    client_location_export_modal.php

    client_location_import_modal.php

    client_locations.php

    client_login_add_modal.php

    client_login_bulk_assign_tags_modal.php

    client_login_edit_modal.php

    client_login_export_modal.php

    client_login_import_modal.php

    client_logins.php

    client_network_add_modal.php

    client_network_edit_modal.php

    client_network_export_modal.php

    client_networks.php

    client_payment_export_modal.php

    client_payments.php

    client_quote_export_modal.php

    client_quotes.php

    client_rack_add_modal.php

    client_rack_edit_modal.php

    client_rack_unit_add_modal.php

    client_recurring_export_modal.php

    client_recurring_invoices.php

    client_recurring_tickets.php

    client_service_add_modal.php

    client_service_edit_modal.php

    client_service_view_modal.php

    client_services.php

    client_side_nav.php

    client_software.php

    client_software_add_from_template_modal.php

    client_software_add_modal.php

    client_software_edit_modal.php

    client_software_export_modal.php

    client_ticket_export_modal.php

    client_tickets.php

    client_trip_export_modal.php

    client_trips.php

    client_vendor_export_modal.php

    client_vendors.php

    cron.php

    cron_certificate_refresher.php

    cron_domain_refresher.php

    cron_mail_queue.php

    cron_ticket_email_parser.php

    css/guest_pay_invoice_stripe.css

    css/style.css

    custom_field_create_modal.php

    custom_field_edit_modal.php

    database_version.php

    dist/

    document_edit_visibility_modal.php

    expense_add_modal.php

    expense_bulk_edit_account_modal.php

    expense_bulk_edit_category_modal.php

    expense_bulk_edit_client_modal.php

    expense_copy_modal.php

    expense_edit_modal.php

    expense_export_modal.php

    expense_refund_modal.php

    filter_header.php

    folder_create_modal.php

    folder_rename_modal.php

    footer.php

    force_mfa.php

    get_settings.php

    global.css

    guest_ajax.php

    guest_download_file.php

    guest_footer.php

    guest_header.php

    guest_pay_invoice_stripe.php

    guest_post.php

    guest_view_invoice.php

    guest_view_item.php

    guest_view_quote.php

    guest_view_ticket.php

    header.php

    inc_alert_feedback.php

    inc_all.php

    inc_all_admin.php

    inc_all_client.php

    inc_all_reports.php

    inc_all_user.php

    inc_client_top_head.php

    inc_confirm_modal.php

    inc_debug.php

    inc_set_timezone.php

    inc_wrapper.php

    invoice_add_modal.php

    invoice_add_ticket_modal.php

    invoice_copy_modal.php

    invoice_edit_modal.php

    invoice_export_modal.php

    invoice_note_modal.php

    invoice_payment_add_bulk_modal.php

    invoice_payment_add_modal.php

    invoice_recurring_add_modal.php

    item_edit_modal.php

    itflow-master.zip

    js/certificate_edit_modal.js

    js/domain_edit_modal.js

    js/logins_generate_password.js

    js/logins_show_otp_via_id.js

    js/network_edit_modal.js

    js/quote_edit_modal.js

    js/recurring_tickets_edit_modal.js

    notifications_dismissed.php

    pagination.php

    plugins/sweetalert2-theme-bootstrap-4/

    plugins/sweetalert2/

    portal/

    post/admin/admin_bulk_mail.php

    post/admin_update.php

    product_add_modal.php

    product_bulk_edit_category_modal.php

    product_edit_modal.php

    product_export_modal.php

    project_add_modal.php

    project_edit_modal.php

    project_ticket_add_modal.php

    quote_add_modal.php

    quote_copy_modal.php

    quote_edit_modal.php

    quote_note_modal.php

    quote_to_invoice_modal.php

    recurring_expense_create_modal.php

    recurring_expense_edit_modal.php

    recurring_invoice_add_modal.php

    recurring_invoice_edit_modal.php

    recurring_invoice_note_modal.php

    recurring_payment_add_modal.php

    recurring_ticket_add_modal.php

    recurring_ticket_edit_modal.php

    report_assets.php

    report_domains.php

    report_password_rotation.php

    reports_side_nav.php

    revenue_add_modal.php

    revenue_edit_modal.php

    rfc6238.php

    settings_localization_array.php

    setup_cli.php

    share_modal.php

    side_nav.php

    task_edit_modal.php

    temp_bulk_close_bugfix.php

    test.md

    test.php

    ticket_add_modal.php

    ticket_add_watcher_modal.php

    ticket_assign_modal.php

    ticket_bulk_add_project_modal.php

    ticket_bulk_assign_modal.php

    ticket_bulk_edit_priority_modal.php

    ticket_bulk_merge_modal.php

    ticket_bulk_reply_modal.php

    ticket_bulk_resolve_modal.php

    ticket_change_client_modal.php

    ticket_edit_asset_modal.php

    ticket_edit_billable_modal.php

    ticket_edit_contact_modal.php

    ticket_edit_modal.php

    ticket_edit_priority_modal.php

    ticket_edit_schedule_modal.php

    ticket_edit_vendor_modal.php

    ticket_invoice_add_modal.php

    ticket_merge_modal.php

    ticket_reply_edit_modal.php

    top_nav.php

    top_nav_tickets_modal.php

    transfer_add_modal.php

    transfer_edit_modal.php

    trip_add_modal.php

    trip_copy_modal.php

    trip_edit_modal.php

    trip_export_modal.php

    update_cli.php

    user_side_nav.php

    vendor/

    vendor_add_from_template_modal.php

    vendor_add_modal.php

    vendor_contact_add_modal.php

    vendor_contact_edit_modal.php

    vendor_edit_modal.php

nothing added to commit but untracked files present (use "git add" to track)

wrongecho

Something is wrong with your git configuration, have you modified any files yourself?

Assuming you have a vm snapshot, you could try doing git reset --hard

ericosman

No VM snapshot :-( well i guess i'm cooked

wrongecho

You should really be taking snapshots/backups before you update, but in this context I meant take a snapshot now and then run that command - snapshot being so you can easily revert if something goes wrong.

If you haven't tried to use the web UI to run these database updates, you should be fine to continue with how you're going. From the sound of it, you're not even pulling down the latest database files so you're safe for now.

ericosman

I try to login, then go to 2FA.

Enter my 2FA, and then it goes back to the login page.

I did git reset --hard but no solution yet.

wrongecho

So even after running git reset --hard you're still not able to run a git pull to get the latest files?

Also, you didn't answer whether you'd manually modified any files?

ericosman

Hi,

Correct, besides that i had to run this today:

sudo git config --global --add safe.directory /home/USER/domains/THE_DOMAIN/public_html

Otherwise it did nothing.

wrongecho

Also, you didn't answer whether you'd manually modified any files?

ericosman

No, the only thing i did was sudo git config --global --add safe.directory /home/USER/domains/THE_DOMAIN/public_html

wrongecho

I would:

Snapshot the VM, so you can rollback to this point in time
Take a backup of the entire domain/public_html folder
Copy/move config.php and the uploads folder up one level
Delete the entire folder public_html folder
Clone the repo again as www-data (sudo - u www-data git clone https://github.com/itflow-org/itflow.git .)
Move config.php and the uploads folder back into the folder
Run the database updates with the cli script

ericosman

Thanks, this worked, only i had to manualy edit database_version.php to say

<?php

* ITFlow

* This file defines the current "latest" database version

* It is used in conjunction with database_updates.php

DEFINE("LATEST_DATABASE_VERSION", "2.1.3");

After updating multiple times it worked!

wrongecho

ericosman Great! That file should have been included in your git pull though so not sure if future updates are going to work as you'd expect. Keep an eye on that.