diff --git a/bin/dev/vagrant_provision.sh b/bin/dev/vagrant_provision.sh index 46459fd869..7078b84d64 100755 --- a/bin/dev/vagrant_provision.sh +++ b/bin/dev/vagrant_provision.sh @@ -129,7 +129,7 @@ bin/console user password "$USER_NICK" "$USER_PASSW" # create cronjob - activate if you have enough memory in you dev VM # cronjob runs as www-data user echo ">>> Installing cronjob" -echo "*/10 * * * * www-data cd /vagrant; /usr/bin/php bin/worker.php" >> /etc/cron.d/friendica +echo "*/10 * * * * www-data cd /vagrant; /usr/bin/php bin/console.php worker" >> /etc/cron.d/friendica # friendica needs write access to /tmp chmod 777 /tmp diff --git a/doc/Install.md b/doc/Install.md index a80483792f..68bc934776 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -268,7 +268,7 @@ You might wish to delete/rename `config/local.config.php` to another name and dr Set up a cron job or scheduled task to run the worker once every 5-10 minutes in order to perform background processing. Example: - cd /base/directory; /path/to/php bin/worker.php + cd /base/directory; /path/to/php bin/console.php worker Change "/base/directory", and "/path/to/php" as appropriate for your situation. @@ -277,7 +277,7 @@ Change "/base/directory", and "/path/to/php" as appropriate for your situation. If you are using a Linux server, run "crontab -e" and add a line like the one shown, substituting for your unique paths and settings: - */10 * * * * cd /home/myname/mywebsite; /usr/bin/php bin/worker.php + */10 * * * * cd /home/myname/mywebsite; /usr/bin/php bin/console.php worker 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. @@ -426,7 +426,7 @@ provided by one of our members. > > */10 * * * * cd /var/www/friendica/friendica/ && sudo -u www-data /usr/bin/php \ > -d suhosin.executor.func.blacklist=none \ -> -d suhosin.executor.eval.blacklist=none -f bin/worker.php +> -d suhosin.executor.eval.blacklist=none -f bin/console.php > > This worked well for simple test cases, but the friendica-cron still failed > with a fatal error: @@ -435,7 +435,7 @@ provided by one of our members. > (attacker 'REMOTE_ADDR not set', file '/var/www/friendica/friendica/boot.php', > line 1341) > -> After a while I noticed, that `bin/worker.php` calls further PHP script via `proc_open`. +> After a while I noticed, that `bin/console.php worker` calls further PHP script via `proc_open`. > These scripts themselves also use `proc_open` and fail, because they are NOT > called with `-d suhosin.executor.func.blacklist=none`. > diff --git a/doc/Migrate.md b/doc/Migrate.md index e116d029f6..ca0e0d0d95 100644 --- a/doc/Migrate.md +++ b/doc/Migrate.md @@ -55,9 +55,9 @@ You should see an output like this: Finally, you may also want to optimise your database with the following command: ``mysqloptimize -p friendica-db`` -### Going offline +### Going offline Stop background tasks and put your server in maintenance mode. -1. If you had set up a worker cron job like this ``*/10 * * * * cd /var/www/friendica; /usr/bin/php bin/worker.php`` run ``crontab -e`` and comment out this line. Alternatively if you deploy a worker daemon, disable this instead. +1. If you had set up a worker cron job like this ``*/10 * * * * cd /var/www/friendica; /usr/bin/php bin/console.php worker`` run ``crontab -e`` and comment out this line. Alternatively if you deploy a worker daemon, disable this instead. 2. Put your server into maintenance mode: ``bin/console maintenance 1 "We are currently upgrading our system and will be back soon."`` ## Dumping DB @@ -73,12 +73,12 @@ Import your database on your new server: ``mysql -p friendica_db < your-friendic ### Configuration file Copy your old server's configuration file to ``config/local.config.php``. -Ensure the newly created database credentials are identical to the setting in the configuration file; otherwise update them accordingly. +Ensure the newly created database credentials are identical to the setting in the configuration file; otherwise update them accordingly. ### Cron job for worker Set up the required daily cron job. Run ``crontab -e`` and add the following line according to your system specification -``*/10 * * * * cd /var/www/friendica; /usr/bin/php bin/worker.php`` +``*/10 * * * * cd /var/www/friendica; /usr/bin/php bin/console.php worker`` ### DNS settings Adjust your DNS records by pointing them to your new server. diff --git a/doc/de/Install.md b/doc/de/Install.md index 147a9aebc7..ae910e6fab 100644 --- a/doc/de/Install.md +++ b/doc/de/Install.md @@ -210,13 +210,13 @@ Gehe in den Friendica-Hauptordner und führe den Kommandozeilen Befehl aus: Erstelle einen Cron job oder einen regelmäßigen Task, um den Poller alle 5-10 Minuten im Hintergrund ablaufen zu lassen. Beispiel: - cd /base/directory; /path/to/php bin/worker.php + cd /base/directory; /path/to/php bin/console.php worker Ändere "/base/directory" und "/path/to/php" auf deine Systemvorgaben. Wenn du einen Linux-Server nutzt, benutze den Befehl "crontab -e" und ergänze eine Zeile wie die Folgende; angepasst an dein System -`*/10 * * * * cd /home/myname/mywebsite; /usr/bin/php bin/worker.php` +`*/10 * * * * cd /home/myname/mywebsite; /usr/bin/php bin/console.php worker` 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. diff --git a/mods/sample-systemd.service b/mods/sample-systemd.service index aae2e5825c..ac37359989 100644 --- a/mods/sample-systemd.service +++ b/mods/sample-systemd.service @@ -6,4 +6,4 @@ Description=Friendica Worker User=http #Adapt the path in the following line to your system, use 'which php' to find php path, #provide the absolute path for worker.php -ExecStart=/usr/bin/php /www/path/bin/worker.php & +ExecStart=/usr/bin/php /www/path/bin/console.php worker & diff --git a/src/Core/Worker.php b/src/Core/Worker.php index c81b0be967..533da588c4 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -1207,7 +1207,7 @@ class Worker if (Worker\Daemon::isMode() && DI::config()->get('system', 'worker_fork')) { self::forkProcess($do_cron); } else { - DI::system()->run('bin/worker.php', ['no_cron' => !$do_cron]); + DI::system()->run('bin/console.php worker', ['no_cron' => !$do_cron]); } if (Worker\Daemon::isMode()) { Worker\IPC::SetJobState(false);