From bbdd4abc9f787f057848a5b97656509b877793e0 Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Sun, 12 Jul 2020 22:30:22 +0200
Subject: Move more static strings to config.h

---
 examples/example.mcserver    | 10 ----------
 examples/example.minecserver | 10 ++++++++++
 examples/meson.build         |  2 +-
 examples/minecproxy.conf     | 13 ++++++++++++-
 4 files changed, 23 insertions(+), 12 deletions(-)
 delete mode 100644 examples/example.mcserver
 create mode 100644 examples/example.minecserver

(limited to 'examples')

diff --git a/examples/example.mcserver b/examples/example.mcserver
deleted file mode 100644
index ea7f9bd..0000000
--- a/examples/example.mcserver
+++ /dev/null
@@ -1,10 +0,0 @@
-[server]
-type = proxy
-name = Example Server
-local = 20003
-idle_timeout = 600
-start_method = systemd
-stop_method = systemd
-# The remaining details will usually be read directly from
-# the server.properties file, assuming that the Minecraft
-# server directory has been installed in the proper location.
diff --git a/examples/example.minecserver b/examples/example.minecserver
new file mode 100644
index 0000000..9cd9c9d
--- /dev/null
+++ b/examples/example.minecserver
@@ -0,0 +1,10 @@
+[minecserver]
+type = proxy
+name = Example Server
+local = 20003
+idle_timeout = 600
+start_method = systemd
+stop_method = systemd
+# The remaining details will usually be read directly from
+# the server.properties file, assuming that the Minecraft
+# server directory has been installed in the proper location.
diff --git a/examples/meson.build b/examples/meson.build
index 67ddf01..bad1b4a 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -26,7 +26,7 @@ foreach xxd_file: xxd_files
 endforeach
 
 install_files = [
-	'example.mcserver',
+	'example.minecserver',
 	'minecctl.conf',
 	'minecproxy.conf',
 	'minecproxy.service',
diff --git a/examples/minecproxy.conf b/examples/minecproxy.conf
index b17d8ef..3950da7 100644
--- a/examples/minecproxy.conf
+++ b/examples/minecproxy.conf
@@ -1 +1,12 @@
-This is the minecproxy conf example
+[minecproxy]
+#These are the default values
+#igmp = no
+#igmp_iface =
+#announce_interval = 3
+#proxy_connection_interval = 3
+#proxy_connection_attempts = 20
+#socket_defer = true
+#socket_freebind = true
+#socket_keepalive = true
+#socket_iptos = true
+#socket_nodelay = true
-- 
cgit v1.2.3