Separate default config

.gitignore

@@ -1,3 +1,2 @@
 bin/conf.sh
 man/*.1.gz
-scripts/default.conf

Makefile

@@ -72,7 +72,7 @@ compress_man:
 install: install_bin install_templates install_makefiles install_scripts install_man install_profile
 	install -d ${DESTDIR}${PREFIX}/etc
 	install -m 0644 reggae.conf.sample ${DESTDIR}${PREFIX}/etc
-	install -m 0644 reggae.conf.sample ${DESTDIR}${PREFIX}${SCRIPTS_DIR}/default.conf
+	install -m 0644 scripts/default.conf ${DESTDIR}${PREFIX}${SCRIPTS_DIR}/default.conf
 	cp -r skel ${DESTDIR}${PREFIX}${REGGAE_DIR}
 	cp -r master ${DESTDIR}${PREFIX}${REGGAE_DIR}
 

reggae.conf.sample

@@ -1,9 +1,11 @@
-CBSD_WORKDIR=${CBSD_WORKDIR:-"/cbsd"}
-DHCP_IP=${DHCP_IP:-"172.16.0.253"}
-DOMAIN=${DOMAIN:-`hostname`}
-JAIL_INTERFACE=${JAIL_INTERFACE:-"lo1"}
-RESOLVER_IP=${RESOLVER_IP:-"10.0.0.254"}
-USE_ZFS=${USE_ZFS:="yes"}
-VM_INTERFACE=${VM_INTERFACE:-"bridge1"}
-VM_INTERFACE_IP=${VM_INTERFACE_IP:-"172.16.0.254"}
-ZFS_POOL=${ZFS_POOL:-"zroot"}
+# Commented are default values
+
+# CBSD_WORKDIR="/usr/jails"
+# DHCP_IP="172.16.0.253"
+# DOMAIN=`hostname`
+# JAIL_INTERFACE="lo1"
+# RESOLVER_IP="10.0.0.254"
+# USE_ZFS="yes"
+# VM_INTERFACE="bridge1"
+# VM_INTERFACE_IP="172.16.0.254"
+# ZFS_POOL="zroot"

scripts/default.conf

@@ -0,0 +1,9 @@
+CBSD_WORKDIR=${CBSD_WORKDIR:-"/usr/jails"}
+DHCP_IP=${DHCP_IP:-"172.16.0.253"}
+DOMAIN=${DOMAIN:-`hostname`}
+JAIL_INTERFACE=${JAIL_INTERFACE:-"lo1"}
+RESOLVER_IP=${RESOLVER_IP:-"10.0.0.254"}
+USE_ZFS=${USE_ZFS:="yes"}
+VM_INTERFACE=${VM_INTERFACE:-"bridge1"}
+VM_INTERFACE_IP=${VM_INTERFACE_IP:-"172.16.0.254"}
+ZFS_POOL=${ZFS_POOL:-"zroot"}