From 0ce633a3bfaa6043a113cfb991fea633f2adbf0a Mon Sep 17 00:00:00 2001 From: Bartek Fabiszewski Date: Fri, 22 Feb 2019 20:22:27 +0100 Subject: [PATCH] Update documentation --- Dockerfile | 1 + README.md | 8 ++++---- config.default.php | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a80b6a8..b71557f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ LABEL maintainer="Bartek Fabiszewski (https://github.com/bfabiszewski)" ARG DB_ROOT_PASS=secret1 ARG DB_USER_PASS=secret2 +# supported drivers: mysql, pgsql, sqlite ARG DB_DRIVER=mysql ENV ULOGGER_ADMIN_USER admin diff --git a/README.md b/README.md index cb956ca..b2d6aa7 100755 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ Together with a dedicated [μlogger mobile client](https://github.com/bfabiszews - altitudes graph - multiple users - user authentication -- Google Maps API v3 -- OpenLayers v2 or v3 (OpenStreet and other layers) +- Google Maps +- OpenLayers (OpenStreet and other layers) - ajax - user preferences stored in cookies - simple admin menu @@ -29,10 +29,10 @@ Together with a dedicated [μlogger mobile client](https://github.com/bfabiszews ## Install - Download zipped archive or clone the repository on your computer - Move it to your web server directory (unzip if needed) -- Create database and MySQL user (at least SELECT, INSERT, UPDATE, DELETE privileges, CREATE, DROP for setup script) +- Create database and database user (at least SELECT, INSERT, UPDATE, DELETE privileges, CREATE, DROP for setup script) - Create a copy of `config.default.php` and rename it to `config.php`. Customize it and add database credentials - Edit `scripts/setup.php` script, enable it by setting [$enabled](https://github.com/bfabiszewski/ulogger-server/blob/master/scripts/setup.php#L21) value to `true` -- Make sure you have a web server running with PHP and MySQL +- Make sure you have a web server running with PHP and chosen database - Open http://YOUR_HOST/ulogger-server/scripts/setup.php page in your browser - Follow instructions in setup script. It will add database tables and set up your μlogger user - **Remember to remove or disable `scripts/setup.php` script** diff --git a/config.default.php b/config.default.php index 276ea74..325c7f0 100755 --- a/config.default.php +++ b/config.default.php @@ -40,7 +40,7 @@ $init_longitude = 21.01; // you may set your google maps api key $gkey = ""; -// MySQL config +// Database config $dbdsn = ""; // DSN eg. "mysql:host=localhost;port=3307;dbname=testdb;charset=utf8" $dbuser = ""; // database user $dbpass = ""; // database pass @@ -76,7 +76,7 @@ $pass_strength = 2; $interval = 10; // Default language -// (en, pl, de, hu) +// (en, pl, de, hu, fr, it) $lang = "en"; //$lang = "pl"; //$lang = "de"; @@ -90,7 +90,7 @@ $units = "metric"; //$units = "imperial"; //$units = "nautical"; -// These need to be copied to config.php +// track line stroke $strokeWeight = 2; $strokeColor = '#FF0000'; $strokeOpacity = 1.0;