Merge branch 'master' into docker
This commit is contained in:
dosse91
commit
67723258b3
6
doc.md
6
doc.md
|
|
@ -313,7 +313,7 @@ To set up the telemetry, we need to do 4 things:
|
|||
|
||||
### Creating the database
|
||||
This step is only for MySQL and PostgreSQL. Skip this if you want to use SQLite.
|
||||
Log into your database using phpMyAdmin or a similar software and import `telemetry.sql` into an empty database.
|
||||
Log into your database using phpMyAdmin or a similar software and import the appropriate sql file into an empty database. For MySQL databases use `telemetry_mysql.sql` and for PostgreSQL databases use `telemetry_postgesql.sql`.
|
||||
If you see a table called `speedtest_users`, empty, you did it right.
|
||||
|
||||
### Configuring `telemetry.php`
|
||||
|
|
@ -329,7 +329,7 @@ If you choose to use MySQL, you must also add your database credentials:
|
|||
$MySql_username="USERNAME"; //your database username
|
||||
$MySql_password="PASSWORD"; //your database password
|
||||
$MySql_hostname="DB_HOSTNAME"; //database address, usually localhost\
|
||||
$MySql_databasename="DB_NAME"; //the name of the database where you loaded telemetry.sql
|
||||
$MySql_databasename="DB_NAME"; //the name of the database where you loaded telemetry_mysql.sql
|
||||
```
|
||||
|
||||
If you choose to use PostgreSQL, you must also add your database credentials:
|
||||
|
|
@ -337,7 +337,7 @@ If you choose to use PostgreSQL, you must also add your database credentials:
|
|||
$PostgreSql_username="USERNAME"; //your database username
|
||||
$PostgreSql_password="PASSWORD"; //your database password
|
||||
$PostgreSql_hostname="DB_HOSTNAME"; //database address, usually localhost
|
||||
$PostgreSql_databasename="DB_NAME"; //the name of the database where you loaded telemetry.sql
|
||||
$PostgreSql_databasename="DB_NAME"; //the name of the database where you loaded telemetry_postgresql.sql
|
||||
```
|
||||
|
||||
### Enabling telemetry
|
||||
|
|
|
|||
111
telemetry_postgresql.sql
Normal file
111
telemetry_postgresql.sql
Normal file
|
|
@ -0,0 +1,111 @@
|
|||
--
|
||||
-- PostgreSQL database dump
|
||||
--
|
||||
|
||||
-- Dumped from database version 9.6.3
|
||||
-- Dumped by pg_dump version 9.6.5
|
||||
|
||||
SET statement_timeout = 0;
|
||||
SET lock_timeout = 0;
|
||||
SET idle_in_transaction_session_timeout = 0;
|
||||
SET client_encoding = 'UTF8';
|
||||
SET standard_conforming_strings = on;
|
||||
SET check_function_bodies = false;
|
||||
SET client_min_messages = warning;
|
||||
SET row_security = off;
|
||||
|
||||
--
|
||||
-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner:
|
||||
--
|
||||
|
||||
CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
|
||||
|
||||
|
||||
--
|
||||
-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner:
|
||||
--
|
||||
|
||||
COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
|
||||
|
||||
|
||||
SET search_path = public, pg_catalog;
|
||||
|
||||
SET default_tablespace = '';
|
||||
|
||||
SET default_with_oids = false;
|
||||
|
||||
--
|
||||
-- Name: speedtest_users; Type: TABLE; Schema: public; Owner: speedtest
|
||||
--
|
||||
|
||||
CREATE TABLE speedtest_users (
|
||||
id integer NOT NULL,
|
||||
"timestamp" timestamp without time zone DEFAULT now() NOT NULL,
|
||||
ip text NOT NULL,
|
||||
ua text NOT NULL,
|
||||
lang text NOT NULL,
|
||||
dl text,
|
||||
ul text,
|
||||
ping text,
|
||||
jitter text,
|
||||
log text
|
||||
);
|
||||
|
||||
-- Commented out the following line because it assumes the user of the speedtest server, @bplower
|
||||
-- ALTER TABLE speedtest_users OWNER TO speedtest;
|
||||
|
||||
--
|
||||
-- Name: speedtest_users_id_seq; Type: SEQUENCE; Schema: public; Owner: speedtest
|
||||
--
|
||||
|
||||
CREATE SEQUENCE speedtest_users_id_seqd
|
||||
START WITH 1
|
||||
INCREMENT BY 1
|
||||
NO MINVALUE
|
||||
NO MAXVALUE
|
||||
CACHE 1;
|
||||
|
||||
-- Commented out the following line because it assumes the user of the speedtest server, @bplower
|
||||
-- ALTER TABLE speedtest_users_id_seq OWNER TO speedtest;
|
||||
|
||||
--
|
||||
-- Name: speedtest_users_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: speedtest
|
||||
--
|
||||
|
||||
ALTER SEQUENCE speedtest_users_id_seq OWNED BY speedtest_users.id;
|
||||
|
||||
|
||||
--
|
||||
-- Name: speedtest_users id; Type: DEFAULT; Schema: public; Owner: speedtest
|
||||
--
|
||||
|
||||
ALTER TABLE ONLY speedtest_users ALTER COLUMN id SET DEFAULT nextval('speedtest_users_id_seq'::regclass);
|
||||
|
||||
|
||||
--
|
||||
-- Data for Name: speedtest_users; Type: TABLE DATA; Schema: public; Owner: speedtest
|
||||
--
|
||||
|
||||
COPY speedtest_users (id, "timestamp", ip, ua, lang, dl, ul, ping, jitter, log) FROM stdin;
|
||||
\.
|
||||
|
||||
|
||||
--
|
||||
-- Name: speedtest_users_id_seq; Type: SEQUENCE SET; Schema: public; Owner: speedtest
|
||||
--
|
||||
|
||||
SELECT pg_catalog.setval('speedtest_users_id_seq', 1, true);
|
||||
|
||||
|
||||
--
|
||||
-- Name: speedtest_users speedtest_users_pkey; Type: CONSTRAINT; Schema: public; Owner: speedtest
|
||||
--
|
||||
|
||||
ALTER TABLE ONLY speedtest_users
|
||||
ADD CONSTRAINT speedtest_users_pkey PRIMARY KEY (id);
|
||||
|
||||
|
||||
--
|
||||
-- PostgreSQL database dump complete
|
||||
--
|
||||
|
||||
Loading…
Reference in a new issue