From d7cb68e95db38c8fdcf702011834a497fd61f557 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 1 Oct 2021 18:25:18 +0200 Subject: [PATCH 1/2] add a hint about the phpmailer addon to the install docs --- doc/Install.md | 3 ++- doc/de/Install.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/Install.md b/doc/Install.md index 80cf051023..2037a48b51 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -32,7 +32,8 @@ Due to the large variety of operating systems and PHP platforms in existence we * PHP *command line* access with register_argc_argv set to true in the php.ini file * Curl, GD, PDO, mbstrings, MySQLi, hash, xml, zip and OpenSSL extensions * The POSIX module of PHP needs to be activated (e.g. [RHEL, CentOS](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) have disabled it) - * some form of email server or email gateway such that PHP mail() works + * some form of email server or email gateway such that PHP mail() works. + If you cannot set up your own email server, you can use the [phpmailer](https://github.com/friendica/friendica-addons/tree/develop/phpmailer) addon and use a remote SMTP server. * MySQL 5.6+ or an equivalent alternative for MySQL (MariaDB, Percona Server etc.) * ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows) * installation into a top-level domain or sub-domain (without a directory/path component in the URL) is RECOMMENDED. Directory paths will not be as convenient to use and have not been thoroughly tested. This is REQUIRED if you wish to communicate with the Diaspora network. diff --git a/doc/de/Install.md b/doc/de/Install.md index c0101f2c20..c557a5a61a 100644 --- a/doc/de/Install.md +++ b/doc/de/Install.md @@ -29,7 +29,8 @@ Requirements * PHP *Kommandozeilen*-Zugang mit register_argc_argv auf "true" gesetzt in der php.ini-Datei * Curl, GD, PDO, MySQLi, xml, zip und OpenSSL-Erweiterung * Das POSIX Modul muss aktiviert sein ([CentOS, RHEL](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) haben dies z.B. deaktiviert) - * etwas in der Art eines Email-Servers oder eines Gateways wie PHP mail() + * Einen E-Mail Server, so dass PHP `mail()` funktioniert. + Wenn kein eigener E-Mail Server zur Verfügung steht, kann alternativ das [phpmailer](https://github.com/friendica/friendica-addons/tree/develop/phpmailer) Addon mit einem externen SMTP Account verwendet werden. * Mysql 5.6+ (oder eine äquivalente Alternative: MariaDB, Percona Server etc.) * die Möglichkeit, wiederkehrende Aufgaben mit cron (Linux/Mac) oder "Scheduled Tasks" einzustellen (Windows) [Beachte: andere Optionen sind in Abschnitt 7 dieser Dokumentation zu finden] * Installation in einer Top-Level-Domain oder Subdomain (ohne eine Verzeichnis/Pfad-Komponente in der URL) wird bevorzugt. Verzeichnispfade sind für diesen Zweck nicht so günstig und wurden auch nicht ausführlich getestet. From 2e6b0f63be45686b8d823fac479a7acc10aef65f Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 1 Oct 2021 18:27:22 +0200 Subject: [PATCH 2/2] small typo --- doc/Install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Install.md b/doc/Install.md index 2037a48b51..6c301a0621 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -32,7 +32,7 @@ Due to the large variety of operating systems and PHP platforms in existence we * PHP *command line* access with register_argc_argv set to true in the php.ini file * Curl, GD, PDO, mbstrings, MySQLi, hash, xml, zip and OpenSSL extensions * The POSIX module of PHP needs to be activated (e.g. [RHEL, CentOS](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) have disabled it) - * some form of email server or email gateway such that PHP mail() works. + * Some form of email server or email gateway such that PHP mail() works. If you cannot set up your own email server, you can use the [phpmailer](https://github.com/friendica/friendica-addons/tree/develop/phpmailer) addon and use a remote SMTP server. * MySQL 5.6+ or an equivalent alternative for MySQL (MariaDB, Percona Server etc.) * ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows)