diff -NEbaur -x '\.svn' doc-expressolivre/debian/arqs-conf/etc/apache2/apache2.conf doc-expressolivre_alt/debian/arqs-conf/etc/apache2/apache2.conf --- doc-expressolivre/debian/arqs-conf/etc/apache2/apache2.conf 2011-06-16 17:49:25.000000000 -0300 +++ doc-expressolivre_alt/debian/arqs-conf/etc/apache2/apache2.conf 2011-06-16 17:43:36.000000000 -0300 @@ -126,15 +126,6 @@ # Include generic snippets of statements Include /etc/apache2/conf.d/[^.#]* -#Let's have some Icons, shall we? -Alias /icons/ "/usr/share/apache2/icons/" - - Options Indexes MultiViews - AllowOverride None - Order allow,deny - Allow from all - - # Set up the default error docs. # # Customizable error responses come in three flavors: diff -NEbaur -x '\.svn' doc-expressolivre/debian/arqs-conf/etc/ldap/slapd.conf doc-expressolivre_alt/debian/arqs-conf/etc/ldap/slapd.conf --- doc-expressolivre/debian/arqs-conf/etc/ldap/slapd.conf 2011-06-16 17:49:25.000000000 -0300 +++ doc-expressolivre_alt/debian/arqs-conf/etc/ldap/slapd.conf 2011-06-16 17:47:39.000000000 -0300 @@ -68,7 +68,9 @@ directory "/var/lib/ldap" # Indexing options for database #1 -index mail,mailAlternateAddress,objectClass,memberUid,uidNumber,deliveryMode,accountStatus,phpgwAccountType,gidNumber,phpgwAccountStatus,ou pres,eq +index mailForwardingAddress,objectClass,memberUid,uidNumber,deliveryMode,accountStatus,phpgwAccountType,gidNumber,phpgwAccountStatus,ou,cpf,accountRestrictive pres,eq +index mailAlternateAddress sub,pres,eq +index mail sub,pres,eq index uid,cn,sn,givenName pres,eq,sub # Save the time that the entry gets modified, for database #1 diff -NEbaur -x '\.svn' doc-expressolivre/debian/arqs-conf/etc/ldap/slapd.conf.etch doc-expressolivre_alt/debian/arqs-conf/etc/ldap/slapd.conf.etch --- doc-expressolivre/debian/arqs-conf/etc/ldap/slapd.conf.etch 2011-06-16 17:49:25.000000000 -0300 +++ doc-expressolivre_alt/debian/arqs-conf/etc/ldap/slapd.conf.etch 2011-06-16 17:48:05.000000000 -0300 @@ -85,8 +85,10 @@ dbconfig set_lk_max_lockers 1500 # Indexing options for database #1 -index mailAlternateAddress,objectClass,memberUid,uidNumber,deliveryMode,accountStatus,phpgwAccountType,gidNumber,phpgwAccountStatus,ou pres,eq -index mail,uid,cn,sn,givenName pres,eq,sub +index mailForwardingAddress,objectClass,memberUid,uidNumber,deliveryMode,accountStatus,phpgwAccountType,gidNumber,phpgwAccountStatus,ou,cpf,accountRestrictive pres,eq +index mailAlternateAddress sub,pres,eq +index mail sub,pres,eq +index uid,cn,sn,givenName pres,eq,sub # Save the time that the entry gets modified, for database #1 lastmod on diff -NEbaur -x '\.svn' doc-expressolivre/debian/arqs-conf/etc/ldap/slapd.conf.lenny doc-expressolivre_alt/debian/arqs-conf/etc/ldap/slapd.conf.lenny --- doc-expressolivre/debian/arqs-conf/etc/ldap/slapd.conf.lenny 2011-06-16 17:49:25.000000000 -0300 +++ doc-expressolivre_alt/debian/arqs-conf/etc/ldap/slapd.conf.lenny 2011-06-16 17:48:35.000000000 -0300 @@ -89,8 +89,10 @@ dbconfig set_lk_max_lockers 1500 # Indexing options for database #1 -index mailAlternateAddress,objectClass,memberUid,uidNumber,deliveryMode,accountStatus,phpgwAccountType,gidNumber,phpgwAccountStatus,ou pres,eq -index mail,uid,cn,sn,givenName pres,eq,sub +index mailForwardingAddress,objectClass,memberUid,uidNumber,deliveryMode,accountStatus,phpgwAccountType,gidNumber,phpgwAccountStatus,ou,cpf,accountRestrictive pres,eq +index mailAlternateAddress sub,pres,eq +index mail sub,pres,eq +index uid,cn,sn,givenName pres,eq,sub # Save the time that the entry gets modified, for database #1 lastmod on diff -NEbaur -x '\.svn' doc-expressolivre/debian/arqs-conf/etc/php5/apache2/php.ini doc-expressolivre_alt/debian/arqs-conf/etc/php5/apache2/php.ini --- doc-expressolivre/debian/arqs-conf/etc/php5/apache2/php.ini 2011-06-16 17:49:25.000000000 -0300 +++ doc-expressolivre_alt/debian/arqs-conf/etc/php5/apache2/php.ini 2011-06-16 17:44:26.000000000 -0300 @@ -1033,7 +1033,7 @@ ; 1: Overload mail() function ; 2: Overload str*() functions ; 4: Overload ereg*() functions -mbstring.func_overload = 7 +mbstring.func_overload = 0 [FrontBase] ;fbsql.allow_persistent = On diff -NEbaur -x '\.svn' doc-expressolivre/debian/arqs-conf/etc/postfix/main.cf doc-expressolivre_alt/debian/arqs-conf/etc/postfix/main.cf --- doc-expressolivre/debian/arqs-conf/etc/postfix/main.cf 2011-06-16 17:49:25.000000000 -0300 +++ doc-expressolivre_alt/debian/arqs-conf/etc/postfix/main.cf 2011-06-16 17:42:25.000000000 -0300 @@ -12,7 +12,7 @@ mynetworks = 127.0.0.1/32 # A lista de dominios que esta maquina considera seu destino final. -mydestination = $myhostname, localhost.$mydomain, DOMAIN +mydestination = $myhostname, localhost.$mydomain, hash:/etc/postfix/expresso-dominios, DOMAIN inet_interfaces = all disable_dns_lookups = no @@ -24,7 +24,7 @@ virtual_alias_maps = ldap:aliases, ldap:mailboxes, ldap:grupos, ldap:listas, ldap:cxinstitucionais, ldap:cxcompartilhadas #SCL - Sender Control List -smtpd_recipient_restrictions = check_recipient_access ldap:cra_maillists, reject_unauth_destination +smtpd_recipient_restrictions = check_recipient_access ldap:cra_maillists, permit_mynetworks, reject_unauth_destination smtpd_restriction_classes = mailListRestriction mailListRestriction = check_sender_access ldap:csa_maillists, reject diff -NEbaur -x '\.svn' doc-expressolivre/debian/expressoInstallDebian-lenny-es.sh doc-expressolivre_alt/debian/expressoInstallDebian-lenny-es.sh --- doc-expressolivre/debian/expressoInstallDebian-lenny-es.sh 2011-06-16 17:49:26.000000000 -0300 +++ doc-expressolivre_alt/debian/expressoInstallDebian-lenny-es.sh 2011-06-16 17:37:16.000000000 -0300 @@ -76,7 +76,7 @@ cp ./arqs-conf/etc/php5/apache2/php.ini /etc/php5/apache2/ mkdir /php_sessions/ || { echo "Diretório já existe. [OK]"; } -chmod -R 777 /php_sessions/ +chmod -R 770 /php_sessions/ a2ensite expresso a2dissite default diff -NEbaur -x '\.svn' doc-expressolivre/debian/expressoInstallDebian-lenny.sh doc-expressolivre_alt/debian/expressoInstallDebian-lenny.sh --- doc-expressolivre/debian/expressoInstallDebian-lenny.sh 2011-06-16 17:49:26.000000000 -0300 +++ doc-expressolivre_alt/debian/expressoInstallDebian-lenny.sh 2011-06-16 17:36:53.000000000 -0300 @@ -75,7 +75,7 @@ cp ./arqs-conf/etc/php5/apache2/php.ini /etc/php5/apache2/ mkdir /php_sessions/ || { echo "Diretório já existe. [OK]"; } -chmod -R 777 /php_sessions/ +chmod -R 770 /php_sessions/ a2ensite expresso a2dissite default diff -NEbaur -x '\.svn' doc-expressolivre/debian/expressoInstallDebian-squeeze.sh doc-expressolivre_alt/debian/expressoInstallDebian-squeeze.sh --- doc-expressolivre/debian/expressoInstallDebian-squeeze.sh 2011-06-16 17:49:26.000000000 -0300 +++ doc-expressolivre_alt/debian/expressoInstallDebian-squeeze.sh 2011-06-16 17:38:01.000000000 -0300 @@ -70,7 +70,7 @@ cp ./arqs-conf/etc/php5/apache2/php.ini /etc/php5/apache2/ mkdir /php_sessions/ || { echo "Diretorio ja existe. [OK]"; } -chmod -R 777 /php_sessions/ +chmod -R 770 /php_sessions/ a2ensite expresso a2dissite default