Typo in compilation commands of postfix.

Now it works together with cyrus sasl!

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1045 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cyrusimap/cyrus.conf b/config/cyrus-imapd/cyrus.conf
similarity index 100%
rename from config/cyrusimap/cyrus.conf
rename to config/cyrus-imapd/cyrus.conf

diff --git a/config/cyrusimap/imapd.conf b/config/cyrus-imapd/imapd.conf
similarity index 100%
rename from config/cyrusimap/imapd.conf
rename to config/cyrus-imapd/imapd.conf

diff --git a/config/cyrus-sasl/smtpd.conf b/config/cyrus-sasl/smtpd.conf
new file mode 100644 (file)
index 0000000..f62b344
--- /dev/null
+++ b/config/cyrus-sasl/smtpd.conf
@@ -0,0 +1,2 @@
+pwcheck_method: saslauthd
+mech_list: PLAIN LOGIN 

diff --git a/config/httpd/conf.d/php5.conf b/config/httpd/conf.d/php5.conf
index ecbcc45a55d457b3a349c65820a9309379085814..76ddc77bec955eb4ef4aa2fe328f4b093029af2b 100644 (file)
--- a/config/httpd/conf.d/php5.conf
+++ b/config/httpd/conf.d/php5.conf
@@ -1,10 +1,12 @@
-LoadModule php5_module /usr/lib/apache/libphp5.so
+<IfModule php5_module>
 
-AddType application/x-httpd-php .php3
-AddType application/x-httpd-php .php4
-AddType application/x-httpd-php .php5
-AddType application/x-httpd-php .php
-DirectoryIndex index.php3
-DirectoryIndex index.php4
-DirectoryIndex index.php5
-DirectoryIndex index.php
+       AddType application/x-httpd-php .php3
+       AddType application/x-httpd-php .php4
+       AddType application/x-httpd-php .php5
+       AddType application/x-httpd-php .php
+       DirectoryIndex index.php3
+       DirectoryIndex index.php4
+       DirectoryIndex index.php5
+       DirectoryIndex index.php
+
+</IfModule>

diff --git a/config/httpd/loadmodule.conf b/config/httpd/loadmodule.conf
index 4f7735c6961711fa38c5f3615bce89a27e7fa33a..e30f79b28a215d53ad5f3ca4704e8f0002a838ee 100644 (file)
--- a/config/httpd/loadmodule.conf
+++ b/config/httpd/loadmodule.conf
@@ -48,3 +48,4 @@ LoadModule dir_module /usr/lib/apache/mod_dir.so
 LoadModule alias_module /usr/lib/apache/mod_alias.so
 LoadModule rewrite_module /usr/lib/apache/mod_rewrite.so
 LoadModule ssl_module /usr/lib/apache/mod_ssl.so
+LoadModule php5_module /usr/lib/apache/libphp5.so

diff --git a/config/postfix/main.cf b/config/postfix/main.cf
index 34434ce7f886a17c3768e7dd09cd89d7a7a98ae8..9440d91b6aa16d444822c46b960961046436dde2 100644 (file)
--- a/config/postfix/main.cf
+++ b/config/postfix/main.cf
@@ -50,3 +50,31 @@ smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
 
 virtual_alias_maps = mysql:/etc/postfix/mysql-virtual.cf
 sender_canonical_maps = mysql:/etc/postfix/mysql-canonical.cf
+
+smtpd_sasl_type = cyrus
+smtpd_sasl_auth_enable = yes
+smtpd_sasl_security_options = noanonymous
+smtpd_sasl_local_domain = $myhostname
+broken_sasl_auth_clients = yes
+
+#smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
+
+smtpd_helo_required = yes
+mime_header_checks=pcre:/etc/postfix/body_checks
+smtpd_recipient_restrictions =
+            reject_invalid_hostname,
+            #reject_non_fqdn_hostname,
+            reject_non_fqdn_sender,
+            reject_non_fqdn_recipient,
+            reject_unknown_sender_domain,
+            reject_unknown_recipient_domain,
+            reject_unauth_pipelining,
+            permit_mynetworks,
+            permit_sasl_authenticated,
+            reject_unauth_destination,
+            reject_rbl_client zombie.dnsbl.sorbs.net,
+            reject_rbl_client relays.ordb.org,
+            reject_rbl_client opm.blitzed.org,
+            reject_rbl_client list.dsbl.org,
+            reject_rbl_client sbl.spamhaus.org,
+            permit

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 1cfddab513da80792e00129f2d7b8b2bec042ed4..907d5ea0ff8d5a6609637f9b79ca48c1848aff0a 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -97,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown cyrus:mail /usr/sieve
        chmod 750 /usr/sieve
        -mkdir /var/ipfire/cyrusimap
-       cp -f $(DIR_SRC)/config/cyrusimap/* /var/ipfire/cyrusimap
+       cp -f $(DIR_SRC)/config/cyrus-imapd/* /var/ipfire/cyrusimap
        cp -f $(DIR_APP)/tools/mkimap /usr/bin
        sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf
        chown cyrus.mail /var/imap/socket

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index e9235cbd34e0c6792e1050e004a49d54948bd9f0..f7accb700d7764d0723be1b60bbbf9694d5ba6cf 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -93,6 +93,7 @@ ifeq "$(PASS)" ""
        cd $(DIR_APP) && make install
        install -v -m700 -d /var/lib/sasl
        -mkdir /var/run/saslauthd
+       cp -vf $(DIR_SRC)/config/cyrus-sasl/smtpd.conf /usr/lib/sasl2/
 else
        # WITH LDAP SUPPORT AT THIS TIME
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \

diff --git a/lfs/postfix b/lfs/postfix
index a6758190c43b82ffe250d7077d429e491cd6979b..e67a822dcbdb96b9f51069d51c886338c622816b 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make -f Makefile.init makefiles \
-                               'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -I/usr/include/openssl -DUSE_SALS_AUTH -I/usr/include/sasl -DHAS_MYSQL -I/usr/include/mysql' \
+                               'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -I/usr/include/openssl -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -DHAS_MYSQL -I/usr/include/mysql' \
                                'AUXLIBS=-L/usr/lib -L/usr/lib/sasl2 -lz -lm  -lssl -lcrypto -lmysqlclient -L/usr/lib/mysql -lsasl2 -L/usr/lib'
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && sh postfix-install -non-interactive

diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 1318cd2c859f46c63d8a2038d574a0b9146af9f0..8a5a3220dd9247976e580324b45468605a2f44c4 100644 (file)
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -81,10 +81,10 @@ start_service() {
                
        if [ -e "/etc/init.d/${1}" ]; then
            if [ -n "${BACKGROUND}" ]; then
-               (sleep ${DELAY} && /etc/init.d/${1} start) &
-           else
-               sleep ${DELAY} && /etc/init.d/${1} start
-           fi
+                               (sleep ${DELAY} && /etc/init.d/${1} start) &
+                       else
+                               sleep ${DELAY} && /etc/init.d/${1} start
+                       fi
        fi
 }