Closed helson22 closed 1 year ago
Hi @helson22, It looks like the files of your instance are in a messy state, so the new version files are not being fully used.
git status
within your BookStack directory?git log -n 1
within your BookStack directory?Hi Dan,
thanks for your fast reply :-)
I do all you suggest on your documentation-pages.
Installed with ubuntu script: https://www.bookstackapp.com/docs/admin/installation/#ubuntu-2204
Updating like this: https://www.bookstackapp.com/docs/admin/updates/
I do not anything from your second question.
git status
gives:
git log -n 1
shows:
XXXXXXXXXXXXXX@YYYYYYYYYYY:/var/www/bookstack$ git log -n 1
commit 2ac9efae7d1d5169f71fc9a2b76a1980e6703b0a (HEAD -> release)
Author: Dan Brown <ssddanbrown@googlemail.com>
Date: Thu Sep 8 12:41:09 2022 +0100
Updated version and assets for release v22.09
Okay, looks like it's on the original line of code, just in a very messy state for some reason. Maybe like someone has tried to upate via manually copying/uploading files. I see a custom owa/
folder in there but that should not interfere too much.
Before the below, please backup everything, so the whole machine or the database and files. Just in the event things go wrong and you lose content. Once done try running git reset --hard
. After running that you should have a much cleaner git status
output since most of the code files should be reset to their expected state. Then re-run through the update commands one-at-a-time, noting the original output at each point to share if things still don't work after. Just need to hope development files have not been used at any point here.
Ok, I'sure that nobody copied files manually but obviously there is something wrong... The owa is a open web analytics folder. I deleted it because it's not in use - because I have no clue how to make it run within Bookstack folder and without subdomain...
Do you think all might be OK when updating to the next version or is this probably not true?
If you've done the above, and have reset files to their expected sate, then you should be fine in the future since your code is now as expected, but hard to say for sure without knowing what caused this set of changes originally.
Ok,
git reset --hard gives
HEAD is now at 2ac9efae Updated version and assets for release v22.09
then git status
says:
On branch release Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded. (use "git pull" to update your local branch)
Untracked files:
(use "git add
Do you think I can safely update to latest version now?
Do you think I can safely update to latest version now?
You still have a lot of extra files that are part of future updates, might cause problems.
You could remove these via running git clean -f
but BACKUP ALL FILES FIRST since this command does delete files.
After running that, git status
should show no untracked files like it does now. Then upgrading should be safe. Again though, hard to say for sure without knowing what caused this set of changes originally
Hi,
thanx for responding so fast :-)
I've done git clean -f
with folowing output
Removing .env.bak Removing .github/workflows/analyse-php.yml Removing .github/workflows/lint-php.yml Removing .github/workflows/test-php.yml Removing app/Api/ApiEntityListFormatter.php Removing app/Auth/Permissions/PermissionFormData.php Removing app/Http/Controllers/Auth/ThrottlesLogins.php Removing app/Http/Controllers/PermissionsController.php Removing app/Providers/ValidationRuleServiceProvider.php Removing app/Providers/ViewTweaksServiceProvider.php Removing database/migrations/2022_10_07_091406_flatten_entity_permissions_table.php Removing database/migrations/2022_10_08_104202_drop_entity_restricted_field.php Removing dev/docs/development.md Removing dev/docs/javascript-code.md Removing dev/docs/release-process.md Removing phpcs.xml Removing resources/icons/groups.svg Removing resources/icons/role.svg Removing resources/js/components/entity-permissions.js Removing resources/js/components/pointer.js Removing resources/js/wysiwyg/icons.js Removing resources/views/form/entity-permissions-row.blade.php Removing tests/Auth/RegistrationTest.php Removing tests/Auth/ResetPasswordTest.php Removing tests/Helpers/EntityProvider.php Removing tests/Helpers/TestServiceProvider.php
Then git status
meant:
On branch release Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded. (use "git pull" to update your local branch)
Untracked files:
(use "git add
nothing added to commit but untracked files present (use "git add" to track)
Now I get a white page when I want to access bookstack
Go through the update process, one command at a time, recording output and sharing any errors that occur.
Error at first command
git pull origin release
From https://github.com/BookStackApp/BookStack
Stopped procedure now due to abort. Any Ideas? :-)
git status
is the same output as previous post
Delete the resources/lang/el/
directory and try again.
Ok, question who should own all the files an directories? www-data? Can different permissions cause such mess?
From https://github.com/BookStackApp/BookStack
git status
On branch release Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded. (use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add/rm
Untracked files:
(use "git add
no changes added to commit (use "git add" and/or "git commit -a")
Sorry is there a possibility to make such text block collapsable?
Depends on the directory and the login user you want to use for updates and stuff. Here's my general approach to permissions: https://gist.github.com/ssddanbrown/f0e6e850e57c419c6541dbe6c8facd4b
Here you can see the difference form two folders of the resources/lang directory ro and de for example
adm-bookstack@xxxxxxxxx :/var/www/bookstack$ ls -la resources/lang/ro total 112 drwxr-xr-x 2 adm-bookstack root 4096 Sep 14 07:32 . drwxr-xr-x 45 adm-bookstack www-data 4096 Dec 7 15:12 .. -rw-r--r-- 1 root root 3440 Sep 14 07:32 activities.php -rw-r--r-- 1 root root 8832 Sep 14 07:32 auth.php -rw-r--r-- 1 root root 3416 Sep 14 07:32 common.php -rw-r--r-- 1 root root 1441 Sep 14 07:32 components.php -rw-r--r-- 1 root root 6684 Sep 14 07:32 editor.php -rw-r--r-- 1 root root 22870 Sep 14 07:32 entities.php -rw-r--r-- 1 root root 7883 Sep 14 07:32 errors.php -rw-r--r-- 1 root root 239 Sep 14 07:32 pagination.php -rw-r--r-- 1 root root 619 Sep 14 07:32 passwords.php -rw-r--r-- 1 root root 23953 Sep 14 07:32 settings.php -rw-r--r-- 1 root root 7310 Sep 14 07:32 validation.php adm-bookstack@xxxxxxxx :/var/www/bookstack$ ls -la resources/lang/de total 128 drwxr-xr-x 2 adm-bookstack www-data 4096 Dec 7 15:12 . drwxr-xr-x 45 adm-bookstack www-data 4096 Dec 7 15:12 .. -rw-rw-r-- 1 adm-bookstack adm-bookstack 3608 Dec 7 15:12 activities.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 9173 Dec 7 15:12 auth.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 3487 Dec 7 15:12 common.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 1420 Dec 7 15:12 components.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 6841 Dec 7 15:12 editor.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 24754 Dec 7 15:12 entities.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 8607 Dec 7 15:12 errors.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 241 Aug 18 07:22 pagination.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 680 Aug 18 07:22 passwords.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 1046 Dec 7 15:12 preferences.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 25580 Dec 7 15:12 settings.php -rw-rw-r-- 1 adm-bookstack adm-bookstack 6994 Dec 7 15:12 validation.php
As you can see the owner and group is root in ro-folder since in de-folder ist adm-bookstack what it should be I think. Actually I don't know how this could happened.
Hello again,
I set permissions, owner and groups as suggested.
Still getting git error.
I also get the white page when I try accessing bookstack in browser. Even if I rename the messy Folder and copy the whole Bookstack Folder from Backup to /var/www/bookstack
Not so funny now :-(
I have made backup from the whole bookstack directory as mentioned above an a phpmyadmin mysql backup.
Is there a cleaner way without trying around with th messy installation? Should I reinstall? How?
Thank you in advance!
I'm not clear what is currently messy. What git error are you getting?
I'm sorry.
The git pull command aborts and throws error (https://github.com/BookStackApp/BookStack/issues/3862#issuecomment-1341032767)
I "compressed" the output above an post it here again, would be easier for you I think.
error: Your local changes to the following files would be overwritten by merge: .github/translators.txt .github/workflows/test-migrations.yml LICENSE app/Actions/TagRepo.php .... .... resources/lang/zh_CN/preferences.php resources/lang/zh_TW/preferences.php resources/sass/_opacity.scss resources/views/auth/parts/login-message.blade.php resou Aborting
in the middle of the huge list above following shows up: error: The following untracked working tree files would be overwritten by merge: .... .... ...
I don't know if this is ok or not - I guess not.
git status
says:
On branch release Your branch is behind 'origin/release' by 161 commits, and can be fast-forwarded. (use "git pull" to update your local branch)
Changes not staged for commit: (use "git add/rm ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: .github/translators.txt deleted: .github/workflows/phpstan.yml deleted: .github/workflows/phpunit.yml ... ... modified: tests/User/UserPreferencesTest.php modified: tests/User/UserProfileTest.php modified: version
Untracked files: (use "git add ..." to include in what will be committed) .github/workflows/analyse-php.yml .github/workflows/lint-php.yml .github/workflows/test-php.yml app/Actions/Queries/ .... ... .... tests/Auth/ResetPasswordTest.php tests/Helpers/EntityProvider.php tests/Helpers/TestServiceProvider.php
no changes added to commit (use "git add" and/or "git commit -a")
Okay, you're still not at a clean state for some reason.
Ideally we first, before attempting an update, need to be in a position where running git status
does not list any files.
git reset --hard
.git clean -f
then run git clean -f -d
.git status
. If there are any files/folders listed stop here and report back the output.git pull origin release
first update command and report back the output.git status
again. Stop and report back the output if any files are listed.Hi again,
done till number 5 with no errors I think. This time I attached a TXT with all the output. For me it looks good.
If it looks good for you too I can proceed, I guess? Or have I missed something?
I had a second look at the output.
Is this normal behaviour, that some of the entries seem not completed? f.e. rename resources/views/{entities => common}/sort.blade.php (52%)
There are a few that show no 100%.
Is this severe?
Hello Dan,
I figured out that the precentage is a GIT similarity index.
That's why I tried to continue the update procedure and it worked!
Thank you very, very much for your help! - Keep up the good work! :-)
BR helson
Ah, apologies, I forgot to respond to the above. Good to hear things are now working! I'll therefore close this off. Remember to take a backup/snapshot now while things are working and in a clean state!
Attempted Debugging
Searched GitHub Issues
Describe the Scenario
Afteer Update to latest v22.10.2 search shouts at me with "An unknown error occurred". Also, when trying to create a link in HTML Editor an search for existing content/link - the some content is displayed but search within this dialogou only shows the falling dots.
In the logs section below I posted log-file contents after doeing a search. I treid to do the update procedure a second time. The console output is also shown below.
Exact BookStack Version
v22.10.2
Log Content
PHP Version
8.1.2-1ubuntu2.8
Hosting Environment
Ubuntu 22.04.1 LTS