- Add vim-nox optional

- Update installation on Squeeze

docs/INSTALL_DEBIAN_5.0.txt

@@ -34,6 +34,9 @@ opt0.2) Optionally if you are not running in virtual machine you can set server
 
 apt-get install ntp ntpdate
 
+opt0.3) Optionally if you want vi editor improvement
+
+apt-get install vim-nox
 
 
 # Next is the real deal
@@ -178,8 +181,8 @@ quotaon -avug
 apt-get install g++ libc6 gcc gawk make texinfo libmysqlclient15-dev
 
 cd /tmp
-wget http://heanet.dl.sourceforge.net/sourceforge/mydns-ng/mydns-1.2.8.25.tar.gz
-tar xvfz mydns-1.2.8.25.tar.gz
+wget http://heanet.dl.sourceforge.net/sourceforge/mydns-ng/mydns-1.2.8.27.tar.gz
+tar xvfz mydns-1.2.8.27.tar.gz
 cd mydns-1.2.8
 ./configure
 make

docs/INSTALL_DEBIAN_6.0.txt

@@ -34,13 +34,22 @@ opt0.2) Optionally if you are not running in virtual machine you can set server
 
 apt-get install ntp ntpdate
 
+opt0.3) Optionally if you want vi editor improvement
+
+apt-get install vim-nox
+
 
 
 # Next is the real deal
 
 1) Install Postfix, Courier, Saslauthd, MySQL, phpMyAdmin, rkhunter, binutils with the following command line (on one line!):
 
-apt-get install postfix postfix-mysql postfix-doc mysql-client mysql-server courier-authdaemon courier-authlib-mysql courier-pop courier-pop-ssl courier-imap courier-imap-ssl libsasl2-2 libsasl2-modules libsasl2-modules-sql sasl2-bin libpam-mysql openssl courier-maildrop getmail4 rkhunter binutils
+apt-get install postfix postfix-mysql postfix-doc mysql-client mysql-server courier-authdaemon courier-pop courier-pop-ssl courier-imap courier-imap-ssl libsasl2-2 libsasl2-modules libsasl2-modules-sql sasl2-bin libpam-mysql openssl courier-maildrop getmail4 rkhunter binutils
+
+apt-get install libmysqlclient16
+#temp fix for amd64 arch
+wget http://ftp.us.debian.org/debian/pool/main/c/courier-authlib/courier-authlib-mysql_0.62.4-1_amd64.deb
+dpkg --ignore-depends=libmysqlclient15off -i courier-authlib-mysql_0.62.4-1_amd64.deb
 
 # Answer the questions from the package manager as follows.
 
@@ -72,6 +81,7 @@ to:
 2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
 
 apt-get install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2 arj nomarch lzop cabextract apt-listchanges libnet-ldap-perl libauthen-sasl-perl clamav-docs daemon libio-string-perl libio-socket-ssl-perl libnet-ident-perl zip libnet-dns-perl
+#this is necessary? libnet-ldap-perl
 
 # During the installation, the SSL certificates for IMAP-SSL and POP3-SSL are created with the hostname localhost. To change this to the correct hostname (server1.example.com in this tutorial), delete the certificates...
 
@@ -124,23 +134,14 @@ a2enmod suexec rewrite ssl actions include
 
 apt-get install pure-ftpd-common pure-ftpd-mysql quota quotatool
 
-# Edit the file /etc/default/pure-ftpd-common to change the start mode from "inetd" to "standalone"
-and set VIRTUALCHROOT=true
+# Edit the file /etc/default/pure-ftpd-common to set VIRTUALCHROOT=true
 
 vi /etc/default/pure-ftpd-common
 
-# Edit the file /etc/inetd.conf to prevent inetd from trying to start ftp.
-# To do this, comment line starting like "ftp   stream  tcp" by adding "#"-sign in front of the line.
-
-vi /etc/inetd.conf
-
-# Then execute:
-
-/etc/init.d/openbsd-inetd restart
-
 # Some additional settings for pureftpd
 
 echo 'yes' > /etc/pure-ftpd/conf/DontResolve
+echo "yes" > /etc/pure-ftpd/conf/DisplayDotFiles
 
 # Enable TLS in pureftpd
 echo 1 > /etc/pure-ftpd/conf/TLS
@@ -166,16 +167,16 @@ proc            /proc           proc    defaults        0       0
 
 # To enable quota, run these commands:
 
-touch /quota.user /quota.group
-chmod 600 /quota.*
-mount -o remount /
-quotacheck -avugm
+touch /quota.user /quota.group &&
+chmod 600 /quota.* &&
+mount -o remount / &&
+quotacheck -avugm &&
 quotaon -avug
 
 
 5) Install mydns
 
-apt-get install g++ libc6 gcc gawk make texinfo libmysqlclient15-dev
+apt-get install g++ libc6 gcc gawk make texinfo libmysqlclient-dev
 
 cd /tmp
 wget http://heanet.dl.sourceforge.net/sourceforge/mydns-ng/mydns-1.2.8.27.tar.gz
@@ -293,8 +294,8 @@ apt-get install fail2ban
 9.1) Installation of last version from tar.gz
 
   cd /tmp
-  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.9-rc2.tar.gz
-  tar xvfz ISPConfig-3.0.0.9-rc2.tar.gz
+  wget http://downloads.sourceforge.net/ispconfig/ISPConfig-3.0.1.6.tar.gz?use_mirror=
+  tar xvfz ISPConfig-3.0.1.6.tar.gz
   cd ispconfig3_install/install/
 
 9.2) Installation from SVN