settings

diff --git a/rc.conf b/rc.conf
index 62cafcdac152d0597dad4e5662c11c90797b64c1..27eb3ea125e224d9a839fb0092d3d7d4f9b8a968 100644 (file)
--- a/rc.conf
+++ b/rc.conf
@@ -1,11 +1,7 @@
 sshd_enable="YES"
 sshd_enable="YES"

+sshd_flags="-o UseBlacklist=yes"

 sendmail_enable="NONE"
 sendmail_enable="NONE"

-kld_list="vmm cuse4bsd cpuctl filemon"

 ntpd_enable="YES"
 # Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable
 dumpdev="AUTO"
 zfs_enable="YES"
 ntpd_enable="YES"
 # Set dumpdev to "AUTO" to enable crash dumps, "NO" to disable
 dumpdev="AUTO"
 zfs_enable="YES"

-
-ifconfig_em0=85.10.211.30      
-defaultrouter=85.10.211.31     
-ifconfig_re0_ipv6="inet6 accept_rtadv"

diff --git a/rc.conf.d/blacklistd b/rc.conf.d/blacklistd
index 884181f9c1b12709affd7e1462c0e03294c0c4c3..330c01fd1ca5bfac886e12c0a54247d67f1773c1 100644 (file)
--- a/rc.conf.d/blacklistd
+++ b/rc.conf.d/blacklistd
@@ -1,4 +1,3 @@
 blacklistd_enable="YES"
 blacklistd_flags="-r"
 blacklistd_enable="YES"
 blacklistd_flags="-r"

-sshd_flags="-o UseBlacklist=yes"

 
 

diff --git a/rc.conf.d/network/re0 b/rc.conf.d/network/re0
new file mode 100644 (file)
index 0000000..73be2cd
--- /dev/null
+++ b/rc.conf.d/network/re0
@@ -0,0 +1,2 @@
+ifconfig_re0="inet %INET% netmask 0xffffffe0"
+ifconfig_re0_ipv6="inet6 %INET6% prefixlen 64"

diff --git a/rc.conf.d/routing b/rc.conf.d/routing
index 48af0877f692988811fb05b0e83a40088b1c76c0..a3d446529a6e6ecda71f2fdbae2f9e7e3dbafeee 100644 (file)
--- a/rc.conf.d/routing
+++ b/rc.conf.d/routing
@@ -1,3 +1,3 @@
-defaultrouter="136.243.125.33"
-ipv6_defaultrouter="fe80::1%re0"
+defaultrouter="%ROUTERIP%"
+ipv6_defaultrouter="ROUTERIP6%

 
 

diff --git a/rc.conf.local b/rc.conf.local
index ea2b15ac75d2286deaec1532d2944e6b58aa6aad..240e9e439fb9e26c8ea1fd42950f192bf2b242f3 100644 (file)
--- a/rc.conf.local
+++ b/rc.conf.local
@@ -1,2 +1,4 @@
-local_enable="YES"

 keymap="fr.iso.acc.kbd"
 keymap="fr.iso.acc.kbd"

+mixer_enable="NO"
+virecover_enable="NO"
+

diff --git a/settings.sh b/settings.sh
deleted file mode 100644 (file)
index babe354..0000000
--- a/settings.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export DESTDISK="ada1"
-export DESTDIR="/mnt/zfs"
-export ZPOOL="zroot"
-