- control whether to listen on TCP is in xfs.configXFree86-4_0_1-8

- set up default port to 7100
- added cache parameters to xfs.config
- clone-self on (doesn't matter for small fontservers, DOES for big)
- added all paths to xfs.config

Changed files:
    xfs.config -> 1.2
    xfs.sysconfig -> 1.3

2 files changed, 26 insertions, 8 deletions

diff --git a/xfs.config b/xfs.config
index cb4ed4b..9557c1f 100644
--- a/xfs.config
+++ b/xfs.config
@@ -6,7 +6,7 @@
 client-limit = 4
 
 # when a font server reaches its limit, start up a new one
-clone-self = off
+clone-self = on
 
 # alternate font servers for clients to use
 #alternate-servers = foo:7101,bar:7102
@@ -16,12 +16,22 @@ clone-self = off
 # directories in /usr/share, because they aren't forced to be
 # installed alongside X.
 #
-catalogue = /usr/X11R6/lib/X11/fonts/misc:unscaled,
-	/usr/X11R6/lib/X11/fonts/75dpi:unscaled,
-	/usr/X11R6/lib/X11/fonts/100dpi:unscaled,
-	/usr/X11R6/lib/X11/fonts/misc,
-	/usr/X11R6/lib/X11/fonts/Type1,
-	/usr/X11R6/lib/X11/fonts/Speedo
+
+catalogue = /usr/share/fonts/latin2/misc:unscaled,
+		/usr/share/fonts/misc:unscaled,
+		/usr/share/fonts/latin2/75dpi/:unscaled,
+		/usr/share/fonts/latin2/100dpi/:unscaled,
+		/usr/share/fonts/75dpi:unscaled,
+		/usr/share/fonts/100dpi:unscaled,
+		/usr/share/fonts/latin2/misc,
+		/usr/share/fonts/misc,
+		/usr/share/fonts/latin2/75dpi,
+		/usr/share/fonts/latin2/100dpi,
+		/usr/share/fonts/75dpi,
+		/usr/share/fonts/100dpi,
+		/usr/share/fonts/Type1,
+		/usr/share/fonts/TTF,
+		/usr/share/fonts/Speedo
 
 # in 12 points, decipoints
 default-point-size = 120
@@ -31,3 +41,11 @@ default-resolutions = 75,75,100,100
 
 # how to log errors
 use-syslog = on
+
+# don't listen to TCP ports by default for security reasons
+no-listen = tcp
+
+# font cache control, specified in KB
+cache-hi-mark = 2048
+cache-low-mark = 1433
+cache-balance = 70
diff --git a/xfs.sysconfig b/xfs.sysconfig
index acd7a2d..024bcb7 100644
--- a/xfs.sysconfig
+++ b/xfs.sysconfig
@@ -2,7 +2,7 @@
 
 # Specifies the TCP port number on which the server will listen for
 # connections. The default port number is 7100.
-XFS_PORT="-1"
+XFS_PORT="7100"
 
 XFS_OPTIONS="-daemon"