From 21b239cbc7dad7b1ef09b7977eea117d2eadc963 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 25 Aug 2017 02:49:25 +0000 Subject: [PATCH] Documentation was updated. (Reference to poormancron removed) --- doc/Install.md | 14 +------------- doc/de/Install.md | 13 +------------ mod/admin.php | 2 +- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/doc/Install.md b/doc/Install.md index a57888f98b..06ae77352b 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -112,19 +112,7 @@ You can generally find the location of PHP by executing "which php". If you run into trouble with this section please contact your hosting provider for assistance. Friendica will not work correctly if you cannot perform this step. -Alternative: You may be able to use the 'poormancron' plugin to perform this step. -To do this, edit the file ".htconfig.php" and look for a line describing your plugins. -On a fresh installation, it will look like this: - - $a->config['system']['addon'] = 'js_upload'; - -It indicates the "js_upload" addon module is enabled. -You may add additional addons/plugins using this same line in the configuration file. -Change it to read - - $a->config['system']['addon'] = 'js_upload,poormancron'; - -and save your changes. +If it is not possible to set up a cron job then please activate the "frontend worker" in the administration interface. Once you have installed Friendica and created an admin account as part of the process, you can access the admin panel of your installation and do most of the server wide configuration from there diff --git a/doc/de/Install.md b/doc/de/Install.md index 7c0b87fbb7..344117c56a 100644 --- a/doc/de/Install.md +++ b/doc/de/Install.md @@ -96,18 +96,7 @@ Du kannst den PHP-Pfad finden, indem du den Befehl „which php“ ausführst. Wenn du Schwierigkeiten mit diesem Schritt hast, kannst du deinen Hosting-Anbieter kontaktieren. Friendica wird nicht korrekt laufen, wenn dieser Schritt nicht erfolgreich abgeschlossen werden kann. -Alternativ kannst du das Plugin 'poormancron' nutzen, um diesen Schritt durchzuführen, wenn du eine aktuelle Friendica-Version nutzt. -Um dies zu machen, musst du die ".htconfig.php" an der Stelle anpassen, die dein Plugin beschreibt. -In einer frischen Installation sieht es aus wie: - -`$a->config['system']['addon'] = 'js_upload';` - -Dies setzt voraus, dass das Addon-Modul "js_upload" aktiviert ist. -Du kannst auch weitere Addons/Plugins ergänzen. Ändere den Eintrag folgendermaßen ab: - -`$a->config['system']['addon'] = 'js_upload,poormancron';` - -und speichere deine Änderungen. +Falls das Einrichten des cron nicht möglich ist, kannst Du alternativ den "frontend worker" vom Administrationsinterface aus aktivieren. ###Erstelle einen Backup Plan Es werden schlimme Dinge geschehen. diff --git a/mod/admin.php b/mod/admin.php index 90bc8c0fc5..fbc096800c 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1233,7 +1233,7 @@ function admin_page_site(App $a) { '$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), get_config('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")), '$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), get_config('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")), '$worker_fastlane' => array('worker_fastlane', t("Enable fastlane"), get_config('system','worker_fastlane'), t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")), - '$worker_frontend' => array('worker_frontend', t('Enable frontend worker'), get_config('system','frontend_worker'), t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call yourdomain.tld/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server. The worker background process needs to be activated for this.')), + '$worker_frontend' => array('worker_frontend', t('Enable frontend worker'), get_config('system','frontend_worker'), sprintf(t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.'), App::get_baseurl())), '$form_security_token' => get_form_security_token("admin_site")