WikiTeki /  attachment:git-diff-apache.txt de ZA/Montréal/DésynchronisationDpkg

   1 diff --git a/etc/apache2/sites-available/default b/etc/apache2/sites-available/default
   2 index c131197..b0703f5 100644
   3 --- a/etc/apache2/sites-available/default
   4 +++ b/etc/apache2/sites-available/default
   5 @@ -28,14 +28,4 @@
   6  	LogLevel warn
   7  
   8  	CustomLog ${APACHE_LOG_DIR}/access.log combined
   9 -
  10 -    Alias /doc/ "/usr/share/doc/"
  11 -    <Directory "/usr/share/doc/">
  12 -        Options Indexes MultiViews FollowSymLinks
  13 -        AllowOverride None
  14 -        Order deny,allow
  15 -        Deny from all
  16 -        Allow from 127.0.0.0/255.0.0.0 ::1/128
  17 -    </Directory>
  18 -
  19  </VirtualHost>
  20 diff --git a/etc/apache2/sites-available/default-ssl b/etc/apache2/sites-available/default-ssl
  21 index 9f2d7b8..ea454b8 100644
  22 --- a/etc/apache2/sites-available/default-ssl
  23 +++ b/etc/apache2/sites-available/default-ssl
  24 @@ -30,15 +30,6 @@
  25  
  26  	CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined
  27  
  28 -	Alias /doc/ "/usr/share/doc/"
  29 -	<Directory "/usr/share/doc/">
  30 -		Options Indexes MultiViews FollowSymLinks
  31 -		AllowOverride None
  32 -		Order deny,allow
  33 -		Deny from all
  34 -		Allow from 127.0.0.0/255.0.0.0 ::1/128
  35 -	</Directory>
  36 -
  37  	#   SSL Engine Switch:
  38  	#   Enable/Disable SSL for this virtual host.
  39  	SSLEngine on
  40 diff --git a/etc/apt/sources.list b/etc/apt/sources.list
  41 index 03488c5..f7f0709 100644
  42 --- a/etc/apt/sources.list
  43 +++ b/etc/apt/sources.list
  44 @@ -1,6 +1,6 @@
  45  #
  46  deb http://archive.debian.org/debian squeeze main contrib
  47 -deb http://ftp.debian.org/debian squeeze-lts main contrib non-free
  48 -deb http://ftp.debian.org/debian squeeze-updates main contrib
  49 -deb http://security.debian.org/ squeeze/updates main
  50 +deb http://archive.debian.org/debian squeeze-lts main contrib non-free
  51 +deb http://archive.debian.org/debian squeeze-updates main contrib
  52 +deb http://archive.debian.org/debian-security squeeze/updates main
  53  deb http://apt.auf.org squeeze auf
  54 diff --git a/etc/default/exim4 b/etc/default/exim4
  55 deleted file mode 100644
  56 index e25220c..0000000
  57 --- a/etc/default/exim4
  58 +++ /dev/null
  59 @@ -1,22 +0,0 @@
  60 -# /etc/default/exim4
  61 -EX4DEF_VERSION=''
  62 -
  63 -# 'combined' -	 one daemon running queue and listening on SMTP port
  64 -# 'no'       -	 no daemon running the queue
  65 -# 'separate' -	 two separate daemons
  66 -# 'ppp'      -   only run queue with /etc/ppp/ip-up.d/exim4.
  67 -# 'nodaemon' - no daemon is started at all.
  68 -# 'queueonly' - only a queue running daemon is started, no SMTP listener.
  69 -# setting this to 'no' will also disable queueruns from /etc/ppp/ip-up.d/exim4
  70 -QUEUERUNNER='combined'
  71 -# how often should we run the queue
  72 -QUEUEINTERVAL='30m'
  73 -# options common to quez-runner and listening daemon
  74 -COMMONOPTIONS=''
  75 -# more options for the daemon/process running the queue (applies to the one
  76 -# started in /etc/ppp/ip-up.d/exim4, too.
  77 -QUEUERUNNEROPTIONS=''
  78 -# special flags given to exim directly after the -q. See exim(8)
  79 -QFLAGS=''
  80 -# options for daemon listening on port 25
  81 -SMTPLISTENEROPTIONS=''
  82 diff --git a/etc/email-addresses b/etc/email-addresses
  83 deleted file mode 100644
  84 index 8e4f2cb..0000000
  85 --- a/etc/email-addresses
  86 +++ /dev/null
  87 @@ -1,9 +0,0 @@
  88 -# This is /etc/email-addresses. It is part of the exim package
  89 -#
  90 -# This file contains email addresses to use for outgoing mail. Any local
  91 -# part not in here will be qualified by the system domain as normal.
  92 -#
  93 -# It should contain lines of the form:
  94 -#
  95 -#user: someone@isp.com
  96 -#otheruser: someoneelse@anotherisp.com
  97 diff --git a/etc/ppp/ip-down.d/postfix b/etc/ppp/ip-down.d/postfix
  98 deleted file mode 100755
  99 index 71bc70f..0000000
 100 --- a/etc/ppp/ip-down.d/postfix
 101 +++ /dev/null
 102 @@ -1,34 +0,0 @@
 103 -#!/bin/sh -e
 104 -
 105 -# Called when an interface disconnects
 106 -# Written by LaMont Jones <lamont@debian.org>
 107 -
 108 -# start or reload Postfix as needed
 109 -
 110 -# If /usr isn't mounted yet, silently bail.
 111 -if [ ! -d /usr/lib/postfix ]; then
 112 -	exit 0
 113 -fi
 114 -
 115 -RUNNING=""
 116 -# If master is running, force a queue run to unload any mail that is
 117 -# hanging around.  Yes, sendmail is a symlink...
 118 -if [ -f /var/spool/postfix/pid/master.pid ]; then
 119 -	pid=$(sed 's/ //g' /var/spool/postfix/pid/master.pid)
 120 -	exe=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* //;s/.*\///')
 121 -	if [ "X$exe" = "Xmaster" ]; then
 122 -		RUNNING="y"
 123 -	fi
 124 -fi
 125 -
 126 -if [ ! -x /sbin/resolvconf ]; then
 127 -	f=/etc/resolv.conf
 128 -	if ! cp $f $(postconf -h queue_directory)$f 2>/dev/null; then
 129 -		exit 0
 130 -	fi
 131 -	if [ -n "$RUNNING" ]; then
 132 -		/etc/init.d/postfix reload >/dev/null 2>&1
 133 -	fi
 134 -fi
 135 -
 136 -exit 0
 137 diff --git a/etc/ppp/ip-up.d/exim4 b/etc/ppp/ip-up.d/exim4
 138 deleted file mode 100755
 139 index 0a63c45..0000000
 140 --- a/etc/ppp/ip-up.d/exim4
 141 +++ /dev/null
 142 @@ -1,15 +0,0 @@
 143 -#!/bin/sh
 144 -
 145 -if [ -n "$EX4DEBUG" ]; then
 146 -  echo "now debugging $0 $@"
 147 -  set -x
 148 -fi
 149 -
 150 -[ -x /usr/lib/exim4/exim4 ] || exit 0
 151 -
 152 -[ -f /etc/default/exim4 ] && . /etc/default/exim4
 153 -
 154 -if [ "x${QUEUERUNNER}" != "xno" ] ; then
 155 -# Flush exim queue
 156 -	/usr/sbin/exim4 -qqf ${QUEUERUNNEROPTIONS} ${COMMONOPTIONS}
 157 -fi
 158 diff --git a/etc/ppp/ip-up.d/postfix b/etc/ppp/ip-up.d/postfix
 159 deleted file mode 100755
 160 index bae9b6f..0000000
 161 --- a/etc/ppp/ip-up.d/postfix
 162 +++ /dev/null
 163 @@ -1,43 +0,0 @@
 164 -#!/bin/sh -e
 165 -# Called when a new interface comes up
 166 -# Written by LaMont Jones <lamont@debian.org>
 167 -
 168 -# don't bother to restart postfix when lo is configured.
 169 -if [ "$IFACE" = "lo" ]; then
 170 -	exit 0
 171 -fi
 172 -
 173 -# If /usr isn't mounted yet, silently bail.
 174 -if [ ! -d /usr/lib/postfix ]; then
 175 -	exit 0
 176 -fi
 177 -
 178 -RUNNING=""
 179 -# If master is running, force a queue run to unload any mail that is
 180 -# hanging around.  Yes, sendmail is a symlink...
 181 -if [ -f /var/spool/postfix/pid/master.pid ]; then
 182 -	pid=$(sed 's/ //g' /var/spool/postfix/pid/master.pid)
 183 -	exe=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* //;s/.*\///')
 184 -	if [ "X$exe" = "Xmaster" ]; then
 185 -		RUNNING="y"
 186 -	fi
 187 -fi
 188 -
 189 -# start or reload Postfix as needed
 190 -if [ ! -x /sbin/resolvconf ]; then
 191 -	f=/etc/resolv.conf
 192 -	if ! cp $f $(postconf -h queue_directory)$f 2>/dev/null; then
 193 -		exit 0
 194 -	fi
 195 -	if [ -n "$RUNNING" ]; then
 196 -		/etc/init.d/postfix reload >/dev/null 2>&1
 197 -	fi
 198 -fi
 199 -
 200 -# If master is running, force a queue run to unload any mail that is
 201 -# hanging around.  Yes, sendmail is a symlink...
 202 -if [ -n "$RUNNING" ]; then
 203 -	if [ -x /usr/sbin/sendmail ]; then
 204 -		/usr/sbin/sendmail -q >/dev/null 2>&1
 205 -	fi
 206 -fi