Index: trunk/server/fedora/config/etc/sysconfig/dirsrv
===================================================================
--- trunk/server/fedora/config/etc/sysconfig/dirsrv	(revision 2183)
+++ trunk/server/fedora/config/etc/sysconfig/dirsrv	(revision 2246)
@@ -6,4 +6,6 @@
 # dirsrv-localhost for the slapd-localhost instance.
 
+# This file is in systemd EnvironmentFile format - see man systemd.exec
+
 # In order to make more file descriptors available
 # to the directory server, first make sure the system
@@ -12,4 +14,7 @@
 # desired value
 # ulimit -n 8192
+# note - if using systemd, ulimit won't work -  you must edit
+# the systemd unit file for directory server to add the 
+# LimitNOFILE option - see man systemd.exec for more info
 
 # A per instance keytab does not make much sense for servers.
@@ -27,23 +32,13 @@
 # file - uncomment the following line and set
 # the path and filename appropriately
-KRB5_KTNAME=/etc/dirsrv/keytab ; export KRB5_KTNAME
-
-# other environment settings can be added here too
-OS=`uname -s`
-# use the new mt slab memory allocator on Solaris
-# this requires Solaris 9 update 3 or later
-if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
-    LD_PRELOAD=/usr/lib/libumem.so
-    export LD_PRELOAD
-fi
-if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
-    LD_PRELOAD_64=/usr/lib/64/libumem.so
-    export LD_PRELOAD_64
-fi
+# if using systemd, omit the "; export VARNAME" at the end
+# KRB5_KTNAME=/etc/dirsrv/myname.keytab ; export KRB5_KTNAME
 
 # how many seconds to wait for the startpid file to show
 # up before we assume there is a problem and fail to start
+# if using systemd, omit the "; export VARNAME" at the end
 #STARTPID_TIME=10 ; export STARTPID_TIME
 # how many seconds to wait for the pid file to show
 # up before we assume there is a problem and fail to start
+# if using systemd, omit the "; export VARNAME" at the end
 #PID_TIME=600 ; export PID_TIME
Index: trunk/server/fedora/config/etc/sysconfig/dirsrv-scripts
===================================================================
--- trunk/server/fedora/config/etc/sysconfig/dirsrv-scripts	(revision 2246)
+++ trunk/server/fedora/config/etc/sysconfig/dirsrv-scripts	(revision 2246)
@@ -0,0 +1,24 @@
+# This file is sourced by dirsrv upon startup to set
+# the default environment for a single specific  directory
+# server instances.  To set defaults for all instances, edit
+# the file in the same directory called dirsrv.
+
+# These settings are used by the start-dirsrv and
+# start-slapd scripts (as well as their associates stop
+# and restart scripts).  Do not edit them unless you know
+# what you are doing.
+
+# This file is in systemd EnvironmentFile format - see man systemd.exec
+
+SERVER_DIR=/usr/lib64/dirsrv
+SERVERBIN_DIR=/usr/sbin
+CONFIG_DIR=/etc/dirsrv/slapd-scripts
+INST_DIR=/usr/lib64/dirsrv/slapd-scripts
+RUN_DIR=/var/run/dirsrv
+DS_ROOT=
+PRODUCT_NAME=slapd
+
+# Put custom instance specific settings below here.
+# if using systemd, omit the "; export VARNAME" at the end
+
+KRB5_KTNAME=/etc/dirsrv/keytab
Index: trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1
===================================================================
--- trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1	(revision 2183)
+++ trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1	(revision 2246)
@@ -14,2 +14,4 @@
 18.181.0.141 via 172.21.0.141
 18.181.0.199 via 172.21.0.199
+18.181.0.203 via 172.21.0.203
+18.181.0.204 via 172.21.0.204