aboutsummaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-09-09 00:50:24 +0200
committerGravatar GitHub <noreply@github.com> 2018-09-09 00:50:24 +0200
commitaafb1cd0e484813541b4eb0ba2a93d9083b1d2fc (patch)
tree0c38c051118ebfd1471c52f10ad4e15dbea3e35a /cli
parentc65f5358904c585ce144885be2fbcd960adaf1e6 (diff)
Better test if server has public address (#2010)
* Better test if server has public address * Wrong trailing slash in documentation
Diffstat (limited to 'cli')
-rw-r--r--cli/README.md2
-rwxr-xr-xcli/do-install.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/cli/README.md b/cli/README.md
index 0d1c0a7d4..c314bd388 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -35,7 +35,7 @@ cd /usr/share/FreshRSS
./cli/prepare.php
# Ensure the needed directories in ./data/
-./cli/do-install.php --default_user admin ( --auth_type form --environment production --base_url https://rss.example.net/ --language en --title FreshRSS --allow_anonymous --api_enabled --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123 --db-base freshrss --db-prefix freshrss )
+./cli/do-install.php --default_user admin ( --auth_type form --environment production --base_url https://rss.example.net --language en --title FreshRSS --allow_anonymous --api_enabled --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123 --db-base freshrss --db-prefix freshrss )
# --auth_type can be: 'form' (default), 'http_auth' (using the Web server access control), 'none' (dangerous)
# --db-type can be: 'sqlite' (default), 'mysql' (MySQL or MariaDB), 'pgsql' (PostgreSQL)
# --base_url should be a public (routable) URL if possible, and is used for push (PubSubHubbub), for some API functions (e.g. favicons), and external URLs in FreshRSS.
diff --git a/cli/do-install.php b/cli/do-install.php
index 4ebba0469..7435ab9f1 100755
--- a/cli/do-install.php
+++ b/cli/do-install.php
@@ -33,7 +33,7 @@ $options = getopt('', array_merge($params, $dBparams));
if (empty($options['default_user'])) {
fail('Usage: ' . basename(__FILE__) . " --default_user admin ( --auth_type form" .
- " --environment production --base_url https://rss.example.net/" .
+ " --environment production --base_url https://rss.example.net" .
" --language en --title FreshRSS --allow_anonymous --api_enabled" .
" --db-type mysql --db-host localhost:3306 --db-user freshrss --db-password dbPassword123" .
" --db-base freshrss --db-prefix freshrss_ --disable_update )");