[gentoo-doc-cvs] cvs commit: virt-mail-howto.xml

[Sven Vermeulen]

swift       08/05/21 19:39:42

  Modified:             virt-mail-howto.xml
  Log:
  Coding style

Revision  Changes    Path
1.59                 xml/htdocs/doc/en/virt-mail-howto.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/virt-mail-howto.xml?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/virt-mail-howto.xml?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/virt-mail-howto.xml?r1=1.58&r2=1.59

Index: virt-mail-howto.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/virt-mail-howto.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- virt-mail-howto.xml	24 Aug 2007 18:59:45 -0000	1.58
+++ virt-mail-howto.xml	21 May 2008 19:39:42 -0000	1.59
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/virt-mail-howto.xml,v 1.58 2007/08/24 18:59:45 swift Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/virt-mail-howto.xml,v 1.59 2008/05/21 19:39:42 swift Exp $ -->
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
 
 <guide link="/doc/en/virt-mail-howto.xml">
@@ -70,9 +70,9 @@
 </p>
 
 <p>
-The following packages are used in this setup: apache, courier-imap, courier-authlib
-postfix, mod_php, phpmyadmin, squirrelmail, cyrus-sasl, mysql, php, and
-mailman.
+The following packages are used in this setup: apache, courier-imap,
+courier-authlib postfix, mod_php, phpmyadmin, squirrelmail, cyrus-sasl, mysql,
+php, and mailman.
 </p>
 
 <p>
@@ -164,7 +164,7 @@
 # <i>/usr/bin/newaliases</i>
 <comment>(This will install the new aliases. You only need to do this
 when you update or install aliases.)</comment>
-		
+
 # <i>/etc/init.d/postfix start</i>
 </pre>
 
@@ -238,11 +238,11 @@
 
 <p>
 Next we're going to install cyrus-sasl. Sasl is going to play the role of
-actually passing your auth variables to courier-auth, which will in turn pass that
-information to mysql for authentication of smtp users.  For this howto, we'll
-not even try to verify that sasl is working until mysql is set up and contains
-a test user. Which is fine since we'll be authenticating against mysql in the
-end anyway.
+actually passing your auth variables to courier-auth, which will in turn pass
+that information to mysql for authentication of smtp users.  For this howto,
+we'll not even try to verify that sasl is working until mysql is set up and
+contains a test user. Which is fine since we'll be authenticating against
+mysql in the end anyway.
 </p>
 
 <pre caption="Configuring and installing the cyrus-sasl ebuild">
@@ -338,10 +338,9 @@
 mangled by postfix and be unable to auth.)</comment>
 
 smtpd_recipient_restrictions =
-	permit_sasl_authenticated,
-	permit_mynetworks,
-	reject_unauth_destination
-	
+  permit_sasl_authenticated,
+  permit_mynetworks,
+  reject_unauth_destination
 
 <comment>(The next two options enable outgoing encryption.)</comment>
 smtp_use_tls = yes
@@ -455,18 +454,17 @@
 
 # <i>/usr/bin/mysql_install_db</i>
 <comment>(After this command runs follow the onscreen directions
-for adding a root password with mysql, otherwise your db will 
+for adding a root password with mysql, otherwise your db will
 be wide open.)</comment>
 
 # <i>/etc/init.d/mysql start</i>
 # <i>mysqladmin -u root -p create mailsql</i>
 # <i>mysql -u root -p mailsql &lt; genericmailsql.sql</i>
-
 # <i>mysql -u root -p mysql</i>
 mysql> <i>GRANT SELECT,INSERT,UPDATE,DELETE</i>
-	->     <i>ON mailsql.*</i>
-	->     <i>TO mailsql@localhost</i>
-	->     <i>IDENTIFIED BY '$password';</i>
+  ->     <i>ON mailsql.*</i>
+  ->     <i>TO mailsql@localhost</i>
+  ->     <i>IDENTIFIED BY '$password';</i>
 Query OK, 0 rows affected (0.02 sec)
 
 mysql> <i>FLUSH PRIVILEGES;</i>
@@ -495,19 +493,19 @@
 </ul>
 
 <pre caption="alias table sample">
-id   alias    destination
-1    root     foo@×××.com
-2  postmaster foo@×××.com
+id   alias      destination
+1    root       foo@×××.com
+2    postmaster foo@×××.com
 </pre>
 
 <pre caption="user table sample">
 <comment>(Line wrapped for clarity.)</comment>
 id email            clear     name     uid     gid     homedir     \
-	maildir                                quota  postfix
+  maildir                                quota  postfix
 10 foo@×××××××××××.com $password realname virtid  virtid  /home/vmail \
-	/home/vmail/virt-domain.com/foo/.maildir/        y
+  /home/vmail/virt-domain.com/foo/.maildir/        y
 13 foo@×××.com      $password realname localid localid /home/foo   \
-	/home/foo/.maildir/                           y
+  /home/foo/.maildir/                           y
 </pre>
 
 <p>
@@ -522,8 +520,8 @@
 </pre>
 
 <pre caption="virtual table sample">
-id   email               destination
-3   root@×××××××××××.com other@×××××.address
+id   email                destination
+3    root@×××××××××××.com other@×××××.address
 </pre>
 
 </body>
@@ -573,7 +571,7 @@
 # <i>cp /etc/ssl/misc/new.cert.cert /etc/apache2/ssl/</i>
 # <i>cp /etc/ssl/misc/new.cert.key /etc/apache2/ssl/</i>
 # <i>cd /etc/apache2/vhosts.d</i>
-<comment>(Check if you have an ssl-vhost template already. 
+<comment>(Check if you have an ssl-vhost template already.
  Copy that one instead of the default_vhost if that is the case)</comment>
 # <i>cp 00_default_vhost.conf ssl-vhost.conf</i>
 # <i>nano -w ssl-vhost.conf</i>
@@ -685,65 +683,65 @@
 # <i>nano -w /etc/postfix/mysql-aliases.cf</i>
 # mysql-aliases.cf
 
-user         	= mailsql
-password     	= $password
-dbname       	= mailsql
-table        	= alias
-select_field 	= destination
-where_field  	= alias
-hosts        	= unix:/var/run/mysqld/mysqld.sock
+user         = mailsql
+password     = $password
+dbname       = mailsql
+table        = alias
+select_field = destination
+where_field  = alias
+hosts        = unix:/var/run/mysqld/mysqld.sock
 </pre>
 
 <pre caption="/etc/postfix/mysql-relocated.cf">
 # <i>nano -w /etc/postfix/mysql-relocated.cf</i>
 # mysql-relocated.cf
 
-user         	= mailsql
-password     	= $password
-dbname       	= mailsql
-table        	= relocated
-select_field 	= destination
-where_field  	= email
-hosts        	= unix:/var/run/mysqld/mysqld.sock
+user         = mailsql
+password     = $password
+dbname       = mailsql
+table        = relocated
+select_field = destination
+where_field  = email
+hosts        = unix:/var/run/mysqld/mysqld.sock
 </pre>
 
 <pre caption="/etc/postfix/mysql-transport.cf (optional)">
-# <i>nano -w /etc/postfix/mysql-transport.cf</i>		
+# <i>nano -w /etc/postfix/mysql-transport.cf</i>
 # mysql-transport.cf
 
-user         	= mailsql
-password     	= $password
-dbname       	= mailsql
-table        	= transport
-select_field 	= destination
-where_field  	= domain
-hosts        	= unix:/var/run/mysqld/mysqld.sock
+user         = mailsql
+password     = $password
+dbname       = mailsql
+table        = transport
+select_field = destination
+where_field  = domain
+hosts        = unix:/var/run/mysqld/mysqld.sock
 </pre>
 
 <pre caption="/etc/postfix/mysql-virtual-gid.cf (optional)">
 # <i>nano -w /etc/postfix/mysql-virtual-gid.cf</i>
 # mysql-virtual-gid.cf
 
-user          	= mailsql
+user            = mailsql
 password        = $password
-dbname        	= mailsql
+dbname          = mailsql
 table           = users
 select_field    = gid
 where_field     = email
 additional_conditions = and postfix = 'y'
-hosts         	= unix:/var/run/mysqld/mysqld.sock
+hosts           = unix:/var/run/mysqld/mysqld.sock
 </pre>
 
 <pre caption="/etc/postfix/mysql-virtual-maps.cf">
 # <i>nano -w /etc/postfix/mysql-virtual-maps.cf</i>
 # mysql-virtual-maps.cf
 
-user        	= mailsql
+user            = mailsql
 password        = $password
 dbname          = mailsql
 table           = users
 select_field    = maildir
-where_field   	= email
+where_field     = email
 additional_conditions = and postfix = 'y'
 hosts           = unix:/var/run/mysqld/mysqld.sock
 </pre>
@@ -757,7 +755,7 @@
 dbname          = mailsql
 table           = users
 select_field    = uid
-where_field    	= email
+where_field     = email
 additional_conditions = and postfix = 'y'
 hosts           = unix:/var/run/mysqld/mysqld.sock
 </pre>
@@ -766,13 +764,13 @@
 # <i>nano -w /etc/postfix/mysql-virtual.cf</i>
 # mysql-virtual.cf
 
-user         	= mailsql
-password     	= $password
-dbname       	= mailsql
-table        	= virtual
-select_field 	= destination
-where_field  	= email
-hosts        	= unix:/var/run/mysqld/mysqld.sock
+user         = mailsql
+password     = $password
+dbname       = mailsql
+table        = virtual
+select_field = destination
+where_field  = email
+hosts        = unix:/var/run/mysqld/mysqld.sock
 </pre>
 
 <p>
@@ -789,7 +787,7 @@
 local_recipient_maps = $alias_maps $virtual_mailbox_maps unix:passwd.byname
 
 virtual_transport = virtual
-<comment>(The domains listed by the mydestination should not be listed in 
+<comment>(The domains listed by the mydestination should not be listed in
  the virtual_mailbox_domains parameter)</comment>
 virtual_mailbox_domains = virt-domain.com, $other-virtual-domain.com
 
@@ -892,7 +890,7 @@
 <pre caption="mailman config: mm_cfg.py">
 # <i>nano -w /usr/local/mailman/Mailman/mm_cfg.py</i>
 MTA = "Postfix"
-POSTFIX_STYLE_VIRTUAL_DOMAINS = ['virt-domain.com', 'virt.domain2.com']	
+POSTFIX_STYLE_VIRTUAL_DOMAINS = ['virt-domain.com', 'virt.domain2.com']
 add_virtualhost('www.virt.domain.com', 'virt.domain.com')
 add_virtualhost('www.virt.domain2.com', 'virt.domain2.com')
 <comment>(This is required for your virtual domains for mailman to function.)</comment>
@@ -947,12 +945,12 @@
 <comment>(Read README.POSTFIX.gz for details on this.)</comment>
 
 alias_maps     =
-	hash:/usr/local/mailman/data/aliases,
-	mysql:/etc/postfix/mysql-aliases.cf
+  hash:/usr/local/mailman/data/aliases,
+  mysql:/etc/postfix/mysql-aliases.cf
 
 virtual_alias_maps =
-	hash:/usr/local/mailman/data/virtual-mailman,
-	mysql:/etc/postfix/mysql-virtual.cf
+  hash:/usr/local/mailman/data/virtual-mailman,
+  mysql:/etc/postfix/mysql-virtual.cf
 <comment>(This adds mailman alias file support to postfix
 You may of course use the mysql tables for this,
 but I hate doing that by hand. Also, if you are not



-- 
gentoo-doc-cvs@l.g.o mailing list