From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 16 Aug 2009 19:53:27 +0000 (+0200)
Subject: Delete some old configuration files.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a694dad714ada3d03e5a5bd40f52d83eedf49dca;p=ipfire-3.x.git

Delete some old configuration files.
---

diff --git a/config/asterisk/addons.makeopts b/config/asterisk/addons.makeopts
deleted file mode 100644
index 53e58f41d..000000000
--- a/config/asterisk/addons.makeopts
+++ /dev/null
@@ -1 +0,0 @@
-MENUSELECT_ADDONS=
diff --git a/config/asterisk/asterisk.makeopts b/config/asterisk/asterisk.makeopts
deleted file mode 100644
index 283f34d4b..000000000
--- a/config/asterisk/asterisk.makeopts
+++ /dev/null
@@ -1,34 +0,0 @@
-MENUSELECT_APPS=app_ivrdemo app_osplookup app_rpt app_skel 
-MENUSELECT_CDR=cdr_odbc cdr_pgsql cdr_radius cdr_sqlite cdr_tds 
-MENUSELECT_CHANNELS=chan_gtalk chan_h323 chan_nbs chan_vpb chan_zap 
-MENUSELECT_CODECS=codec_speex codec_zap 
-MENUSELECT_FORMATS=
-MENUSELECT_FUNCS=func_odbc 
-MENUSELECT_PBX=pbx_gtkconsole pbx_kdeconsole 
-MENUSELECT_RES=res_config_odbc res_config_pgsql res_jabber res_odbc res_snmp 
-MENUSELECT_OPTS_app_voicemail=
-MENUSELECT_CFLAGS=LOADABLE_MODULES 
-MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-ALAW 
-MENUSELECT_MOH=MOH-FREEPLAY-WAV 
-MENUSELECT_EXTRA_SOUNDS=EXTRA-SOUNDS-EN-ALAW 
-MENUSELECT_BUILD_DEPS=res_adsi app_meetme res_smdi 
-MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_gtalk
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_zap
-MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
-MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_zap
-MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_jabber
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
diff --git a/config/asterisk/zaptel.makeopts b/config/asterisk/zaptel.makeopts
deleted file mode 100644
index 7fda0618f..000000000
--- a/config/asterisk/zaptel.makeopts
+++ /dev/null
@@ -1,5 +0,0 @@
-MENUSELECT_MODULES=
-MENUSELECT_UTILS=fxstest sethdlc-new zttool 
-MENUSELECT_FIRMWARE=
-MENUSELECT_BUILD_DEPS=zttranscode ztdynamic wct4xxp wctc4xxp 
-MENUSELECT_DEPSFAILED=MENUSELECT_UTILS=zttool
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
deleted file mode 100644
index 69050601c..000000000
--- a/config/backup/backup.pl
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-my $debug = 1;
-my @include = "";
-my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat, $Jahr, $Wochentag, $Jahrestag, $Sommerzeit) = localtime(time);
-$Jahr = $Jahr + 1900;$Monat = $Monat + 1;
-$Monat = sprintf("%02d", $Monat);
-$Monatstag = sprintf("%02d", $Monatstag);
-$Stunden = sprintf("%02d", $Stunden);
-$Minuten = sprintf("%02d", $Minuten);
-
-if ($ARGV[0] eq 'include') {
-  &createinclude;
-    my @files = `find / -name *.log* 2>/dev/null`;
-    foreach (@files){
-      push(@include,$_);
-     }
-    my @files = `find /var/log/ -name *messages* 2>/dev/null`;
-    foreach (@files){
-      push(@include,$_);
-     }
-  open(DATEI, ">/tmp/include") || die "Could not save temp include file";
-  print DATEI @include;
-  print "/var/log/messages";
-  close(DATEI);
-  system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'");
-  system("rm /tmp/include");
-}
-elsif ($ARGV[0] eq 'exclude') {
-  &createinclude;
-  open(DATEI, ">/tmp/include") || die "Could not save temp include file";
-  print DATEI @include;
-  close(DATEI);
-  system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'");
-  system("rm /tmp/include");
-}
-elsif ($ARGV[0] eq 'restore') {
-  system("cd / && tar -xvz --preserve -f /tmp/restore.ipf");
-}
-elsif ($ARGV[0] eq 'restoreaddon') {
-  if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}
-  system("cd / && tar -xvz --preserve -f /var/ipfire/backup/addons/backup/$ARGV[1]");
-}
-elsif ($ARGV[0] eq 'cli') {
-  system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten-$ARGV[1].ipf --files-from='$ARGV[2]' --exclude-from='$ARGV[3]'");
-}
-elsif ($ARGV[0] eq 'addonbackup') {
-  system("tar -cvzf /var/ipfire/backup/addons/backup/$ARGV[1].ipf --files-from='/var/ipfire/backup/addons/includes/$ARGV[1]'");
-}
-elsif ($ARGV[0] =~ /ipf$/ ) {
-  system("rm /var/ipfire/backup/$ARGV[0]");
-}
-elsif ($ARGV[0] eq '') {
- printf "No argument given, please use <include><exclude><cli>\n"
-}
-elsif ($ARGV[0] eq 'makedirs') {
- system("mkdir -p /var/ipfire/backup/addons");
- system("mkdir -p /var/ipfire/backup/addons/backup");
- system("mkdir -p /var/ipfire/backup/addons/includes");
-}
-
-sub createinclude(){
-
-  open(DATEI, "<${General::swroot}/backup/include") || die "Can not open include file";
-  my @Zeilen = <DATEI>;
-  close(DATEI);
-
-  foreach (@Zeilen){
-  if ( $_ =~ /\*/){
-    my @files = `ls $_`;
-    foreach (@files){
-      push(@include,$_);
-     }
-   }
-  else {push(@include,$_);}
-  }
-}
diff --git a/config/backup/exclude b/config/backup/exclude
deleted file mode 100644
index 8103bb9d9..000000000
--- a/config/backup/exclude
+++ /dev/null
@@ -1,5 +0,0 @@
-*.tmp
-/var/ipfire/ethernet/settings
-/var/ipfire/proxy/calamaris/bin/*
-/var/ipfire/qos/bin/qos.pl
-/var/ipfire/urlfilter/blacklists/*/*.db
diff --git a/config/backup/include b/config/backup/include
deleted file mode 100644
index e6a46f939..000000000
--- a/config/backup/include
+++ /dev/null
@@ -1,30 +0,0 @@
-/var/ipfire/*/settings
-/var/ipfire/*/*.conf
-/var/ipfire/*/*.pem
-/var/ipfire/*/config
-/var/ipfire/*/enable
-/var/ipifre/*/*enable*
-/etc/passwd
-/etc/shadow
-/etc/group
-/etc/sysconfig/*
-/etc/hosts*
-/etc/httpd/*
-/etc/ssh/ssh_host*
-/var/ipfire/auth/users
-/var/ipfire/dhcp/*
-/var/ipfire/main/*
-/var/ipfire/outgoing/rules
-/var/ipfire/outgoing/p2protocols
-/var/ipfire/ovpn
-/var/ipfire/ppp
-/var/ipfire/proxy
-/var/ipfire/qos/*
-/var/ipfire/time/
-/var/ipfire/urlfilter
-/var/ipfire/vpn
-/var/log/ip-acct/*
-/var/log/rrd/*
-/etc/sysconfig/firewall.local
-/etc/sysconfig/rc.local
-
diff --git a/config/backup/includes/mpfire b/config/backup/includes/mpfire
deleted file mode 100644
index 4ea18a2a1..000000000
--- a/config/backup/includes/mpfire
+++ /dev/null
@@ -1,6 +0,0 @@
-/etc/asound.state
-/var/ipfire/mpfire/db/
-/var/ipfire/mpfire/mpd.conf
-/var/ipfire/mpfire/mpd_state
-/var/ipfire/mpfire/settings
-/var/ipfire/mpfire/webradio
diff --git a/config/backup/includes/samba b/config/backup/includes/samba
deleted file mode 100644
index 67823bd19..000000000
--- a/config/backup/includes/samba
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/ipfire/samba/global
-/var/ipfire/samba/pdc
-/var/ipfire/samba/printer
-/var/ipfire/samba/private/
-/var/ipfire/samba/settings
-/var/ipfire/samba/shares
-/var/ipfire/samba/smb.conf
diff --git a/config/calamaris/mkreport b/config/calamaris/mkreport
deleted file mode 100644
index 53db9d571..000000000
--- a/config/calamaris/mkreport
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/perl
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) 2005,2006 marco.s
-#
-# $Id: mkreport.pl,v 2.0 2006/03/12 00:00:00 marco.s Exp $
-#
-
-use strict;
-
-use Time::Local;
-
-my $swroot = "/var/ipfire";
-my $apdir  = "$swroot/proxy/calamaris";
-my $squidlogdir = "/var/log/squid";
-my $calamlogdir = "/var/log/calamaris";
-my $reportdir   = "$apdir/reports";
-
-unless (-e $reportdir) { mkdir($reportdir) }
-
-my $unique=time;
-
-my $commandline='';
-my $skip_gzlogs=0;
-
-my @now = localtime(time);
-my $year = $now[5]+1900;
-
-if (@ARGV[0] eq 'nogz')
-{
-	$skip_gzlogs=1;
-	shift(@ARGV);
-}
-
-if (@ARGV < 6) { die "ERROR: Too few arguments\n\n"; }
-
-my $day_begin=@ARGV[0];
-my $month_begin=@ARGV[1];
-my $year_begin=@ARGV[2];
-my $day_end=@ARGV[3];
-my $month_end=@ARGV[4];
-my $year_end=@ARGV[5];
-
-my $i=6;
-
-while ($i < @ARGV) { $commandline.=" @ARGV[$i++]"; } 
-
-$commandline.=" $calamlogdir/squid-$unique.log >> $reportdir/calamaris-$unique.log";
-
-if (&processlogfiles($day_begin,$month_begin,$year_begin,$day_end,$month_end,$year_end) > 0)
-{
-	system("$apdir/bin/calamaris $commandline");
-	system("chown nobody.nobody $reportdir/calamaris-$unique.log");
-}
-
-if (-e "$calamlogdir/squid-$unique.log") { unlink("$calamlogdir/squid-$unique.log"); }
-
-# -------------------------------------------------------------------
-
-sub processlogfiles
-{
-	my $filestr='';
-
-	my $day_from  = $_[0];
-	my $mon_from  = $_[1];
-	my $year_from = $_[2];
-	my $day_to    = $_[3];
-	my $mon_to    = $_[4];
-	my $year_to   = $_[5];
-
-	if (($mon_from =~ /(3|5|8|10)/) && ($day_from > 30)) { $day_from=30 }
-	if (($mon_to   =~ /(3|5|8|10)/) && ($day_to   > 30)) { $day_to=30 }
-	if (($mon_from == 1) && ($day_from > 28)) { if ($year_from%4==0) { $day_from=29 } else { $day_from=28 } }
-	if (($mon_to   == 1) && ($day_to   > 28)) { if ($year_to%4==0)   { $day_to=29 }   else { $day_to=28 } }
-
-	my $date_now  = timelocal(0,0,0,$now[3],$now[4],$year);
-	my $date_from = timelocal(0,0,0,$day_from,$mon_from,$year_from);
-	my $date_to   = timelocal(0,0,0,$day_to,$mon_to,$year_to);
-
-	# if (($date_from > $date_now) || ($date_from > $date_to)) { $year_from-- }
-
-	$day_from  = $_[0];
-	if (($mon_from =~ /(3|5|8|10)/) && ($day_from > 30)) { $day_from=30 }
-	if (($mon_from == 1) && ($day_from > 28)) { if ($year_from%4==0) { $day_from=29 } else { $day_from=28 } }
-
-	my $date_from = timelocal(0,0,0,$day_from,$mon_from,$year_from);
-	my $date_to   = timelocal(59,59,23,$day_to,$mon_to,$year_to);
-
-	open (TMPLOG,">>$calamlogdir/squid-$unique.log") or die "ERROR: Cannot write to $calamlogdir/squid-$unique.log\n";
-
-	unless ($skip_gzlogs) {
-		foreach $filestr (<$squidlogdir/*.gz>)
-		{
-			if ($filestr =~ /access\.log/) {
-				open (LOG,"gzip -dc $filestr |");
-				foreach (<LOG>) {
-					if (substr($_,0,10) >= $date_from) { if (substr($_,0,10) <= $date_to) { print TMPLOG "$_"; } }
-				}
-				close(LOG);
-			}
-		}
-	}
-
-	foreach $filestr (<$squidlogdir/*.log>)
-	{
-		if ($filestr =~ /access\.log/) {
-			open (LOG,$filestr);
-			foreach (<LOG>) {
-				if (substr($_,0,10) >= $date_from) { if (substr($_,0,10) <= $date_to) { print TMPLOG "$_"; } }
-			}
-			close(LOG);
-		}
-	}
-
-	close (TMPLOG);
-
-	return (-s "$calamlogdir/squid-$unique.log");
-
-}
-
-# -------------------------------------------------------------------
diff --git a/config/clamav/clamd.conf b/config/clamav/clamd.conf
deleted file mode 100644
index 2f77b6b3b..000000000
--- a/config/clamav/clamd.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## ipfire config file for the Clam AV daemon
-##
-
-LogSyslog yes
-
-PidFile /var/run/clamd.pid
-LocalSocket /var/run/clamd
-
-ArchiveMaxFileSize 15M
diff --git a/config/clamav/freshclam.conf b/config/clamav/freshclam.conf
deleted file mode 100644
index a2eae00d1..000000000
--- a/config/clamav/freshclam.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-## ipfire config file for freshclam
-##
-
-LogSyslog yes
-
-PidFile /var/run/freshclam.pid
-
-DatabaseMirror database.clamav.net
-
-ScriptedUpdates yes
-
-## Proxy settings
-#HTTPProxyServer myproxy.com
-#HTTPProxyPort 1234
-#HTTPProxyUsername myusername
-#HTTPProxyPassword mypass
-
-NotifyClamd /var/ipfire/clamav/clamd.conf
diff --git a/config/cups/cupsd.conf b/config/cups/cupsd.conf
deleted file mode 100644
index fc2817111..000000000
--- a/config/cups/cupsd.conf
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-#   IPFire configuration file for the Common UNIX Printing System (CUPS)
-#   scheduler.  See "man cupsd.conf" for a complete description of this
-#   file.
-#
-
-# Log general information in error_log - change "info" to "debug" for
-# troubleshooting...
-LogLevel info
-
-# Administrator user group...
-SystemGroup sys root
-
-# Only listen for connections from the local machine.
-Listen 631
-Listen /var/run/cups/cups.sock
-
-# Show shared printers on the local network.
-Browsing On
-BrowseOrder allow,deny
-BrowseAllow @LOCAL
-
-# Default authentication type, when authentication is required...
-DefaultAuthType Basic
-
-# Restrict access to the server...
-<Location />
-  Order allow,deny
-  Allow from All
-</Location>
-
-# Restrict access to the admin pages...
-<Location /admin>
-  Encryption Required
-  Order allow,deny
-  Allow from All
-</Location>
-
-# Restrict access to configuration files...
-<Location /admin/conf>
-  AuthType Basic
-  Require user @SYSTEM
-  Order allow,deny
-  Allow from All
-</Location>
-
-# Set the default printer/job policies...
-<Policy default>
-  # Job-related operations must be done by the owner or an adminstrator...
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All administration operations require an adminstrator to authenticate...
-  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
-    AuthType Basic
-    Require user @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # Only the owner or an administrator can cancel or authenticate a job...
-  <Limit Cancel-Job CUPS-Authenticate-Job>
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  <Limit All>
-    Order deny,allow
-  </Limit>
-</Policy>
diff --git a/config/mpfire/mpd.conf b/config/mpfire/mpd.conf
deleted file mode 100644
index 136ddb6e0..000000000
--- a/config/mpfire/mpd.conf
+++ /dev/null
@@ -1,218 +0,0 @@
-# MPD CONFIG FILE
-# For a full description of all config parameters,
-# Check the mpd man page, "man mpd".
-
-##################### REQUIRED ###########################
-port "6600"
-music_directory "/"
-playlist_directory "/var/ipfire/mpfire"
-log_file "/var/log/mpd.log"
-error_file "/var/log/mpd.error.log"
-pid_file "/var/run/mpd.pid"
-##########################################################
-
-##########################################################
-# EVERYTHING ELSE IS OPTIONAL
-##########################################################
-
-#################### OPTIONAL FILES ######################
-#
-# Location of DB file
-#
-db_file		"/var/ipfire/mpfire/db/mpd.db"
-#
-# The state file (if set) will be a file
-# for storing all current information
-# (playlist, playing/paused, etc...) from
-# the last MPD session. This will be used
-# to recreate your last MPD session after
-# restart.
-#
-state_file "/var/ipfire/mpfire/mpd_state"
-#
-##########################################################
-
-
-################### VOLUME MIXER #########################
-#
-# Examples:
-# ALSA Mixer
-mixer_type		"alsa"
-mixer_device		"default"
-mixer_control		"PCM"
-#
-# OSS Mixer
-#mixer_type		"oss"
-#mixer_device 		"/dev/mixer"
-#mixer_control		"PCM"
-#
-# Software Mixer
-#mixer_type		"software"
-#
-##########################################################
-
-
-################## AUDIO OUTPUT ##########################
-#
-audio_output {
-        type                    "alsa"
-        name                    "alsa"
-#        device                  "hw:0,0"     # optional
-#        format                  "44100:16:2" # optional
-}
-#
-# An example of an OSS output:
-#
-#audio_output {
-#        type                    "oss"
-#        name                    "My OSS Device"
-#        device                  "/dev/dsp"   # optional
-#        format                  "44100:16:2" # optional
-#}
-#
-# An example of a shout output (for streaming to Icecast):
-#
-#audio_output {
-#        type                    "shout"
-#        name                    "My Shout Stream"
-#        host                    "localhost"
-#        port                    "8000"
-#        mount                   "/mpd.ogg"
-#        password                "hackme"
-#        quality                 "5.0"
-#        bitrate                 "128"
-#        format                  "44100:16:1"
-#        user                    "source"                # optional
-#        description             "My Stream Description" # optional
-#        genre                   "jazz"                  # optional
-#        public                  "no"                    # optional
-#}
-#
-# Set this if you have problems
-# playing audio files.
-# This will resample your music so
-# that it comes out at the set rate.
-#
-#audio_output_format	"44100:16:2"
-#
-# You should not need mess with
-# this value unless you know
-# what you're doing.
-#
-#audio_write_size	"1024"
-#
-##########################################################
-
-################# REPLAYGAIN #############################
-#
-# Use Replay Gain (album or title)
-#	http://www.replaygain.org
-#
-#replaygain		"album"
-#
-# Sets the pre-amp used for files that have replaygain
-# info.  Valid values are between -15 to 15 (in dB).
-#
-#replaygain_preamp	"0"
-#
-##########################################################
-
-
-################ OUTPUT BUFFER SETTINGS ##################
-#
-# You should not need to mess with this
-# unless you know what you're doing.
-#
-audio_buffer_size	"2048"
-#
-# This means exactly what it says, it will
-# buffer your file up to the percentage of
-# the buffer before it begins playing.
-#
-buffer_before_play 	"25%"
-#
-##########################################################
-
-
-################### HTTP PROXY ###########################
-#
-# http_proxy_host	"proxy.isp.com"
-# http_proxy_port	"8080"
-# http_proxy_user	"user"
-# http_proxy_password	"password"
-#
-##########################################################
-
-
-################# SECURITY SETTINGS ######################
-#
-# It is encouraged to run MPD as
-# non-superuser.  If you start mpd as root
-# (for example, in an init script), set
-# this value, then  mpd will drop root priveleges
-# and runs as the user specified.
-#
-#user "nobody"
-#
-# Set this value if you only have one
-# address you want to allow connection to.
-#
-bind_to_address "localhost"
-#
-# If you want to setup MPD to use
-# passwords set them here
-#
-#password 		"password1@read,add,control,admin"
-#password 		"password2@read"
-#
-# Specify permissions used by default when no password is
-# given by for a connection/client.
-#
-#default_permissions	"read,add,control,admin"
-#
-##########################################
-
-
-################ MISCELLANEOUS OPTIONS ###################
-#
-# This setting exists as precaution against attacks.
-#
-#max_playlist_length 	"16384"
-#
-# Valid options are "default", "secure" or "verbose".
-#log_level		"default"
-#
-connection_timeout 	"60"
-#
-# This should be fine for 2-3 people using clients
-# at the same time.
-#
-#max_connections 	"5"
-#
-# No need to change these unless you know better.
-#
-#max_command_list_size 	"2048"
-#max_output_buffer_size "2048"
-#
-# This will make playlists compatible with normal music
-# players.
-#
-#save_absolute_paths_in_playlists "no"
-#
-##########################################################
-
-###################### CHARACTER ENCODINGS #####################
-#
-# If file or directory names do not display correctly, then you
-# may need to change this.  In most cases it should be either
-# "ISO-8859-1" or "UTF-8".  You must recreate your database
-# after changing this (use mpd --create-db).
-#
-filesystem_charset              "UTF-8"
-#
-# The encoding that ID3v1 tags should be converted from.
-#
-id3v1_encoding                  "UTF-8"
-metadata_to_use "artist,album,title,track,name,comment,date,genre"
-#
-################################################################
diff --git a/config/mpfire/mpd.db b/config/mpfire/mpd.db
deleted file mode 100644
index 5ebeb74eb..000000000
--- a/config/mpfire/mpd.db
+++ /dev/null
@@ -1,6 +0,0 @@
-info_begin
-mpd_version: 0.13.0
-fs_charset: UTF-8
-info_end
-songList begin
-songList end
diff --git a/config/mpfire/mpfire.pl b/config/mpfire/mpfire.pl
deleted file mode 100644
index acd3a220d..000000000
--- a/config/mpfire/mpfire.pl
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/perl
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-
-my $filename = "";
-my $debug = 0;
-
-if (  `/etc/init.d/mpd status` =~/not running/ ){
-system("/etc/init.d/mpd start >/dev/null");
-}
-
-if ($ARGV[0] eq 'scan') {
-  if ($debug){print "Creating Database\n";}
-  system("mpd --create-db >/dev/null");
-  system("/etc/init.d/mpd restart >/dev/null");
-}
-elsif ($ARGV[0] eq 'play') {
-  &checkmute();
-  &clearplaylist();
-  if ($debug){print "Yes we are called and we will play $ARGV[1]\n";}
-  system("mpc add \"$ARGV[1]\" >/dev/null && mpc play >/dev/null");
-  }
-elsif ($ARGV[0] eq 'playadd') {
-  if ($debug){print "Yes we are called and we will add $ARGV[1]\n";}
-  system("mpc add \"$ARGV[1]\" >/dev/null && mpc play >/dev/null");
-  }
-elsif ($ARGV[0] eq 'playlist') {
-  &checkmute();
-  &shuffle();
-  &clearplaylist();
-  if ($debug){print "Yes we are called and we will play your Playlist\n";}
-  system("mpc load playlist >/dev/null && mpc play >/dev/null");
-  }
-elsif ($ARGV[0] eq 'clearplaylist') {
-  if ($debug){print "Deleting playlist\n";}
-  &clearplaylist();
-  }
-elsif ($ARGV[0] eq 'stop') {
-    my $PID = 'cat /var/run/mpd.pid';
-    if ($debug){print "Killing Process $PID\n";}
-    system("mpc stop >/dev/null");
-  }
-elsif ($ARGV[0] eq 'volup') {
-  if ($debug){print "Increasing Volume\n";}
-  system("/usr/bin/amixer set Master $ARGV[1]%+ 2>/dev/null >/dev/null");
-  system("/usr/bin/amixer set PCM $ARGV[1]%+ 2>/dev/null >/dev/null");
-  }
-elsif ($ARGV[0] eq 'voldown') {
-  if ($debug){print "Decreasing Volume\n";}
-  system("/usr/bin/amixer set Master $ARGV[1]%- 2>/dev/null >/dev/null");
-  system("/usr/bin/amixer set PCM $ARGV[1]%- 2>/dev/null >/dev/null");
-  }
-elsif ($ARGV[0] eq 'toggle') {
-  system("mpc toggle >/dev/null");
-  }
-elsif ($ARGV[0] eq 'next') {
-  if ($debug){print "Next Song\n";}
-  system("mpc next >/dev/null[");
-  }
-elsif ( $ARGV[0] eq 'prev' ) {
-  if ($debug){print "Previous Song\n";}
-  system("mpc prev >/dev/null");
-  }
-elsif ($ARGV[0] eq 'song') {
-  my $song = `mpc \| head -2 | grep -v volume`;
-  print $song;
-  }
-elsif ($ARGV[0] eq 'stats') {
-  my $song = `mpc stats | grep Songs`;
-  print $song;
-  }
-elsif ($ARGV[0] eq 'playweb') {
-  &checkmute();
-  &clearplaylist();
-  if ($debug){print "Playing webstream $ARGV[1] \n";}
-     system("mpc add http://$ARGV[1] >/dev/null && mpc play >/dev/null && sleep 1");
-  }
-elsif ($ARGV[0] eq 'volume') {
- $temp = "Master - ";
- $temp .= `amixer get Master \| tail -2 \| awk '{ print \$2" "\$5 }'`;
- $temp .= "<break>PCM -";
- $temp .= `amixer get PCM \| tail -2 \| awk '{ print \$2" "\$5 }'`;
- print $temp;
-}
-
-sub clearplaylist(){
-  system("mpc clear >/dev/null");
-  }
-
-sub shuffle(){
-  system("mpc random >/dev/null");
-  }
-
-sub checkplaylist(){
- my $Datei = "/var/ipfire/mpfire/playlist.m3u";
- my @Info = stat($Datei);
- if ( $Info[7] eq '' || $Info[7] eq '0' ){print "There is no playlist";exit(1);}
-}
-
-sub checkmute(){
- $temp = `amixer get Master \| tail -2`;
-  my @Master = split(/ /,$temp);
- $temp = `amixer get PCM \| tail -2`;
-  my @PCM = split(/ /,$temp);
- if ( $PCM[7] =~  /off/ ){
-  if ($debug){print "PCM was muted - umuting.\n";}
-  system("amixer set PCM toggle >/dev/null");
-  }
- if ( $Master[7] =~ /off/ ){
-  if ($debug){print "Master was muted - umuting.\n";}
-  system("amixer set Master toggle >/dev/null");
-  }
-}
diff --git a/config/mpfire/webradio b/config/mpfire/webradio
deleted file mode 100644
index f8f1a5d1a..000000000
--- a/config/mpfire/webradio
+++ /dev/null
@@ -1,57 +0,0 @@
-62.75.176.45/rtl-high|89.0 RTL Hitradio|http://www.89.0rtl.de
-gffstream.ic.llnwd.net/stream/gffstream_stream_wdr_einslive_b|Einslive|http://www.einslive.de/
-213.186.41.149:8040|Deepinside Radio European|http://www.deepinside.co.uk
-62.75.176.40:80/bigfm-cbr-128|BigFM|http://www.bigfm.de
-62.75.176.44/brocken-high|Hit-Radio Brocken|http://www.radiobrocken.de
-87.118.100.135:9191|Spaceworld Radio|http://spaceworld-radio.de/
-dsl.blackbeats.fm:13000|BlackBeats FM|http://www.blackbeats.fm
-87.118.64.197:3100|Discofox-Radio|http://www.discofox-radio.de
-rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/
-relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com
-relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/
-www.scenemusic.eu:8002/high.ogg|Nectarine 100% Demoscene Radio|http://www.scenemusic.eu/
-radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/
-160.79.128.40:7234|DI.FM Future Pop|http://www.di.fm
-scfire-ntc-aa03.stream.aol.com:80/stream/1003|DI.FM Trance|http://www.di.fm
-scfire-ntc-aa04.stream.aol.com:80/stream/1065|DI.FM Vocal Trance|http://www.di.fm
-scfire-nyk-aa03.stream.aol.com:80/stream/1035|DI.FM Chillout|http://www.di.fm
-scfire-nyk-aa03.stream.aol.com:80/stream/1024|DI.FM Euro Dance|http://www.di.fm
-scfire-nyk-aa04.stream.aol.com:80/stream/1007|DI.FM House|http://www.di.fm
-205.188.215.232:8016|DI.FM Soulfull House|http://www.di.fm
-scfire-chi-aa02.stream.aol.com:80/stream/1025|DI.FM Hard Dance|http://www.di.fm
-66.250.45.118:7204|DI.FM Techno|http://www.di.fm
-scfire-ntc-aa02.stream.aol.com:80/stream/1026|DI.FM Progressive|http://www.di.fm
-scfire-ntc-aa03.stream.aol.com:80/stream/1008|DI.FM Goa-Psy Trance|http://www.di.fm
-scfire-ntc-aa04.stream.aol.com:80/stream/1004|DI.FM Hardcore|http://www.di.fm
-209.247.146.100:8000|DI.FM DJ Mixes|http://www.di.fm
-scfire-ntc-aa03.stream.aol.com:80/stream/1009|DI.FM Lounge|http://www.di.fm
-207.200.96.229:8030|DI.FM Drum 'n' Bass|http://www.di.fm
-205.188.215.225:8004|DI.FM Classic Electronica|http://www.di.fm
-205.188.215.228:8006|DI.FM Ambient|http://www.di.fm
-205.188.215.225:8002|DI.FM Breaks|http://www.di.fm
-205.188.215.226:8006|DI.FM Gabber|http://www.di.fm
-160.79.128.40:7794|SKY.FM Solo Piano|http://www.sky.fm
-160.79.128.40:7814|SKY.FM Piano Jazz|http://www.sky.fm
-160.79.128.40:7804|SKY.FM Bossa Nova Jazz|http://www.sky.fm
-160.79.128.40:7774|SKY.FM Simply Soundtracks|http://www.sky.fm
-160.79.128.40:7784|SKY.FM Contemporary Christian|http://www.sky.fm
-scfire-chi-aa04.stream.aol.com:80/stream/1010|SKY.FM Smooth Jazz|http://www.sky.fm
-160.79.128.61:7714|SKY.FM Uptempo Smooth Jazz|http://www.sky.fm
-scfire-chi-aa01.stream.aol.com:80/stream/1014|SKY.FM Top Hits!|http://www.sky.fm
-scfire-ntc-aa03.stream.aol.com:80/stream/1013|SKY.FM Best of the 80's|http://www.sky.fm
-scfire-chi-aa04.stream.aol.com:80/stream/1076|SKY.FM All Hit 70's|http://www.sky.fm
-160.79.128.61:7684|SKY.FM Oldies|http://www.sky.fm
-scfire-dll-aa03.stream.aol.com:80/stream/1006|SKY.FM Mostly Classical|http://www.sky.fm
-205.188.215.226:8020|SKY.FM Classical Guitar|http://www.sky.fm
-scfire-nyk-aa04.stream.aol.com:80/stream/1002|SKY.FM New Age|http://www.sky.fm
-160.79.128.61:7674|SKY.FM World Music|http://www.sky.fm
-scfire-nyk-aa04.stream.aol.com:80/stream/1017|SKY.FM Roots Reggae|http://www.sky.fm
-38.119.49.140:8030|SKY.FM DaTempo Lounge|http://www.sky.fm
-scfire-chi-aa02.stream.aol.com:80/stream/1019|SKY.FM Country|http://www.sky.fm
-160.79.128.40:7734|SKY.FM Classic Rock|http://www.sky.fm
-160.79.128.40:7754|SKY.FM Alternative Rock|http://www.sky.fm
-66.135.38.32:8000|SKY.FM Urban Jamz|http://www.sky.fm
-160.79.128.61:7694|SKY.FM Classic Rap|http://www.sky.fm
-160.79.128.61:7724|SKY.FM Indie Rock|http://www.sky.fm
-205.188.215.231:8010|SKY.FM Salsa|http://www.sky.fm
-205.188.215.227:8008|SKY.FM Modern Jazz|http://www.sky.fm
diff --git a/config/postfix/aliases b/config/postfix/aliases
deleted file mode 100644
index fbe7299cf..000000000
--- a/config/postfix/aliases
+++ /dev/null
@@ -1,6 +0,0 @@
-# Begin /etc/aliases
-
-MAILER-DAEMON:     postmaster
-postmaster:        root
-
-# End /etc/aliases
diff --git a/config/postfix/body_checks b/config/postfix/body_checks
deleted file mode 100644
index e2eeacc24..000000000
--- a/config/postfix/body_checks
+++ /dev/null
@@ -1 +0,0 @@
-/^((Content-(Disposition: attachment;|Type:).*|\ +)| *)(file)?name\ *=\ *"?.*\.(lnk|asd|hlp|ocx|reg|bat|c[ho]m|cmd|exe|dll|vxd|pif|scr|hta|jse?|sh[mbs]|vb[esx]|ws[fh]|wmf)"?\ *$/      REJECT  attachment type not allowed
diff --git a/config/postfix/header_checks b/config/postfix/header_checks
deleted file mode 100644
index 038470778..000000000
--- a/config/postfix/header_checks
+++ /dev/null
@@ -1,379 +0,0 @@
-# HEADER_CHECKS(5)                                              HEADER_CHECKS(5)
-# 
-# NAME
-#        header_checks - Postfix built-in header/body inspection
-# 
-# SYNOPSIS
-#        header_checks = pcre:/etc/postfix/header_checks
-#        mime_header_checks = pcre:/etc/postfix/mime_header_checks
-#        nested_header_checks = pcre:/etc/postfix/nested_header_checks
-#        body_checks = pcre:/etc/postfix/body_checks
-# 
-#        postmap -fq "string" pcre:/etc/postfix/filename
-#        postmap -fq - pcre:/etc/postfix/filename <inputfile
-# 
-# DESCRIPTION
-#        Postfix  provides  a  simple  built-in  content inspection
-#        mechanism that examines incoming mail one  message  header
-#        or one message body line at a time. Each input is compared
-#        against a list of patterns, and when a match is found  the
-#        corresponding  action is executed.  This feature is imple-
-#        mented by the Postfix cleanup(8) server.
-# 
-#        For examples, see the EXAMPLES section at the end of  this
-#        manual page.
-# 
-#        Postfix header or body_checks are designed to stop a flood
-#        of mail from worms or viruses; they do not decode  attach-
-#        ments,  and  they do not unzip archives. See the documents
-#        referenced below in the README FILES section if  you  need
-#        more sophisticated content analysis.
-# 
-#        Postfix supports four built-in content inspection classes:
-# 
-#        header_checks
-#               These  are  applied  to  initial  message   headers
-#               (except  for  the  headers  that are processed with
-#               mime_header_checks).
-# 
-#        mime_header_checks (default: $header_checks)
-#               These are applied to MIME related  message  headers
-#               only.
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        nested_header_checks (default: $header_checks)
-#               These are applied to message  headers  of  attached
-#               email  messages  (except  for  the headers that are
-#               processed with mime_header_checks).
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        body_checks
-#               These  are  applied to all other content, including
-#               multi-part message boundaries.
-# 
-#               With Postfix versions before 2.0, all content after
-#               the initial message headers is treated as body con-
-#               tent.
-# 
-#        Note: message headers are examined one logical header at a
-#        time,  even  when  a  message header spans multiple lines.
-#        Body lines are always examined one line at a time.
-# 
-# TABLE FORMAT
-#        This document assumes that header  and  body_checks  rules
-#        are  specified  in  the form of Postfix regular expression
-#        lookup tables. Usually the best  performance  is  obtained
-#        with pcre (Perl Compatible Regular Expression) tables, but
-#        the slower regexp (POSIX regular expressions)  support  is
-#        more  widely  available.  Use the command "postconf -m" to
-#        find out what lookup table types your Postfix system  sup-
-#        ports.
-# 
-#        The general format of Postfix regular expression tables is
-#        given below.  For a  discussion  of  specific  pattern  or
-#        flags   syntax,   see  pcre_table(5)  or  regexp_table(5),
-#        respectively.
-# 
-#        /pattern/flags action
-#               When pattern matches the input string, execute  the
-#               corresponding  action. See below for a list of pos-
-#               sible actions.
-# 
-#        !/pattern/flags action
-#               When pattern does not match the input string,  exe-
-#               cute the corresponding action.
-# 
-#        if /pattern/flags
-# 
-#        endif  Match the input string against the patterns between
-#               if and endif, if and only if the input string  also
-#               matches pattern. The if..endif can nest.
-# 
-#               Note:  do not prepend whitespace to patterns inside
-#               if..endif.
-# 
-#        if !/pattern/flags
-# 
-#        endif  Match the input string against the patterns between
-#               if  and endif, if and only if the input string does
-#               not match pattern. The if..endif can nest.
-# 
-#        blank lines and comments
-#               Empty lines and whitespace-only lines are  ignored,
-#               as  are  lines whose first non-whitespace character
-#               is a `#'.
-# 
-#        multi-line text
-#               A pattern/action line  starts  with  non-whitespace
-#               text.  A line that starts with whitespace continues
-#               a logical line.
-# 
-# TABLE SEARCH ORDER
-#        For each line of message input, the patterns  are  applied
-#        in  the order as specified in the table. When a pattern is
-#        found that  matches  the  input  line,  the  corresponding
-#        action  is  executed  and  then  the  next  input  line is
-#        inspected.
-# 
-# TEXT SUBSTITUTION
-#        Substitution of substrings  from  the  matched  expression
-#        into  the action string is possible using the conventional
-#        Perl syntax ($1, $2, etc.).   The  macros  in  the  result
-#        string  may  need  to  be  written as ${n} or $(n) if they
-#        aren't followed by whitespace.
-# 
-#        Note: since negated patterns (those preceded by !)  return
-#        a result when the expression does not match, substitutions
-#        are not available for negated patterns.
-# 
-# ACTIONS
-#        Action names are case insensitive. They are shown in upper
-#        case for consistency with other Postfix documentation.
-# 
-#        DISCARD optional text...
-#               Claim  successful delivery and silently discard the
-#               message.  Log the optional text if specified,  oth-
-#               erwise log a generic message.
-# 
-#               Note:   this  action  disables  further  header  or
-#               body_checks inspection of the current  message  and
-#               affects all recipients.
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        DUNNO  Pretend that the input line did not match any  pat-
-#               tern,  and inspect the next input line. This action
-#               can be used to shorten the table search.
-# 
-#               For backwards compatibility reasons,  Postfix  also
-#               accepts  OK but it is (and always has been) treated
-#               as DUNNO.
-# 
-#               This feature is available in Postfix 2.1 and later.
-# 
-#        FILTER transport:destination
-#               Write  a  content  filter request to the queue file
-#               and inspect the next input line.   After  the  com-
-#               plete  message  is received it will be sent through
-#               the specified external content filter.  More infor-
-#               mation  about  external  content  filters is in the
-#               Postfix FILTER_README file.
-# 
-#               Note:  this  action  overrides  the  main.cf   con-
-#               tent_filter  setting, and affects all recipients of
-#               the message.  In  the  case  that  multiple  FILTER
-#               actions fire, only the last one is executed.
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        HOLD optional text...
-#               Arrange for the message to be placed  on  the  hold
-#               queue,  and  inspect the next input line.  The mes-
-#               sage remains on hold until someone  either  deletes
-#               it  or  releases it for delivery.  Log the optional
-#               text if specified, otherwise log a generic message.
-# 
-#               Mail  that  is  placed on hold can be examined with
-#               the postcat(1) command, and  can  be  destroyed  or
-#               released with the postsuper(1) command.
-# 
-#               Note:  use  "postsuper -r" to release mail that was
-#               kept on hold for a significant fraction  of  $maxi-
-#               mal_queue_lifetime  or  $bounce_queue_lifetime,  or
-#               longer.
-# 
-#               Note: this action affects  all  recipients  of  the
-#               message.
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        IGNORE Delete the current line from the input and  inspect
-#               the next input line.
-# 
-#        PREPEND text...
-#               Prepend  one  line  with  the  specified  text  and
-#               inspect the next input line.
-# 
-#               Notes:
-# 
-#               o      The prepended text is output on  a  separate
-#                      line,  immediately  before  the  input  that
-#                      triggered the PREPEND action.
-# 
-#               o      The prepended text is not considered part of
-#                      the  input  stream:  it  is  not  subject to
-#                      header/body checks or address rewriting, and
-#                      it does not affect the way that Postfix adds
-#                      missing message headers.
-# 
-#               o      When prepending text before a message header
-#                      line,  the  prepended text must begin with a
-#                      valid message header label.
-# 
-#               o      This action cannot be used to prepend multi-
-#                      line text.
-# 
-#               This feature is available in Postfix 2.1 and later.
-# 
-#        REDIRECT user@domain
-#               Write a message redirection request  to  the  queue
-#               file  and  inspect  the  next input line. After the
-#               message is queued, it will be sent to the specified
-#               address instead of the intended recipient(s).
-# 
-#               Note:  this action overrides the FILTER action, and
-#               affects all recipients of the message. If  multiple
-#               REDIRECT  actions  fire,  only the last one is exe-
-#               cuted.
-# 
-#               This feature is available in Postfix 2.1 and later.
-# 
-#        REPLACE text...
-#               Replace  the  current  line with the specified text
-#               and inspect the next input line.
-# 
-#               This feature is available in Postfix 2.2 and later.
-#               The  description below applies to Postfix 2.2.2 and
-#               later.
-# 
-#               Notes:
-# 
-#               o      When replacing a message  header  line,  the
-#                      replacement  text  must  begin  with a valid
-#                      header label.
-# 
-#               o      The replaced text remains part of the  input
-#                      stream.  Unlike  the result from the PREPEND
-#                      action, a replaced  message  header  may  be
-#                      subject  to address rewriting and may affect
-#                      the way that Postfix  adds  missing  message
-#                      headers.
-# 
-#        REJECT optional text...
-#               Reject  the  entire  message.  Reply  with optional
-#               text... when the optional text is specified, other-
-#               wise reply with a generic error message.
-# 
-#               Note:   this  action  disables  further  header  or
-#               body_checks inspection of the current  message  and
-#               affects all recipients.
-# 
-#        WARN optional text...
-#               Log  a  warning with the optional text... (or log a
-#               generic message) and inspect the next  input  line.
-#               This action is useful for debugging and for testing
-#               a pattern before applying more drastic actions.
-# 
-# BUGS
-#        Many people overlook the main limitations  of  header  and
-#        body_checks  rules.   These  rules  operate on one logical
-#        message header or one body line at a time, and a  decision
-#        made  for  one  line is not carried over to the next line.
-#        If text in the message body is encoded (RFC 2045) then the
-#        rules  have  to specified for the encoded form.  Likewise,
-#        when message headers are encoded (RFC 2047) then the rules
-#        need to be specified for the encoded form.
-# 
-#        Message  headers added by the cleanup(8) daemon itself are
-#        excluded from inspection. Examples of such message headers
-#        are From:, To:, Message-ID:, Date:.
-# 
-#        Message  headers  deleted by the cleanup(8) daemon will be
-#        examined before they are deleted. Examples are: Bcc:, Con-
-#        tent-Length:, Return-Path:.
-# 
-# CONFIGURATION PARAMETERS
-#        body_checks
-#               Lookup tables with content filter rules for message
-#               body lines.  These filters see one physical line at
-#               a  time,  in  chunks  of at most $line_length_limit
-#               bytes.
-# 
-#        body_checks_size_limit
-#               The amount of  content  per  message  body  segment
-#               (attachment) that is subjected to $body_checks fil-
-#               tering.
-# 
-#        header_checks
-# 
-#        mime_header_checks (default: $header_checks)
-# 
-#        nested_header_checks (default: $header_checks)
-#               Lookup tables with content filter rules for message
-#               header  lines:  respectively,  these are applied to
-#               the initial message  headers  (not  including  MIME
-#               headers),  to the MIME headers anywhere in the mes-
-#               sage, and to the initial headers of  attached  mes-
-#               sages.
-# 
-#               Note:  these filters see one logical message header
-#               at a time, even when a message header spans  multi-
-#               ple  lines.  Message  headers  that are longer than
-#               $header_size_limit characters are truncated.
-# 
-#        disable_mime_input_processing
-#               While receiving mail, give no special treatment  to
-#               MIME  related  message  headers; all text after the
-#               initial message headers is considered to be part of
-#               the  message body. This means that header_checks is
-#               applied to all the  initial  message  headers,  and
-#               that body_checks is applied to the remainder of the
-#               message.
-# 
-#               Note: when used in this  manner,  body_checks  will
-#               process  a  multi-line message header one line at a
-#               time.
-# 
-# EXAMPLES
-#        Header pattern to block attachments  with  bad  file  name
-#        extensions.
-# 
-#        /etc/postfix/main.cf:
-#            header_checks = regexp:/etc/postfix/header_checks
-# 
-#        /etc/postfix/header_checks:
-#            /^content-(type|disposition):.*name[[:space:]]*=.*\.(exe|vbs)/
-#                REJECT Bad attachment file name extension: $2
-# 
-#        Body pattern to stop a specific HTML browser vulnerability
-#        exploit.
-# 
-#        /etc/postfix/main.cf:
-#            body_checks = regexp:/etc/postfix/body_checks
-# 
-#        /etc/postfix/body_checks:
-#            /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
-#                REJECT IFRAME vulnerability exploit
-# 
-# SEE ALSO
-#        cleanup(8), canonicalize and enqueue Postfix message
-#        pcre_table(5), format of PCRE lookup tables
-#        regexp_table(5), format of POSIX regular expression tables
-#        postconf(1), Postfix configuration utility
-#        postmap(1), Postfix lookup table management
-#        postsuper(1), Postfix janitor
-#        postcat(1), show Postfix queue file contents
-#        RFC 2045, base64 and quoted-printable encoding rules
-#        RFC 2047, message header encoding for non-ASCII text
-# 
-# README FILES
-#        Use "postconf readme_directory" or  "postconf  html_direc-
-#        tory" to locate this information.
-#        DATABASE_README, Postfix lookup table overview
-#        CONTENT_INSPECTION_README, Postfix content inspection overview
-#        BUILTIN_FILTER_README, Postfix built-in content inspection
-#        BACKSCATTER_README, blocking returned forged mail
-# 
-# LICENSE
-#        The  Secure  Mailer  license must be distributed with this
-#        software.
-# 
-# AUTHOR(S)
-#        Wietse Venema
-#        IBM T.J. Watson Research
-#        P.O. Box 704
-#        Yorktown Heights, NY 10598, USA
-# 
-#                                                               HEADER_CHECKS(5)
diff --git a/config/postfix/main.cf b/config/postfix/main.cf
deleted file mode 100644
index 79374e01b..000000000
--- a/config/postfix/main.cf
+++ /dev/null
@@ -1,84 +0,0 @@
-###
-### main.cf for IPFire
-###
-queue_directory = /var/spool/postfix
-command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
-manpage_directory = /usr/share/man
-sample_directory = /etc/postfix
-html_directory = no
-readme_directory = no
-
-sendmail_path = /usr/sbin/sendmail
-newaliases_path = /usr/bin/newaliases
-mailq_path = /usr/bin/mailq
-
-mail_owner = postfix
-setgid_group = postdrop
-
-myhostname = ipfire.localdomain
-myorigin = $myhostname
-
-inet_interfaces = all
-#proxy_interfaces =
-mydestination = $myhostname, localhost, mysql:/etc/postfix/mysql-mydestination.cf
-unknown_local_recipient_reject_code = 550
-
-mynetworks_style = host
-mynetworks = 127.0.0.0/8
-
-#relay_domains = $mydestination
-#relayhost = $mydomain
-#relayhost = [gateway.my.domain]
-#relayhost = [mailserver.isp.tld]
-#relayhost = uucphost
-#relayhost = [an.ip.add.ress]
-#relay_recipient_maps = hash:/etc/postfix/relay_recipients
-#in_flow_delay = 1s
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-recipient_delimiter = +
-
-mailbox_transport = cyrus
-cyrus_destination_recipient_limit=1
-
-header_checks = regexp:/etc/postfix/header_checks
-#fast_flush_domains = $relay_domains
-
-smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
-#local_destination_concurrency_limit = 2
-#default_destination_concurrency_limit = 20
-
-virtual_alias_maps = mysql:/etc/postfix/mysql-virtual.cf
-sender_canonical_maps = mysql:/etc/postfix/mysql-canonical.cf
-
-smtpd_sasl_type = cyrus
-smtpd_sasl_auth_enable = yes
-smtpd_sasl_security_options = noanonymous
-smtpd_sasl_local_domain = $myhostname
-broken_sasl_auth_clients = yes
-
-#smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
-
-content_filter=amavis:[127.0.0.1]:10024
-
-smtpd_helo_required = yes
-mime_header_checks=pcre:/etc/postfix/body_checks
-smtpd_recipient_restrictions =
-            reject_invalid_hostname,
-            #reject_non_fqdn_hostname,
-            reject_non_fqdn_sender,
-            reject_non_fqdn_recipient,
-            reject_unknown_sender_domain,
-            reject_unknown_recipient_domain,
-            reject_unauth_pipelining,
-            permit_mynetworks,
-            permit_sasl_authenticated,
-            reject_unauth_destination,
-            reject_rbl_client zombie.dnsbl.sorbs.net,
-            reject_rbl_client relays.ordb.org,
-            reject_rbl_client opm.blitzed.org,
-            reject_rbl_client list.dsbl.org,
-            reject_rbl_client sbl.spamhaus.org,
-            permit
-
diff --git a/config/postfix/master.cf b/config/postfix/master.cf
deleted file mode 100644
index 6c2395df1..000000000
--- a/config/postfix/master.cf
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# Postfix master process configuration file.  For details on the format
-# of the file, see the Postfix master(5) manual page.
-#
-# ==========================================================================
-# service type  private unpriv  chroot  wakeup  maxproc command + args
-#               (yes)   (yes)   (yes)   (never) (100)
-# ==========================================================================
-smtp      inet  n       -       n       -       -       smtpd
-#submission inet n      -       n       -       -       smtpd
-#	-o smtpd_etrn_restrictions=reject
-#	-o smtpd_client_restrictions=permit_sasl_authenticated,reject
-#smtps    inet  n       -       n       -       -       smtpd
-#  -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
-#submission   inet    n       -       n       -       -       smtpd
-#  -o smtpd_etrn_restrictions=reject
-#  -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
-#628      inet  n       -       n       -       -       qmqpd
-pickup    fifo  n       -       n       60      1       pickup
-cleanup   unix  n       -       n       -       0       cleanup
-qmgr      fifo  n       -       n       300     1       qmgr
-#qmgr     fifo  n       -       n       300     1       oqmgr
-tlsmgr    unix  -       -       n       1000?   1       tlsmgr
-rewrite   unix  -       -       n       -       -       trivial-rewrite
-bounce    unix  -       -       n       -       0       bounce
-defer     unix  -       -       n       -       0       bounce
-trace     unix  -       -       n       -       0       bounce
-verify    unix  -       -       n       -       1       verify
-flush     unix  n       -       n       1000?   0       flush
-proxymap  unix  -       -       n       -       -       proxymap
-smtp      unix  -       -       n       -       -       smtp
-# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
-relay     unix  -       -       n       -       -       smtp
-	-o fallback_relay=
-#       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
-showq     unix  n       -       n       -       -       showq
-error     unix  -       -       n       -       -       error
-discard   unix  -       -       n       -       -       discard
-local     unix  -       n       n       -       -       local
-virtual   unix  -       n       n       -       -       virtual
-lmtp      unix  -       -       n       -       -       lmtp
-anvil     unix  -       -       n       -       1       anvil
-scache	  unix	-	-	n	-	1	scache
-#
-# ====================================================================
-# Interfaces to non-Postfix software. Be sure to examine the manual
-# pages of the non-Postfix software to find out what options it wants.
-#
-# Many of the following services use the Postfix pipe(8) delivery
-# agent.  See the pipe(8) man page for information about ${recipient}
-# and other message envelope options.
-# ====================================================================
-#
-# maildrop. See the Postfix MAILDROP_README file for details.
-# Also specify in main.cf: maildrop_destination_recipient_limit=1
-#
-maildrop  unix  -       n       n       -       -       pipe
-  flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
-#
-# The Cyrus deliver program has changed incompatibly, multiple times.
-#
-old-cyrus unix  -       n       n       -       -       pipe
-  flags= user=cyrus argv=/usr/cyrus/bin/deliver -r ${sender} -m ${extension} ${user}
-# Cyrus 2.1.5 (Amos Gouaux)
-# Also specify in main.cf: cyrus_destination_recipient_limit=1
-cyrus     unix  -       n       n       -       -       pipe
-  user=cyrus argv=/usr/lib/cyrus/deliver -e -r ${sender} -m ${extension} ${user}
-#
-# See the Postfix UUCP_README file for configuration details.
-#
-uucp      unix  -       n       n       -       -       pipe
-  flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
-#
-# Other external delivery methods.
-#
-procmail  unix  -       n       n       -       20      pipe
-  flags=R user=cyrus argv=/usr/bin/procmail -r SENDER=${sender} -t -m USER=${user} EXTENSION=${extension} /etc/procmailrc
-
-amavis    unix  -       -       n       -      2        lmtp
-    -o lmtp_data_done_timeout=1200
-    -o lmtp_send_xforward_command=yes
-    -o disable_dns_lookups=yes
-    -o max_use=20
-
-127.0.0.1:10025 inet n  -       n       -       -       smtpd
-    -o content_filter=
-    -o local_recipient_maps=
-    -o relay_recipient_maps=
-    -o smtpd_delay_reject=no
-    -o smtpd_restriction_classes=
-    -o smtpd_client_restrictions=
-    -o smtpd_helo_restrictions=
-    -o smtpd_sender_restrictions=
-    -o smtpd_recipient_restrictions=permit_mynetworks,reject
-    -o smtpd_data_restrictions=reject_unauth_pipelining
-    -o smtpd_end_of_data_restrictions=
-    -o mynetworks=127.0.0.0/8
-    -o smtpd_error_sleep_time=0
-    -o smtpd_soft_error_limit=1001
-    -o smtpd_hard_error_limit=1000
-    -o smtpd_client_connection_count_limit=0
-    -o smtpd_client_connection_rate_limit=0
-    -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks
diff --git a/config/postfix/mysql-canonical.cf b/config/postfix/mysql-canonical.cf
deleted file mode 100644
index 2f51e35ff..000000000
--- a/config/postfix/mysql-canonical.cf
+++ /dev/null
@@ -1,8 +0,0 @@
-hosts = localhost
-user = root
-password = mysqlfire
-table = user
-dbname = mail
-select_field = canonical
-where_field = mbox
-additional_conditions = and active = '1' limit 1
diff --git a/config/postfix/mysql-mydestination.cf b/config/postfix/mysql-mydestination.cf
deleted file mode 100644
index 99924241a..000000000
--- a/config/postfix/mysql-mydestination.cf
+++ /dev/null
@@ -1,7 +0,0 @@
-hosts = localhost
-user = root
-password = mysqlfire
-dbname = mail
-table = domains
-select_field = domain
-where_field = domain
diff --git a/config/postfix/mysql-virtual.cf b/config/postfix/mysql-virtual.cf
deleted file mode 100644
index d133592ac..000000000
--- a/config/postfix/mysql-virtual.cf
+++ /dev/null
@@ -1,8 +0,0 @@
-hosts = localhost
-user = root
-password = mysqlfire
-dbname = mail
-table = virtual
-select_field = dest
-where_field = address
-additional_conditions = and active = '1'
diff --git a/config/samba/default.global b/config/samba/default.global
deleted file mode 100644
index 03b237d17..000000000
--- a/config/samba/default.global
+++ /dev/null
@@ -1,37 +0,0 @@
-# global.settings by IPFire Project
-
-[global]
-netbios name = ipfire
-server string = Samba
-workgroup = homeip.net
-
-keep alive = 30
-os level = 33
-fstype = NTFS
-
-kernel oplocks = false
-map to guest = false
-smb ports = 445 139
-unix charset = CP850
-
-security = user
-encrypt passwords = yes
-guest account = samba
-unix password sync = false
-null passwords = yes
-
-bind interfaces only = true
-interfaces =  green0 127.0.0.1
-socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE
-
-username level = 1
-wins support = true
-
-log file       = /var/log/samba/samba-log.%m
-lock directory = /var/lock/samba
-pid directory = /var/run/
-log level = 3 passdb:5 auth:5 winbind:2
-
-preferred master = false
-domain master = false
-local master = false
diff --git a/config/samba/default.pdc b/config/samba/default.pdc
deleted file mode 100644
index 73d2c4f9b..000000000
--- a/config/samba/default.pdc
+++ /dev/null
@@ -1,19 +0,0 @@
-[homes]
-path = /home/%U
-comment = Benutzer-Verzeichnisse
-browseable = yes
-writeable = yes
-valid users = %U
-
-[netlogon]
-path = /var/ipfire/samba/netlogon
-browseable = no
-writeable = no
-comment = NetLogON
-
-[profiles]
-path = /var/ipfire/samba/profiles
-browseable = no
-writeable = yes
-comment = Benutzerprofile
-valid users = %U
diff --git a/config/samba/default.printer b/config/samba/default.printer
deleted file mode 100644
index e2977007c..000000000
--- a/config/samba/default.printer
+++ /dev/null
@@ -1,21 +0,0 @@
-[printers]
-comment     = Drucker
-security    = server
-path        = /var/log/spool/lpd/lp
-lprm command = /usr/local/bin/lprm -P%p %j
-lpq command = /usr/local/bin/lpq %p
-browseable  = yes
-printable   = yes
-public      = yes
-writable    = no
-create mode = 0700
-
-[Drucker]
-security      = server
-path          = /var/log/spool/lpd/lp
-printer name  = lp
-writable      = no
-public        = yes
-printable     = yes
-print command = lpr -r -h -P %p %s
-use client driver = Yes
diff --git a/config/samba/default.settings b/config/samba/default.settings
deleted file mode 100644
index e69de29bb..000000000
diff --git a/config/samba/default.shares b/config/samba/default.shares
deleted file mode 100644
index aa21965f9..000000000
--- a/config/samba/default.shares
+++ /dev/null
@@ -1,18 +0,0 @@
-[Temp]
-path = /tmp
-comment = Temp
-browseable = yes
-writeable = yes
-create mask = 0777
-directory mask = 0777
-guest ok = yes
-force user = samba
-[P2P]
-path = /var/ipfire/samba/p2p
-comment = P2P
-browseable = yes
-writeable = yes
-create mask = 0777
-directory mask = 0777
-guest ok = yes
-force user = samba
diff --git a/config/samba/private/secrets.tdb b/config/samba/private/secrets.tdb
deleted file mode 100755
index 5c510b2fa..000000000
Binary files a/config/samba/private/secrets.tdb and /dev/null differ
diff --git a/config/samba/private/smbpasswd b/config/samba/private/smbpasswd
deleted file mode 100755
index 03dcdee86..000000000
--- a/config/samba/private/smbpasswd
+++ /dev/null
@@ -1 +0,0 @@
-samba:1000:DF7D4C80BE72A070AAD3B435B51404EE:B3A3496D3F61D8CDA3B865A2B4B29A37:[DU         ]:LCT-46151C53:
diff --git a/config/tripwire/settings b/config/tripwire/settings
deleted file mode 100755
index e69de29bb..000000000
diff --git a/config/tripwire/twcfg.txt b/config/tripwire/twcfg.txt
deleted file mode 100644
index 195819cb8..000000000
--- a/config/tripwire/twcfg.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-ROOT                   =/usr/sbin
-POLFILE                =/var/ipfire/tripwire/tw.pol
-DBFILE                 =/var/ipfire/tripwire/$(HOSTNAME).twd
-REPORTFILE             =/var/ipfire/tripwire/report/$(DATE).twr
-SITEKEYFILE            =/var/ipfire/tripwire/site.key
-LOCALKEYFILE           =/var/ipfire/tripwire/local.key
-EDITOR                 =/usr/bin/vi
-LATEPROMPTING          =false
-LOOSEDIRECTORYCHECKING =false
-MAILNOVIOLATIONS       =false
-EMAILREPORTLEVEL       =3
-REPORTLEVEL            =3
-#MAILMETHOD             =SENDMAIL
-#MAILMETHOD             =SMTP
-#SMTPHOST               =phoenix.e-vector.com
-#SMTPPORT	       =25
-SYSLOGREPORTING        =false
-#MAILPROGRAM            =/usr/sbin/sendmail -oi -t
diff --git a/config/tripwire/twpol.txt b/config/tripwire/twpol.txt
deleted file mode 100644
index 9cdcce89f..000000000
--- a/config/tripwire/twpol.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-@@section GLOBAL
-TWROOT=/usr/sbin;
-TWBIN=/usr/sbin;
-TWPOL="/var/ipfire/tripwire";
-TWDB="/var/ipfire/tripwire";
-TWSKEY="/var/ipfire/tripwire";
-TWLKEY="/var/ipfire/tripwire";
-TWREPORT="/var/ipfire/tripwire/report";
-HOSTNAME=ipfire;
-
-@@section FS
-SEC_CRIT      = $(IgnoreNone)-SHa ;  # Critical files that cannot change
-SEC_CONFIG    = $(Dynamic) ;         # Config files that are changed infrequently but accessed often
-SEC_LOG       = $(Growing) ;         # Files that grow, but that should never change ownership
-SEC_INVARIANT = +tpug ;              # Directories that should never change permission or ownership
-SIG_LOW       = 33 ;                 # Non-critical files that are of minimal security impact
-SIG_MED       = 66 ;                 # Non-critical files that are of significant security impact
-SIG_HI        = 100 ;                # Critical files that are significant points of vulnerability
-
-# System Files
-
-(
-  rulename = "System Files",
-  severity = $(SIG_HI)
-)
-{
-  $(TWDB)                          -> $(SEC_CRIT) ;
-  $(TWPOL)/tw.pol                  -> $(SEC_CRIT) -i ;
-  $(TWPOL)/tw.cfg                  -> $(SEC_CRIT) -i ;
-  $(TWLKEY)/local.key              -> $(SEC_CRIT) ;
-  $(TWSKEY)/site.key               -> $(SEC_CRIT) ;
-
-  /bin		                         -> $(SEC_CRIT) ;
-  /boot                            -> $(SEC_CRIT) ;
-  /etc                             -> $(SEC_CRIT) ;
-  /etc/snort/rules/                -> $(Dynamic)  ;
-  /lib                             -> $(SEC_CRIT) ;
-  /root                            -> $(SEC_CRIT) ;
-  /root/.bash_history              -> $(Dynamic)  ;
-  /sbin                            -> $(SEC_CRIT) ;
-  /usr                             -> $(SEC_CRIT) ;
-  /usr/share/clamav                -> $(Dynamic)  ;
-  /etc/mtab                        -> $(SEC_CONFIG) -i ; # Inode number changes on any mount/unmount
-
-  #don't scan the individual reports
-  $(TWREPORT)                      -> $(SEC_CONFIG) (recurse=0) ;
-}
-
-# Commonly accessed directories that should remain static with regards to owner and group
-(
-  rulename = "Invariant Directories",
-  severity = $(SIG_MED)
-)
-{
-  /                               -> $(SEC_INVARIANT) (recurse = 0) ;
-  /home                           -> $(SEC_INVARIANT) (recurse = 0) ;
-  /tmp                            -> $(SEC_INVARIANT) ;
-}
-
-# Critical Devices
-
-(
-  rulename = "Critical devices",
-  severity = $(SIG_HI),
-  recurse = false
-)
-{
-     /dev/console                 -> $(SEC_CONFIG) -u ; # User ID may change on console login/logout.
-     /dev/initctl                 -> $(SEC_CONFIG) ;     /dev/log                     -> $(SEC_CONFIG) ;
-     /proc/modules                -> $(Device) ;
-     /proc/mounts                 -> $(Device) ;
-     /proc/filesystems            -> $(Device) ;
-     /proc/misc                   -> $(Device) ;
-     /var/log                     -> $(SEC_LOG) ;
-}