Merge branch 'master' of github.com:skangas/fripost-docs

Conflicts:
	fripost-docs.org

1 files changed, 27 insertions, 19 deletions

diff --git a/fripost-docs.org b/fripost-docs.org
index d61bb9b..9b675f8 100644
--- a/fripost-docs.org
+++ b/fripost-docs.org
@@ -683,28 +683,33 @@ SET character_set_client = @saved_cs_client;
 
 **** Test delivery
 
-    - /etc/postfix/main.cf
+- /etc/postfix/main.cf
 :HIDDEN:
 # Not really needed until we switch to using Courier maildrop
 maildrop_destination_recipient_limit = 1
 
 virtual_mailbox_base = /home/mail/virtual
 :END:
-    - sudo mkdir -p /home/mail/virtual/fripost.org/example/
-    - mysql -u root -p
-      INSERT INTO mailbox (username,password,name,maildir,domain)
-      VALUES ('exempel@fripost.org','test666','Exempelanvändare','fripost.org/exempel/Maildir/','fripost.org');
-    - /etc/init.d/postfix restart
 
-    Now it should work to send an e-mail to exempel@fripost.org
+sudo mkdir -p /home/mail/virtual/fripost.org/example/
+mysql -u root -p
+
+    INSERT INTO mailbox (username,password,name,maildir,domain)
+    VALUES ('exempel@fripost.org','test666','Exempelanvändare','fripost.org/exempel/Maildir/','fripost.org');
+
+sudo /etc/init.d/postfix restart
+
+echo "test at `date`"|mail -s "test" exempel@fripostorg
+
+**** Configuring dovecot
 
-**** Setting up dovecot
+sudo aptitude install dovecot-imapd
 
-    - sudo aptitude install dovecot-imapd
-    - /etc/dovecot/dovecot.conf
+:: /etc/dovecot/dovecot.conf
+
+# Note: These settings are already in the file but commented out or set to other
+#       values.
 
-Note: These settings are already in the file but commented out or set to other
-      values.
 :HIDDEN:
 protocols = imaps
 protocol imap {
@@ -737,7 +742,9 @@ userdb sql {
 # Do not needlessly run as root
 user = nobody
 :END:
-    - /etc/dovecot/dovecot-sql.conf
+
+:: /etc/dovecot/dovecot-sql.conf
+
 :HIDDEN:
 driver = mysql
 connect = host=127.0.0.1 port=3306 user=XXX password=XXX dbname=mail
@@ -750,18 +757,19 @@ password_query = SELECT username AS user, password FROM mailbox WHERE username =
 # replace XXX with relevant numbers for the system
 user_query = SELECT concat('/home/mail/virtual/',maildir) AS mail, XXX AS uid, XXX AS gid FROM mailbox WHERE username = '%u' AND domain = '%d'
 :END:
-    - sudo /etc/init.d/dovecot restart
 
-    Provided there is a user, you should now be able to login using any IMAP
-    client.
+sudo /etc/init.d/dovecot restart
+
+# Provided there is a user, you should now be able to login using any IMAP
+# client.
 
 *** Configuring a new smarthost to relay e-mail to the main IMAP server
 
 First setup an SSH tunnel between the hosts according to instructions given
-above in this document.
+above.
 
-Next, you need to configure postfix on the smarthost to relay emails through
-the tunnel.
+Next, we need to configure postfix on the smarthost to relay emails through the
+tunnel.
 
 ** Configuring the webserver