separately manage client, server, game and world settings better

overrides/CenterOfTheSun/games/ENLIVEN/minetest.conf → overrides/CenterOfTheSun/append/minetest.conf

@@ -1,14 +1,19 @@
+
+# region overrides/CenterOfTheSun/append
+
 port = 30000
 public_serverlist = true
 server_address = poikilos.dyndns.org
 server_announce = true
 server_dedicated = true
-server_description = "mature survival server focused on immersion (ENLIVEN is a Minetest game)"
+server_description = CotS is a mature survival server focused on immersion (ENLIVEN is a Minetest game). See https://poikilos.dyndns.org for details and announcements.
 server_name = Center of the Sun
 server_url = https://poikilos.dyndns.org
 serverlist_url = http://servers.minetest.org:32000
 
 irc.channel = #minetest-general
-irc.nick = CenterOfSun
+irc.nick = CotSunBot
 irc.server = irc.oldcoder.org
 irc.crossworld = false
+
+# endregion overrides/CenterOfTheSun/append

patches/subgame/minetest.client-example.conf

@@ -1,3 +1,4 @@
+# region client
 # address =
 enable_lapis_mod_columns = true
 lifetimer = 20000
@@ -63,18 +64,18 @@ water_wave_speed = 5.0
 wieldview_node_tiles = false
 wieldview_update_time = 2
 
-# region warnings
+## warnings
 # DO THIS IN world.mt instead: creative_mode = false
 # DO THIS IN world.mt instead: enable_damage = true
 # DO THIS IN world.conf instead: enable_builder = true
 # DO THIS IN world.conf instead: enable_bucket_city = false
-# endregion warnings
 
-# region trivial defaults
+## trivial defaults
 # noclip:  requires noclip priv (The setting just determines state at start of game)
 # free_move  requires fly priv (The setting just determines state at start of game)
 # fast_move: requires fast priv (The setting just determines state at start of game)
 noclip = true
 free_move = true
 fast_move = true
-# endregion trivial defaults
+
+# endregion client

patches/subgame/minetest.conf

@@ -0,0 +1,33 @@
+
+# This minetest.conf defines the ENLIVEN game
+# (becomes ENLIVEN/minetest.conf, which can only define mod settings,
+# not server settings).
+# The minetest.conf in ~/minetest defines:
+# - client (see client-example)
+# - server (see server-example)
+#   - announce and unique server settings (See Dedicated Server Settings
+#     section in server-example, and poikilos.dyndns.org-only settings
+#     in overrides/CenterOfTheSun/append/minetest.conf)
+
+# Not all settings can be changed in server's minetest.conf files (see
+# minetest.client-example.conf in THIS folder) some settings can only be
+# changed in client's local minetest.conf (see vbs login scripts)
+
+# For server-specific settings,
+# see ~/minetest/minetest.conf (based on minetest.server-example.conf,
+# and if worlds/CenterOfTheSun directory is present, then the
+# EnlivenMinetest installer also appends
+# EnlivenMinetest/overrides/CenterOfTheSun/append/minetest/minetest.conf
+
+enable_lapis_mod_columns = true
+enable_footsteps = true
+lifetimer = 20000
+
+secure.trusted_mods = advanced_npc
+
+# player_model_version = default_character_v3
+# playeranim.model_version = MTG_4_Jun_2017
+# playeranim.model_version = MTG_4_Nov_2017
+# https://github.com/minetest-mods/ts_furniture has gone back to v#
+# instead of dates:
+playeranim.model_version = default_character_v3

patches/subgame/minetest.server-example.conf

@@ -1,13 +1,27 @@
-# In case user of an Enliven server wants to start their own server via the graphical user interface:
+# region server
 
-# This file should be considered unimportant in Final Minetest, as now
-# the server configuration can be done on a per-world basis. However,
-# The CenterOfTheSun server overrides the settings below.
-# See "EnlivenMinetest/overrides/worlds/CenterOfTheSun/world.conf"
-# instead.
-enable_lapis_mod_columns = true
-enable_footsteps = true
-lifetimer = 20000
+# motd = "Actions and chat messages are logged. Recipes are in unified inventory mod. Otherwise visit the server's website for more info about mods and live map if available--if not, see http://wiki.minetest.net/Main_Page and https://github.com/minetest-technic/technic/wiki"
+motd = Actions and chat messages are logged. Use inventory to see recipes. Priveleges may be limited for new users, so ask a moderator to /grant priveleges.
+disallow_empty_passwords = true
+
+# server_dedicated is added by the install script, true/false
+#   conditionally (see install script):
+# server_dedicated = false
+
+# DEPRECATED??
+# hudbars_bar_type = statbar_modern
+# sprint_speed = 2.25
+# sprint_jump = 1.25
+# sprint_stamina_drain = .5
+
+bones_position_message = true
+
+# Set this in world.conf if using codercore/fallback_spawn
+# static_spawnpoint = 0, 11, 0
+
+map_generation_limit = 4096
+# only for worldedge mod:
+world_edge = 4096
 
 protector_radius = 7
 protector_flip = true
@@ -16,16 +30,11 @@ protector_pvp = true
 # protector_drop = false  # true can allow item duplication (option not available in later ~2018 versions of mobs redo)
 protector_drop = false
 protector_hurt = 3
-#optional:
-map_generation_limit = 4096
-
-#only for worldedge mod:
-world_edge = 4096
 
-
-
-# region IGNORED in CenterOfTheSun
-# - see overrides/worlds/CenterOfTheSun/world.conf
+## World Settings
+# - Use world.conf instead to change settings such as these
+# - IGNORED by CenterOfTheSun (see
+#   overrides/CenterOfTheSun/minetest/worlds/CenterOfTheSun/world.conf)
 enable_pvp = false
 give_initial_stuff = true
 nightspeed = 90
@@ -39,41 +48,23 @@ default_privs = interact, shout
 # endregion IGNORED in CenterOfTheSun
 # optional: max_users default is 15
 max_users = 50
-# endregion
-
-
-
-# motd = "Actions and chat messages are logged. Recipes are in unified inventory mod. Otherwise visit the server's website for more info about mods and live map if available--if not, see http://wiki.minetest.net/Main_Page and https://github.com/minetest-technic/technic/wiki"
-motd = Actions and chat messages are logged. Use inventory to see recipes. Priveleges may be limited for new users, so ask a moderator to /grant priveleges.
-disallow_empty_passwords = true
-secure.trusted_mods = advanced_npc
-
-# server_dedicated is added by the install script, true/false
-#   conditionally (see install script):
-# server_dedicated = false
-
-# DEPRECATED??
-# hudbars_bar_type = statbar_modern
-# sprint_speed = 2.25
-# sprint_jump = 1.25
-# sprint_stamina_drain = .5
-
-
-# player_model_version = default_character_v3
-# playeranim.model_version = MTG_4_Jun_2017
-# playeranim.model_version = MTG_4_Nov_2017
-# https://github.com/minetest-mods/ts_furniture has gone back to v#
-# instead of dates:
-playeranim.model_version = default_character_v3
-
-# Not all settings can be changed in this minetest.conf (see
-# minetest.conf.example in THIS folder) some settings can only be
-# changed in client's local minetest.conf (see vbs login scripts)
-bones_position_message = true
-
-# Set this in world.conf if using codercore/fallback_spawn
-# static_spawnpoint = 0, 11, 0
 
-# only for minetest.org releases:
-disable_classic_sneak = true
-enable_3d_torches = true
+## Dedicated Server Settings
+
+# port = 30000
+# public_serverlist = true
+# server_address =
+# server_announce = true
+# server_dedicated = true
+# server_description =
+# server_name =
+# server_url =
+# serverlist_url = http://servers.minetest.org:32000
+
+# irc.channel = #minetest-general
+# irc.nick =
+# irc.server = irc.oldcoder.org
+# irc.crossworld = false
+# dedicated server example
+
+# endregion server

webapp/install-mts.sh

@@ -244,53 +244,60 @@ if [ -d "$dst/mods/coderfood/food_basic/etc" ]; then
   rm -Rf "$dst/mods/coderfood/food_basic/etc"
 fi
 
+minetest_conf_dest="$dest_programs/minetest/minetest.conf"
+game_minetest_conf_dest="$dest_programs/minetest/games/ENLIVEN/minetest.conf"
+
 # Bucket_Game doesn't come with a minetest.conf, only minetest.conf.example* files
 # if [ ! -f "$dest_programs/minetest/minetest.Bucket_Game-example.conf" ]; then
-#     cp -f "$dest_programs/minetest/minetest.conf" "$dest_programs/minetest/minetest.Bucket_Game-example.conf"
+#     cp -f "$$minetest_conf_dest" "$dest_programs/minetest/minetest.Bucket_Game-example.conf"
 # fi
 
 client_example_dest="$dest_programs/minetest/minetest.ENLIVEN.client-example.conf"
-# client conf writing only ever happens once, unless you manually delete $client_example_dest file:
-if [ ! -f "$client_example_dest" ]; then
-    if [ -f "$dest_programs/minetest/minetest.conf" ]; then
-        echo "Backing up minetest.conf..."
-        if [ ! -f "$dest_programs/minetest/minetest.conf.1st" ]; then
-            cp -f "$dest_programs/minetest/minetest.conf" "$dest_programs/minetest/minetest.conf.1st"
+
+echo "Installing minetest.ENLIVEN.*-example.conf files..."
+cp -f "patches/subgame/minetest.LAN-client-example.conf" "$dest_programs/minetest/minetest.ENLIVEN.LAN-client-example.conf" || customDie "Cannot copy minetest.ENLIVEN.LAN-client-example.conf"
+cp -f "patches/subgame/minetest.server-example.conf"     "$dest_programs/minetest/minetest.ENLIVEN.server-example.conf" || customDie "Cannot copy minetest.ENLIVEN.server-example.conf"
+cp -f "patches/subgame/minetest.client-example.conf"     "$dest_programs/minetest/minetest.ENLIVEN.client-example.conf" || customDie "Cannot copy minetest.ENLIVEN.client-example.conf"
+
+echo "Writing '$game_minetest_conf_dest'..."
+cp -f "patches/subgame/minetest.conf" "$game_minetest_conf_dest"
+
+# client conf writing only ever happens once, unless you manually delete $minetest_conf_dest:
+if [ ! -f "$minetest_conf_dest" ]; then
+    # if [ -f "$minetest_conf_dest" ]; then
+        # echo "Backing up minetest.conf..."
+        # if [ ! -f "$minetest_conf_dest.1st" ]; then
+            # cp -f "$minetest_conf_dest" "$minetest_conf_dest.1st"
+        # else
+            # cp -f "$minetest_conf_dest" "$minetest_conf_dest.bak"
+        # fi
+    # fi
+    echo "Writing minetest.conf (client region)..."
+    cp -f "patches/subgame/minetest.client-example.conf" "$minetest_conf_dest"  || customDie "Cannot copy minetest.client-example.conf to $minetest_conf_dest"
+    echo "Appending example settings (server region) to '$minetest_conf_dest'..."
+    cat "patches/subgame/minetest.server-example.conf" >> "$minetest_conf_dest" || customDie "Cannot append minetest.server-example.conf"
 else
-            cp -f "$dest_programs/minetest/minetest.conf" "$dest_programs/minetest/minetest.conf.bak"
-        fi
+    echo "$minetest_conf_dest exists (remove it if you want the installer to write an example version)"
 fi
-    echo "Installing minetest.conf and ENLIVEN example conf files..."
-    cp -f "patches/subgame/minetest.client-example.conf" "$dest_programs/minetest/minetest.conf"
-    cp -f "patches/subgame/minetest.LAN-client-example.conf" "$dest_programs/minetest/minetest.ENLIVEN.LAN-client-example.conf"
-    cp -f "patches/subgame/minetest.server-example.conf" "$dest_programs/minetest/minetest.ENLIVEN.server-example.conf"
-    cp -f "patches/subgame/minetest.client-example.conf" "$client_example_dest"
-fi
-server_minetest_conf_dest="$dest_programs/minetest/games/ENLIVEN/minetest.conf"
 
-if [ -f "$server_minetest_conf_dest" ]; then
+
+if [ -f "$minetest_conf_dest" ]; then
     cat << END
 NOTE: minetest.org releases allow you to put a world.conf file in your
   world, so that is the file you should edit manually in your world
-  --this installer overwrites $server_minetest_conf_dest and
+  --this installer overwrites $minetest_conf_dest and
   worlds/CenterOfTheSun settings (the author Poikilos' world).
+  Continue to place server settings such as announce in
+  $minetest_conf_dest.
+  Leave $game_minetest_conf_dest intact, as it defines the game.
+  If you have suggestions for changes or configurability, please use the
+  issue tracker at <https://github.com/poikilos/EnlivenMinetest>.
 
 END
 fi
-echo "Writing '$server_minetest_conf_dest'..."
-cp -f "patches/subgame/minetest.server-example.conf" "$server_minetest_conf_dest"
-echo "" >> "$server_minetest_conf_dest"
-echo "# Added automatically by $me:" >> "$server_minetest_conf_dest"
-if [ -f "$HOME/i_am_dedicated_minetest_server" ]; then
-    echo "server_dedicated = true" >> "$server_minetest_conf_dest"
-else
-    echo "server_dedicated = false" >> "$server_minetest_conf_dest"
-fi
-echo "" >> "$server_minetest_conf_dest"
-echo "" >> "$server_minetest_conf_dest"
 
 
-world_override_src="overrides/worlds/CenterOfTheSun"
+world_override_src="overrides/CenterOfTheSun/minetest/worlds/CenterOfTheSun"
 world_override_dst="$HOME/.minetest/worlds/CenterOfTheSun"
 world_override_dst="$HOME/.minetest/worlds/CenterOfTheSun"
 try_world_override_dst="$HOME/minetest/worlds/CenterOfTheSun"
@@ -302,7 +309,8 @@ world_conf_dst="$world_override_dst/world.conf"
 world_mt_src="$world_override_src/world.mt"
 world_mt_dst="$world_override_dst/world.mt"
 override_more="overrides/CenterOfTheSun/games/ENLIVEN"
-minetest_conf_more="$override_more/minetest.conf"
+appends="overrides/CenterOfTheSun/append"
+minetest_conf_append="$appends/minetest.conf"
 if [ -d "$world_override_dst" ]; then
     echo "You have the CenterOfTheSun world. Listing any changes..."
     if [ -f "$world_conf_src" ]; then
@@ -313,8 +321,8 @@ if [ -d "$world_override_dst" ]; then
         fi
         cp -f "$world_conf_src" "$world_conf_dst"
     fi
-    if [ -f "$minetest_conf_more" ]; then
-        cat "$minetest_conf_more" >> "$server_minetest_conf_dest"
+    if [ -f "$minetest_conf_append" ]; then
+        cat "$minetest_conf_append" >> "$minetest_conf_dest"
     fi
 fi
 

webapp/reset-minetest-install-source.sh

@@ -51,6 +51,7 @@ else
 fi
 unzip -u $zip_name || customDie "Can't unzip $zip_name"
 cd "$extracted_name"
+cat "$extracted_name/release.txt"
 echo "compiling libraries..."
 date
 start=`date +%s`