From 94916ef5d1c881d8a98df001b7bb5e12b6323a97 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Mon, 20 Dec 2021 01:38:47 +0100
Subject: [PATCH] Improved sample conf resources.

---
 resources/conf/sample-probe-http.conf         | 24 +++++++++++++++++++
 resources/conf/sample-probe-minetest.conf     | 23 ++++++++++++++++++
 ...atoolinfos-sample.conf => sample-web.conf} |  4 ++--
 resources/conf/statoolinfos-sample-probe.conf | 10 --------
 4 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 resources/conf/sample-probe-http.conf
 create mode 100644 resources/conf/sample-probe-minetest.conf
 rename resources/conf/{statoolinfos-sample.conf => sample-web.conf} (83%)
 delete mode 100644 resources/conf/statoolinfos-sample-probe.conf

diff --git a/resources/conf/sample-probe-http.conf b/resources/conf/sample-probe-http.conf
new file mode 100644
index 0000000..a0056c5
--- /dev/null
+++ b/resources/conf/sample-probe-http.conf
@@ -0,0 +1,24 @@
+#
+# Sample StatoolInfos config file to probe http.
+#
+# Warning: move this file outside the Git directory.
+
+# List of the targets to probe.
+conf.probe.types=HttpAccessLog, HttpErrorLog 
+
+# Access log file to probe. Wildcards available.
+# Example: /tmp/*foo*.log??
+conf.probe.httpaccesslog.file=/var/log/apache2/qrcode.libre-service.eu/qrcode.libre-service.eu-access.log*
+
+# Optional. Custom access http log pattern in Java regex mode (https://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html).
+# Default value COMBINED: (?<remoteAddress>[a-zA-F0-9\\\\:\\\\.]+) - (?<remoteUser>[^\\[]+) \\[(?<time>[^\\]]+)\\] \"(?<request>[^\"]*)\" (?<status>\\d+) (?<bodyBytesSent>\\d+) \"(?<referer>[^\"]*)\" \"(?<userAgent>[^\"]*)\".*$");
+conf.probe.httpaccesslog.pattern=
+
+# Error log file to probe. Wildcards available.
+# Example: /tmp/*foo*.log??
+conf.probe.httperrorlog.file=/var/log/apache2/qrcode.libre-service.eu/qrcode.libre-service.eu-error.log*
+
+# Target file to write computed metrics. If file exists then it is renamed with '.bak'.
+conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/qrcode.libre-service.eu.metrics
+
+
diff --git a/resources/conf/sample-probe-minetest.conf b/resources/conf/sample-probe-minetest.conf
new file mode 100644
index 0000000..dc5fe63
--- /dev/null
+++ b/resources/conf/sample-probe-minetest.conf
@@ -0,0 +1,23 @@
+#
+# Sample StatoolInfos probe config file.
+#
+# Warning: move this file outside the git directory.
+
+# List of the targets to probe.
+conf.probe.types=Minetest 
+
+# Minetest log files to probe. Wildcards available.
+conf.probe.minetest.logs=/var/log/minetest/minetest.log*
+
+# Players database parameters.
+conf.probe.minetest.players.db.host=
+conf.probe.minetest.players.db.port=
+conf.probe.minetest.players.db.name=
+conf.probe.minetest.players.db.user=
+conf.probe.minetest.players.db.password=
+
+#
+conf.probe.minetest.datafilepath=
+
+# Target file to write computed metrics. If file exists then it is renamed with '.bak'.
+conf.probe.target=/home/cpm/Projets/StatoolInfos/EnvTest/minetest/test.metrics
diff --git a/resources/conf/statoolinfos-sample.conf b/resources/conf/sample-web.conf
similarity index 83%
rename from resources/conf/statoolinfos-sample.conf
rename to resources/conf/sample-web.conf
index 969809b..7bca2d0 100644
--- a/resources/conf/statoolinfos-sample.conf
+++ b/resources/conf/sample-web.conf
@@ -1,10 +1,10 @@
 #
 # Sample StatoolInfos config file.
 #
-# Note: move this file outside the git directory.
+# Warning: move this file outside the Git directory.
 
 conf.class=federation
-conf.protocol=StatoolInfos-0.3.0
+conf.protocol=StatoolInfos-0.4.0
 
 conf.crawl.input=https://www.libre-service.eu/.well-known/statoolinfos/libre-service.eu.properties
 conf.crawl.cache=/srv/statoolinfos/cache/
diff --git a/resources/conf/statoolinfos-sample-probe.conf b/resources/conf/statoolinfos-sample-probe.conf
deleted file mode 100644
index a5f7703..0000000
--- a/resources/conf/statoolinfos-sample-probe.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Sample StatoolInfos probe config file.
-#
-# Note: move this file outside the git directory.
-
-conf.probe.types=HttpAccessLog, HttpErrorLog
-conf.probe.httpaccesslog.file=/var/log/apache2/qrcode.libre-service.eu/qrcode.libre-service.eu-access.log*
-conf.probe.httperrorlog.file=/var/log/apache2/qrcode.libre-service.eu/qrcode.libre-service.eu-error.log*
-conf.probe.target=/srv/statoolinfos/well-known/statoolinfos/qrcode.libre-service.eu.metrics
-