From cc6c529562ef5751133d97e3fec067c0072f215b Mon Sep 17 00:00:00 2001 From: berumuron Date: Fri, 26 Mar 2021 19:41:33 +0100 Subject: tec: Remove data/do-install.txt (#3555) * Remove file data/do-install.txt This file was painful during update because we had to remember to delete it each time. It added a security issue by allowing an attacker to reinstall FreshRSS during the update process. The (more powerful) file data/applied_migrations.txt has been introduced in 8619cf6fa to replace do-install.txt. We had to wait for at least one release in order to make sure existing instances of FreshRSS created the migration file. It should be ok now. * Replace i18n install.not_deleted key * Update documentation to update FreshRSS --- docs/en/admins/04_Updating.md | 5 ++--- docs/en/admins/07_LinuxUpdate.md | 9 +-------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'docs') diff --git a/docs/en/admins/04_Updating.md b/docs/en/admins/04_Updating.md index 30a6ba1f7..2004d5318 100644 --- a/docs/en/admins/04_Updating.md +++ b/docs/en/admins/04_Updating.md @@ -23,9 +23,8 @@ Generally, the update procedure via git works as follows: 3. Perform a hard reset to discard local changes. 4. Delete manual additions. Be sure to move your backup out of the directory before doing this step! 5. Pull the new version. -6. Remove `./data/do-install.txt`. -7. Re-set group read (and write, if you wish) permissions on all files in `.`, and group write permissions on `./data/`. +6. Re-set group read (and write, if you wish) permissions on all files in `.`, and group write permissions on `./data/`. ## Updating from a Zip Archive -Updating to a new version from a zip archive is always an option. Begin by unzipping the archive into your FreshRSS directory, overwriting old files, remove `./data/do-install.txt`, and finally re-set group read (and write, if you wish) permissions on all files in `.` and group write permissions on `./data/`. +Updating to a new version from a zip archive is always an option. Begin by unzipping the archive into your FreshRSS directory, overwriting old files, and finally re-set group read (and write, if you wish) permissions on all files in `.` and group write permissions on `./data/`. diff --git a/docs/en/admins/07_LinuxUpdate.md b/docs/en/admins/07_LinuxUpdate.md index 6f39f5a45..c1b2da5f5 100644 --- a/docs/en/admins/07_LinuxUpdate.md +++ b/docs/en/admins/07_LinuxUpdate.md @@ -65,13 +65,7 @@ git status The command should tell you the tag that you're using. It must be the same as the one associated with [the latest release on GitHub](https://github.com/FreshRSS/FreshRSS/releases/latest). If you use the rolling release, it should tell you that your `edge` branch is up to date with `origin`. -6. Delete the file that triggers the install wizard - -```sh -rm data/do-install.txt -``` - -7. Re-set correct permissions so that your web server can access the files +6. Re-set correct permissions so that your web server can access the files ```sh chown -R :www-data . && chmod -R g+r . && chmod -R g+w ./data/ @@ -112,6 +106,5 @@ chown -R :www-data . && chmod -R g+r . && chmod -R g+w ./data/ ```sh rm -f freshrss.zip -rm -f data/do-install.txt rm -rf FreshRSS-*/ ``` -- cgit v1.2.3