From 22a2c3b9bfadaee03adbe5e9209131138502d241 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 28 Jun 2017 15:10:57 +0200 Subject: [PATCH 1/8] added a short note about backups to the INSTALL files --- INSTALL.txt | 12 +++++++++++- doc/Install.md | 8 ++++++++ doc/de/Install.md | 8 ++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index c42c089716..1cab3412e2 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -140,7 +140,17 @@ $a->config['system']['addon'] = 'js_upload,poormancron'; and save your changes. -9. (Optional) Reverse-proxying and HTTPS +9. (Optional) Set up a backup plan + +Bad things will happen. Be them a hardware failure, a currupted database +or whatever you can think of. So once the installation of your Friendica +node is done, you should make yoursef a backup plan. + +The most important file is the `.htconfig.php` file in the base directory. +As it stores all your data, you should also have a recent dump of your +Friendica database at hand, should you have to recover your node. + +10. (Optional) Reverse-proxying and HTTPS Friendica looks for some well-known HTTP headers indicating a reverse-proxy terminating an HTTPS connection. While the standard from RFC 7239 specifies diff --git a/doc/Install.md b/doc/Install.md index 53df55be06..257d627785 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -144,3 +144,11 @@ The addon tree has to be updated separately like so: cd mywebsite/addon git pull + +###Set up a backup plan +Bad things will happen. +Be them a hardware failure, a currupted database or whatever you can think of. +So once the installation of your Friendica node is done, you should make yoursef a backup plan. + +The most important file is the `.htconfig.php` file in the base directory. +As it stores all your data, you should also have a recent dump of your Friendica database at hand, should you have to recover your node. diff --git a/doc/de/Install.md b/doc/de/Install.md index db8fb965d4..7c0b87fbb7 100644 --- a/doc/de/Install.md +++ b/doc/de/Install.md @@ -108,3 +108,11 @@ Du kannst auch weitere Addons/Plugins ergänzen. Ändere den Eintrag folgenderma `$a->config['system']['addon'] = 'js_upload,poormancron';` und speichere deine Änderungen. + +###Erstelle einen Backup Plan +Es werden schlimme Dinge geschehen. +Sei es nun ein Hardwareversage oder eine korrumpierte Datenbank. +Deshalb solltest du dir nachdem die Installation deines Friendica Knotens abgeschlossen ist einen Backup Plan erstellen. + +Die wichtigste Datei ist die `.htconfig.php` im Stammverzeichnis deiner Friendica Installation. +Und da alle Daten in der Datenbank gespeichert werden, solltest du einen nicht all zu alten Dump der Friendica Datenbank zur Hand haben, solltest du deinen Knoten wieder herstellen müssen. From 076cf702b03574d1ec154597b10d333ce5e9f68c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 28 Jun 2017 15:11:35 +0200 Subject: [PATCH 2/8] Added a short usage example of exportet profile data --- doc/Account-Basics.md | 5 ++++- doc/de/Account-Basics.md | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index 854e78b14e..6d7f86c085 100644 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -89,7 +89,10 @@ A ['Tips for New Members'](newmember) link will show up on your network and home Retrieving Personal Data --- -You can export a copy of your personal data in XML format from the "Export personal data" link at the top of your settings page. +You can export a copy of your personal data in JSON format from the "Export personal data" link at the top of your settings page. + +You need this file to relocate your Friendica account to another node. +This might be necessary, e.g. if your node suffers a severe hardware problem and is not recoverable. See Also --- diff --git a/doc/de/Account-Basics.md b/doc/de/Account-Basics.md index 9d2f3ac86c..bfeba69ffe 100644 --- a/doc/de/Account-Basics.md +++ b/doc/de/Account-Basics.md @@ -95,9 +95,11 @@ Ein ['Tipp für neue Mitglieder'](newmember)-Link zeigt sich in den ersten beide **Persönliche Daten exportieren** -Du kannst eine Kopie Deiner persönlichen Daten in einer XML-Datei exportieren. +Du kannst eine Kopie Deiner persönlichen Daten in einer JSON-Datei exportieren. Gehe hierzu in Deinen Einstellungen auf "Persönliche Daten exportieren". +Dies ist z.B. dann nützlich wenn du mit deinem Account auf einen anderen Friendica Knoten umziehen möchstest. +Ein Grund hierfür könnte sein, dass der Server auf dem dieser Friendica Knoten läuft dauerhaft wegen eines Hardware Problems ausfällt. **Schau Dir ebenfalls folgende Seiten an** From dd250174b89d6e906c65ac7ead595ef87b50a1b0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 30 Jun 2017 10:38:11 +0200 Subject: [PATCH 3/8] Let there be... --- INSTALL.txt | 8 ++++---- doc/Install.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index 1cab3412e2..0faa021756 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -140,11 +140,11 @@ $a->config['system']['addon'] = 'js_upload,poormancron'; and save your changes. -9. (Optional) Set up a backup plan +9. (Recommended) Set up a backup plan -Bad things will happen. Be them a hardware failure, a currupted database -or whatever you can think of. So once the installation of your Friendica -node is done, you should make yoursef a backup plan. +Bad things will happen. Let there be them a hardware failure, a currupted +database or whatever you can think of. So once the installation of your +Friendica node is done, you should make yoursef a backup plan. The most important file is the `.htconfig.php` file in the base directory. As it stores all your data, you should also have a recent dump of your diff --git a/doc/Install.md b/doc/Install.md index 257d627785..100ca411f6 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -147,7 +147,7 @@ The addon tree has to be updated separately like so: ###Set up a backup plan Bad things will happen. -Be them a hardware failure, a currupted database or whatever you can think of. +Let there be them a hardware failure, a currupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. The most important file is the `.htconfig.php` file in the base directory. From 4593f43254aae1bda40c8b348e16bc28fc11b4c6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 30 Jun 2017 13:15:47 +0200 Subject: [PATCH 4/8] Update INSTALL.txt --- INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index 0faa021756..eac8f39c81 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -142,7 +142,7 @@ and save your changes. 9. (Recommended) Set up a backup plan -Bad things will happen. Let there be them a hardware failure, a currupted +Bad things will happen. Let there be a hardware failure, a currupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. From 1a7dce6814daaa39d6b331a27a2177385b2e807d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 30 Jun 2017 13:16:29 +0200 Subject: [PATCH 5/8] Update Install.md --- doc/Install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Install.md b/doc/Install.md index 100ca411f6..22f68ce5a2 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -147,7 +147,7 @@ The addon tree has to be updated separately like so: ###Set up a backup plan Bad things will happen. -Let there be them a hardware failure, a currupted database or whatever you can think of. +Let there be a hardware failure, a currupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. The most important file is the `.htconfig.php` file in the base directory. From 089d58527ee099ff1320aca9593f391bc5412b8d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 2 Jul 2017 07:51:31 +0200 Subject: [PATCH 6/8] Update INSTALL.txt --- INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index eac8f39c81..b271a9929a 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -142,7 +142,7 @@ and save your changes. 9. (Recommended) Set up a backup plan -Bad things will happen. Let there be a hardware failure, a currupted +Bad things will happen. Let there be a hardware failure, a corupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. From 29e9705d2679b2afd88ea089d999de6a5b82b759 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 2 Jul 2017 07:52:07 +0200 Subject: [PATCH 7/8] Update Install.md --- doc/Install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Install.md b/doc/Install.md index 22f68ce5a2..a57888f98b 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -147,7 +147,7 @@ The addon tree has to be updated separately like so: ###Set up a backup plan Bad things will happen. -Let there be a hardware failure, a currupted database or whatever you can think of. +Let there be a hardware failure, a corrupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. The most important file is the `.htconfig.php` file in the base directory. From 87bcc1db971d7d754918362a4e45c822b8d34ec2 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 2 Jul 2017 21:39:15 +0200 Subject: [PATCH 8/8] Update INSTALL.txt --- INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index b271a9929a..592d3f5557 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -142,7 +142,7 @@ and save your changes. 9. (Recommended) Set up a backup plan -Bad things will happen. Let there be a hardware failure, a corupted +Bad things will happen. Let there be a hardware failure, a corrupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan.