update bsd cfgs and backup script

MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2012 André Grötschel
+Copyright (c) 2004-2014 André Grötschel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

both/srv-mount-check.sh

@@ -4,25 +4,31 @@ SRVIP=">>>SERVER-IP<<<"
 SRVPATH="/home/"
 MNTPOINT="/mnt/srv"
 
+if [ $1 ]; then
+	SRVUSER="$1";
+else
+	SRVUSER=">>>USERNAME<<<";
+fi
+
 PINGRES=`ping -c 1 -w 1 $SRVIP |  grep time= | colrm 1 52 | sed 's/ms//' | sed 's/ //'`
 if [ ! $PINGRES ]; then
-	echo "srv FAIL -> check mounting"
+	echo "srv FAIL -> check mounting";
 	MNTCHECK=`mount | grep $MNTPOINT`;
 	if [ "$MNTCHECK" ]; then 
 		echo "umount $MNTPOINT";
 		umount -f $MNTPOINT;
 	fi
 else
-	MNTCHECK=`mount | grep $MNTPOINT | sed 's/ //'`
-	echo "srv OK -> check mounting"
-        if [ ! $MNTCHECK ]; then 
-		if [ ! -d $MNTPOINT]; then
+	MNTCHECK=`mount | grep $MNTPOINT | sed 's/ //'`;
+	echo "srv OK -> check mounting $MNTCHECK";
+        if [ !$MNTCHECK ]; then 
+		if [ ! -d "$MNTPOINT" ]; then
 			echo "create $MNTPOINT"
                 	mkdir $MNTPOINT;
 			chmod 777 $MNTPOINT;
 	        fi
-		echo "mount $MNTPOINT";
-		mount $SRVIP:$SRVPATH $MNTPOINT;
+		echo "mount $SRVIP:$SRVPATH $MNTPOINT";
+		#mount $SRVIP:$SRVPATH $MNTPOINT;
+		sshfs $SRVUSER@$SRVIP:$SRVPATH $MNTPOINT;
 	fi
-fi
-
+fi

bsd-cfgs/etc-sysctl.conf

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/sysctl.conf,v 1.8.34.1.6.1 2010/12/21 17:09:25 kensmith Exp $
+# $FreeBSD: release/9.1.0/etc/sysctl.conf 112200 2003-03-13 18:43:50Z mux $
 #
 #  This file is read when going to multi-user and its contents piped thru
 #  ``sysctl'' to adjust kernel values.  ``man 5 sysctl.conf'' for details.
@@ -8,10 +8,29 @@
 # are being run under another UID.
 #security.bsd.see_other_uids=0
 
-kern.ipc.maxsockbuf=16777216
-net.inet.tcp.rfc1323=1
-net.inet.tcp.sack.enable=1
+# set to at least 16MB for 10GE hosts
+#kern.ipc.maxsockbuf=16777216
+kern.ipc.maxsockbuf=8388608
+
+# set autotuning maximum to at least 16MB too
+#net.inet.tcp.sendbuf_max=16777216  
+#net.inet.tcp.recvbuf_max=16777216
+net.inet.tcp.sendbuf_max=8388608
+net.inet.tcp.recvbuf_max=8388608
+
+# enable send/recv autotuning
 net.inet.tcp.sendbuf_auto=1
 net.inet.tcp.recvbuf_auto=1
-net.inet.tcp.sendbuf_max=16777216
-net.inet.tcp.recvbuf_max=16777216
+
+# increase autotuning step size 
+net.inet.tcp.sendbuf_inc=16384 
+net.inet.tcp.recvbuf_inc=524288 
+
+net.inet.tcp.rfc1323=1
+#net.inet.tcp.sack.enable=1
+
+# set this on test/measurement hosts
+#net.inet.tcp.hostcache.expire=1
+
+# jails
+security.jail.allow_raw_sockets=1

bsd/srv-script-backup.sh

@@ -1,76 +1,81 @@
 #!/bin/sh
-
-CFGBACKUPDIR="srv-scripte/configs/"
-
-cd ~
-if [ ! -d $CFGBACKUPDIR ]; then
-	mkdir srv-scripte
-	cd srv-scripte
-	mkdir configs
+Y=`date +%Y-%m-%d`
+BACKUPDIR="backup-srv"
+CFGBACKUPMAINDIR=$BACKUPDIR"/srv-scripte"
+CFGBACKUPDIR=$CFGBACKUPMAINDIR"/configs"-$Y
+
+SrvBackupSingleFile() {
+    CFGBACKUPFILE=`echo $1 | sed -e 's/\//-/g'`
+    CFGBACKUPFILE=$CFGBACKUPDIR"/"$CFGBACKUPFILE
+    echo "- backup file: /$1"
+    cp /$1 $CFGBACKUPFILE
+}
+
+if [ ! -d ~/$CFGBACKUPDIR ]; then
+    mkdir ~/$CFGBACKUPDIR
 fi
 
+cd ~
+CFGBACKUPDIR=~/$CFGBACKUPDIR
 # make list from installed ports
-portmaster --list-origins > $CFGBACKUPDIR"installed-port-list"
+portmaster --list-origins > $CFGBACKUPDIR"/installed-port-list"
 # insert portlist to portmaster
 # portmaster -y --no-confirm `cat installed-port-list`
 
-echo "etc rc.d"
+echo "backup files: /etc/rc.d/*"
 cd /etc/
-tar cvfj ~/srv-scripte/configs/etc-rc.d.tar.bz2 rc.d/
+tar cvfj $CFGBACKUPDIR/etc-rc.d.tar.bz2 rc.d/
 cd /usr/local/etc/
-tar cvfj ~/srv-scripte/configs/usr-local-etc-rc.d.tar.bz2 rc.d/
-
-cd ~
-
-CFGBACKUPFILE="boot-loader.conf"
-echo $CFGBACKUPFILE
-cp /boot/loader.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="etc-crontab"
-echo $CFGBACKUPFILE
-cp /etc/crontab $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="etc-sysctl.conf"
-echo $CFGBACKUPFILE
-cp /etc/sysctl.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="etc-hosts.allow"
-echo $CFGBACKUPFILE
-cp /etc/hosts.allow $CFGBACKUPDIR$CFGBACKUPFILE
+tar cvfj $CFGBACKUPDIR/usr-local-etc-rc.d.tar.bz2 rc.d/
 
-CFGBACKUPFILE="etc-pf.conf"
-echo $CFGBACKUPFILE
-cp /etc/pf.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="etc-ppp-ppp.conf"
-echo $CFGBACKUPFILE
-cp /etc/ppp/ppp.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="etc-rc.conf"
-echo $CFGBACKUPFILE
-cp /etc/rc.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="usr-local-etc-dhcpd.conf"
-echo $CFGBACKUPFILE
-cp /usr/local/etc/dhcpd.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="usr-local-etc-dhcpd6.conf"
-echo $CFGBACKUPFILE
-cp /usr/local/etc/dhcpd6.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-
-CFGBACKUPFILE="usr-local-etc-smartd.conf"
-echo $CFGBACKUPFILE
-cp /usr/local/etc/smartd.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="usr-local-etc-unbound-dnsspoof.conf"
-echo $CFGBACKUPFILE
-cp /usr/local/etc/unbound/dnsspoof.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="usr-local-etc-unbound-unbound.conf"
-echo $CFGBACKUPFILE
-cp /usr/local/etc/unbound/unbound.conf $CFGBACKUPDIR$CFGBACKUPFILE
-
-CFGBACKUPFILE="usr-local-etc-zfs-snapshot-mgmt.conf"
-echo $CFGBACKUPFILE
-cp /usr/local/etc/zfs-snapshot-mgmt.conf $CFGBACKUPDIR$CFGBACKUPFILE
+echo "backup files: /etc/ssh"
+cd /etc/
+tar cvfj $CFGBACKUPDIR/etc-ssh.tar.bz2 ssh/
+
+cd $CFGBACKUPDIR
+# /etc/.....
+SrvBackupSingleFile "boot/loader.conf"
+SrvBackupSingleFile "etc/crontab"
+SrvBackupSingleFile "etc/group"
+SrvBackupSingleFile "etc/hosts.allow"
+SrvBackupSingleFile "etc/passwd"
+SrvBackupSingleFile "etc/periodic.conf"
+SrvBackupSingleFile "etc/make.conf"
+SrvBackupSingleFile "etc/pf.conf"
+SrvBackupSingleFile "etc/ppp/ppp.conf"
+SrvBackupSingleFile "etc/rc.conf"
+SrvBackupSingleFile "etc/resolv.conf"
+SrvBackupSingleFile "etc/sysctl.conf"
+
+# /usr/local/etc
+SrvBackupSingleFile "usr/local/etc/dhcpcd.conf"
+SrvBackupSingleFile "usr/local/etc/dhcpd.conf"
+SrvBackupSingleFile "usr/local/etc/dhcpd6.conf"
+SrvBackupSingleFile "usr/local/etc/ezjail/hippy_local"  
+SrvBackupSingleFile "usr/local/etc/ezjail/srv1_local"
+SrvBackupSingleFile "usr/local/etc/ezjail/srv2_local"
+SrvBackupSingleFile "usr/local/etc/ezjail.conf"
+SrvBackupSingleFile "usr/local/etc/named.cache"
+SrvBackupSingleFile "usr/local/etc/pkg.conf"
+SrvBackupSingleFile "usr/local/etc/portaudit.conf"
+SrvBackupSingleFile "usr/local/etc/portaudit.pubkey"
+SrvBackupSingleFile "usr/local/etc/portmaster.rc"
+SrvBackupSingleFile "usr/local/etc/rkhunter.conf"
+SrvBackupSingleFile "usr/local/etc/rsyncd.conf"
+SrvBackupSingleFile "usr/local/etc/smartd.conf"
+SrvBackupSingleFile "usr/local/etc/vnstat.conf"
+
+
+# /usr/local/.../unbound
+SrvBackupSingleFile "usr/local/etc/unbound/dnsspoof.conf"
+srvBackupSingleFile "usr/local/etc/unbound/unbound_control.key"
+SrvBackupSingleFile "usr/local/etc/unbound/unbound_control.pem"
+SrvBackupSingleFile "usr/local/etc/unbound/unbound_server.key"
+SrvBackupSingleFile "usr/local/etc/unbound/unbound_server.pem"
+SrvBackupSingleFile "usr/local/etc/unbound/unbound.conf"
+SrvBackupSingleFile "usr/local/etc/unbound/blacklist.sh"
+
+
+#/usr/local/bin\.... scripte
+SrvBackupSingleFile "usr/local/bin/jails-backup.sh"
+SrvBackupSingleFile "usr/local/bin/mount-jails-ports.sh"

lnx-cfgs/archlinux-syslinux.cfg

@@ -64,11 +64,17 @@ LABEL archfallback
     INITRD ../initramfs-linux-fallback.img
 
 # (1) Arch Linux old kernel
-LABEL arch-3.3.5
-    MENU LABEL Arch Linux 3.3.5
-    LINUX ../vmlinuz-linux-3.3.5
+LABEL arch-3.4.6
+    MENU LABEL Arch Linux 3.4.6
+    LINUX ../vmlinuz-linux-3.4.6
     APPEND root=/dev/disk/by-uuid/_____Your_ID_____ ro quiet  quiet resume=/dev/disk/by-uuid/_____Your_ID_____
-    INITRD ../initramfs-linux-3.3.5.img
+    INITRD ../initramfs-linux-3.4.6.img
+
+LABEL arch-3.3.7
+    MENU LABEL Arch Linux 3.3.7
+    LINUX ../vmlinuz-linux-3.3.7
+    APPEND root=/dev/disk/by-uuid/_____Your_ID_____ ro quiet  quiet resume=/dev/disk/by-uuid/_____Your_ID_____
+    INITRD ../initramfs-linux-3.3.7.img
 
 # (2) Windows
 #LABEL windows
@@ -85,4 +91,4 @@ LABEL hdt
 
 LABEL off
     MENU LABEL Power Off
-    COMBOOT poweroff.com
+    COMBOOT poweroff.com