Fixed README disaster
This commit is contained in:
parent
23edf67e65
commit
f5cee6d03d
Binary file not shown.
37
README.md
37
README.md
|
@ -25,26 +25,6 @@ Works with mobile versions too.
|
|||
|
||||
![Screenshot](https://speedtest.fdossena.com/mpot_v5.gif)
|
||||
|
||||
|
||||
## Server requirements
|
||||
* A reasonably fast web server with Apache 2 (nginx, IIS also supported)
|
||||
* PHP 5.4 (other backends also available)
|
||||
* MySQL database to store test results (optional, PostgreSQL and SQLite also supported)
|
||||
* A fast! internet connection
|
||||
|
||||
<<<<<<< HEAD
|
||||
## Quick installation videos
|
||||
* [Debian 9.0 with Apache](https://fdossena.com/?p=speedtest/quickstart_deb.frag)
|
||||
* [Windows Server 2016 with IIS](https://fdossena.com/?p=speedtest/quickstart_win.frag)
|
||||
* [Ubuntu (External)](https://freedif.org/how-to-install-selfhosted-speedtest)
|
||||
|
||||
Also, here's an [example config on Ubuntu 16 LTS](https://github.com/adolfintel/speedtest/issues/50)
|
||||
|
||||
## How to use in your site
|
||||
* See the examples
|
||||
* [Read the wiki](https://github.com/adolfintel/speedtest/wiki)
|
||||
* Read doc.md
|
||||
|
||||
## Docker + Docker Compose
|
||||
|
||||
The project includes a basic `docker-compose.yml` for development. To run, execute the following:
|
||||
|
@ -55,8 +35,7 @@ $ docker-compose build
|
|||
$ docker-compose up
|
||||
```
|
||||
|
||||
|
||||
Speedtest will be available at [http://0.0.0.0:8888/](http://0.0.0.0:8888/). You can try out all of the examples via their associated urls (i.e. `http://0.0.0.0:8888/example1.html`).
|
||||
Speedtest will be available at [http://0.0.0.0:8888/](http://0.0.0.0:8888/).
|
||||
|
||||
To run via Docker directly:
|
||||
|
||||
|
@ -66,20 +45,6 @@ $ docker build -t adolfintel/speedtest:latest .
|
|||
$ docker run -d --name speedtest -p 0.0.0.0:80:80 adolfintel/speedtest:latest
|
||||
```
|
||||
|
||||
## Multiple test servers
|
||||
Please see the ```mpot``` branch
|
||||
|
||||
=======
|
||||
## Installation videos
|
||||
* [Quick start installation guide for Ubuntu Server 19.04](https://fdossena.com/?p=speedtest/quickstart_v5_ubuntu.frag)
|
||||
|
||||
## Docker
|
||||
Please see the `docker` branch
|
||||
|
||||
>>>>>>> master
|
||||
## Node.js backend
|
||||
A Node.js implementation is available in the `node` branch, maintained by [dunklesToast](https://github.com/dunklesToast).
|
||||
|
||||
## Donate
|
||||
[![Donate with Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/fdossena/donate)
|
||||
[Donate with PayPal](https://www.paypal.me/sineisochronic)
|
||||
|
|
Loading…
Reference in a new issue