diff --git a/etc/apache2/sites-available/default b/etc/apache2/sites-available/default index c131197..b0703f5 100644 --- a/etc/apache2/sites-available/default +++ b/etc/apache2/sites-available/default @@ -28,14 +28,4 @@ LogLevel warn CustomLog ${APACHE_LOG_DIR}/access.log combined - - Alias /doc/ "/usr/share/doc/" - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all - Allow from 127.0.0.0/255.0.0.0 ::1/128 - - diff --git a/etc/apache2/sites-available/default-ssl b/etc/apache2/sites-available/default-ssl index 9f2d7b8..ea454b8 100644 --- a/etc/apache2/sites-available/default-ssl +++ b/etc/apache2/sites-available/default-ssl @@ -30,15 +30,6 @@ CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined - Alias /doc/ "/usr/share/doc/" - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order deny,allow - Deny from all - Allow from 127.0.0.0/255.0.0.0 ::1/128 - - # SSL Engine Switch: # Enable/Disable SSL for this virtual host. SSLEngine on diff --git a/etc/apt/sources.list b/etc/apt/sources.list index 03488c5..f7f0709 100644 --- a/etc/apt/sources.list +++ b/etc/apt/sources.list @@ -1,6 +1,6 @@ # deb http://archive.debian.org/debian squeeze main contrib -deb http://ftp.debian.org/debian squeeze-lts main contrib non-free -deb http://ftp.debian.org/debian squeeze-updates main contrib -deb http://security.debian.org/ squeeze/updates main +deb http://archive.debian.org/debian squeeze-lts main contrib non-free +deb http://archive.debian.org/debian squeeze-updates main contrib +deb http://archive.debian.org/debian-security squeeze/updates main deb http://apt.auf.org squeeze auf diff --git a/etc/default/exim4 b/etc/default/exim4 deleted file mode 100644 index e25220c..0000000 --- a/etc/default/exim4 +++ /dev/null @@ -1,22 +0,0 @@ -# /etc/default/exim4 -EX4DEF_VERSION='' - -# 'combined' - one daemon running queue and listening on SMTP port -# 'no' - no daemon running the queue -# 'separate' - two separate daemons -# 'ppp' - only run queue with /etc/ppp/ip-up.d/exim4. -# 'nodaemon' - no daemon is started at all. -# 'queueonly' - only a queue running daemon is started, no SMTP listener. -# setting this to 'no' will also disable queueruns from /etc/ppp/ip-up.d/exim4 -QUEUERUNNER='combined' -# how often should we run the queue -QUEUEINTERVAL='30m' -# options common to quez-runner and listening daemon -COMMONOPTIONS='' -# more options for the daemon/process running the queue (applies to the one -# started in /etc/ppp/ip-up.d/exim4, too. -QUEUERUNNEROPTIONS='' -# special flags given to exim directly after the -q. See exim(8) -QFLAGS='' -# options for daemon listening on port 25 -SMTPLISTENEROPTIONS='' diff --git a/etc/email-addresses b/etc/email-addresses deleted file mode 100644 index 8e4f2cb..0000000 --- a/etc/email-addresses +++ /dev/null @@ -1,9 +0,0 @@ -# This is /etc/email-addresses. It is part of the exim package -# -# This file contains email addresses to use for outgoing mail. Any local -# part not in here will be qualified by the system domain as normal. -# -# It should contain lines of the form: -# -#user: someone@isp.com -#otheruser: someoneelse@anotherisp.com diff --git a/etc/ppp/ip-down.d/postfix b/etc/ppp/ip-down.d/postfix deleted file mode 100755 index 71bc70f..0000000 --- a/etc/ppp/ip-down.d/postfix +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -e - -# Called when an interface disconnects -# Written by LaMont Jones - -# start or reload Postfix as needed - -# If /usr isn't mounted yet, silently bail. -if [ ! -d /usr/lib/postfix ]; then - exit 0 -fi - -RUNNING="" -# If master is running, force a queue run to unload any mail that is -# hanging around. Yes, sendmail is a symlink... -if [ -f /var/spool/postfix/pid/master.pid ]; then - pid=$(sed 's/ //g' /var/spool/postfix/pid/master.pid) - exe=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* //;s/.*\///') - if [ "X$exe" = "Xmaster" ]; then - RUNNING="y" - fi -fi - -if [ ! -x /sbin/resolvconf ]; then - f=/etc/resolv.conf - if ! cp $f $(postconf -h queue_directory)$f 2>/dev/null; then - exit 0 - fi - if [ -n "$RUNNING" ]; then - /etc/init.d/postfix reload >/dev/null 2>&1 - fi -fi - -exit 0 diff --git a/etc/ppp/ip-up.d/exim4 b/etc/ppp/ip-up.d/exim4 deleted file mode 100755 index 0a63c45..0000000 --- a/etc/ppp/ip-up.d/exim4 +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -if [ -n "$EX4DEBUG" ]; then - echo "now debugging $0 $@" - set -x -fi - -[ -x /usr/lib/exim4/exim4 ] || exit 0 - -[ -f /etc/default/exim4 ] && . /etc/default/exim4 - -if [ "x${QUEUERUNNER}" != "xno" ] ; then -# Flush exim queue - /usr/sbin/exim4 -qqf ${QUEUERUNNEROPTIONS} ${COMMONOPTIONS} -fi diff --git a/etc/ppp/ip-up.d/postfix b/etc/ppp/ip-up.d/postfix deleted file mode 100755 index bae9b6f..0000000 --- a/etc/ppp/ip-up.d/postfix +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -e -# Called when a new interface comes up -# Written by LaMont Jones - -# don't bother to restart postfix when lo is configured. -if [ "$IFACE" = "lo" ]; then - exit 0 -fi - -# If /usr isn't mounted yet, silently bail. -if [ ! -d /usr/lib/postfix ]; then - exit 0 -fi - -RUNNING="" -# If master is running, force a queue run to unload any mail that is -# hanging around. Yes, sendmail is a symlink... -if [ -f /var/spool/postfix/pid/master.pid ]; then - pid=$(sed 's/ //g' /var/spool/postfix/pid/master.pid) - exe=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* //;s/.*\///') - if [ "X$exe" = "Xmaster" ]; then - RUNNING="y" - fi -fi - -# start or reload Postfix as needed -if [ ! -x /sbin/resolvconf ]; then - f=/etc/resolv.conf - if ! cp $f $(postconf -h queue_directory)$f 2>/dev/null; then - exit 0 - fi - if [ -n "$RUNNING" ]; then - /etc/init.d/postfix reload >/dev/null 2>&1 - fi -fi - -# If master is running, force a queue run to unload any mail that is -# hanging around. Yes, sendmail is a symlink... -if [ -n "$RUNNING" ]; then - if [ -x /usr/sbin/sendmail ]; then - /usr/sbin/sendmail -q >/dev/null 2>&1 - fi -fi