From: David Marec <DavidMarec@users.noreply.github.com>
Date: Sat, 3 Nov 2018 15:31:43 +0000 (+0100)
Subject: settings
X-Git-Url: http://popeye.lapinbilly.eu/git/?p=zfsinstaller.git;a=commitdiff_plain;h=0a0586265d307209e67581d10d1f71eb86149112

settings
---

diff --git a/rc.conf b/rc.conf
index 62cafcd..27eb3ea 100644
--- a/rc.conf
+++ b/rc.conf
@@ -1,11 +1,7 @@
 sshd_enable="YES"
+sshd_flags="-o UseBlacklist=yes"
 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"
-
-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 884181f..330c01f 100644
--- a/rc.conf.d/blacklistd
+++ b/rc.conf.d/blacklistd
@@ -1,4 +1,3 @@
 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
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 48af087..a3d4465 100644
--- 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 ea2b15a..240e9e4 100644
--- a/rc.conf.local
+++ b/rc.conf.local
@@ -1,2 +1,4 @@
-local_enable="YES"
 keymap="fr.iso.acc.kbd"
+mixer_enable="NO"
+virecover_enable="NO"
+
diff --git a/settings.sh b/settings.sh
deleted file mode 100644
index babe354..0000000
--- a/settings.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export DESTDISK="ada1"
-export DESTDIR="/mnt/zfs"
-export ZPOOL="zroot"
-