X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=etc%2Fmudpy.yaml;h=457069109725de846b9b1add2856bb08a565cb93;hp=512f27f8ba0879e441f4b43fe11ca0ecb2ea1d73;hb=2241387378e638c3d73f18b2b0ef229f308ee003;hpb=76ae128e10c23e0518f331ee4c5638c993d95101

diff --git a/etc/mudpy.yaml b/etc/mudpy.yaml
index 512f27f..4570691 100644
--- a/etc/mudpy.yaml
+++ b/etc/mudpy.yaml
@@ -1,19 +1,22 @@
-# Copyright (c) 2004-2016 Jeremy Stanley <fungi@yuggoth.org>. Permission
-# to use, copy, modify, and distribute this software is granted under
-# terms provided in the LICENSE file distributed with this software.
+_copy: Copyright (c) 2004-2017 Jeremy Stanley <fungi@yuggoth.org>.
+    Permission to use, copy, modify, and distribute this software is granted
+    under terms provided in the LICENSE file distributed with this software.
 
-__control__:
-    default_files: { "account": "account.yaml", "actor": "actor.yaml", "area": "area.yaml", "command": "command.yaml", "internal": "internal.yaml", "menu": "menu.yaml", "other": "other.yaml", "prop": "prop.yaml" }
-    include_dirs: [ "sample" ]
-    include_files: [ "archetype.yaml" ]
-    private_files: [ "account.yaml" ]
-    read_only: yes
+
+_load: [ archetype.yaml, command.yaml, menu.yaml, sample ]
+
+_lock: true
+
+.mudpy.filing.categories: { account: { flags: [ private ] } }
+.mudpy.filing.prefix: "."
+.mudpy.filing.search: [ "", "etc", "share", "data" ]
+.mudpy.filing.stash: "data"
 
 .mudpy.linguistic.actions: { "?": "ask", ",": "begin", "-": "begin", ":": "begin", ";": "begin", "!": "exclaim", "...": "muse", ".": "say" }
 .mudpy.linguistic.default_punctuation: .
 .mudpy.linguistic.typos: { "i": "I", "i'd": "I'd", "i'll": "I'll", "i'm": "I'm", "teh": "the", "theyre": "they're", "youre": "you're" }
 
-#.mudpy.limit.admins: [ admin ]
+.mudpy.limit.admins: [ admin ]
 .mudpy.limit.avatars: 7
 #.mudpy.limit.backups: 10
 .mudpy.limit.password_tries: 3
@@ -42,30 +45,18 @@ __control__:
 .mudpy.movement.west.exit_term: to the west
 .mudpy.movement.west.vector: [-1,0,0]
 
-internal:network:
-    host: ::1
-    #host: 127.0.0.1
-    port: 6669
-
-internal:process:
-    #daemon: yes
-    #pidfile: mudpy.pid
-
-internal:storage:
-    default_dir: "data"
-    #root_path: "."
-    search_path: [ "", "etc", "share", "data" ]
-
-internal:time:
-    definition_d: 24h
-    definition_h: 60mi
-    definition_mi: 10r
-    definition_mo: 28d
-    definition_r: 6
-    definition_w: 7d
-    definition_y: 12mo
-    frequency_log: 6000
-    frequency_save: 600
-    linkdead: { "default": 6000, "entering_account_name": 600, "active": 6048000 }
-    idle: { "default": 5000, "entering_account_name": 500, "active": 5040000 }
-    increment: 0.1
+.mudpy.network.host: '::1'
+.mudpy.network.port: 4000
+
+#.mudpy.process.daemon: true
+#.mudpy.process.pidfile: mudpy.pid
+
+.mudpy.timing.idle.disconnect.active: 6048000
+.mudpy.timing.idle.disconnect.default: 6000
+.mudpy.timing.idle.disconnect.entering_account_name: 600
+.mudpy.timing.idle.warn.active: 5040000
+.mudpy.timing.idle.warn.default: 5000
+.mudpy.timing.idle.warn.entering_account_name: 500
+.mudpy.timing.increment: 0.1
+.mudpy.timing.save: 600
+.mudpy.timing.status: 6000