Premier jet pour ROundcube avec l'utilisateur apache normal

Résoud les pb d'upgrade et de cron

.gitattributes

@@ -615,7 +615,6 @@ roundcube/class/m_roundcube.php -text
 roundcube/roundcube-install -text
 roundcube/roundcube_alternc_logo.png -text
 roundcube/templates/apache2/roundcube.conf -text
-roundcube/templates/logrotate.d/roundcube-core -text
 roundcube/templates/roundcube/main.inc.php -text
 roundcube/templates/roundcube/plugins/managesieve/config.inc.php -text
 roundcube/templates/roundcube/plugins/password/config.inc.php -text

roundcube/roundcube-install

@@ -28,7 +28,7 @@ then
 #    cp -f /etc/alternc/templates/roundcube/avelsieve-config.php /etc/alternc/templates/roundcube/apache.conf /etc/roundcube/
 #    cp -f /etc/alternc/templates/javascript-common/javascript-common.conf /etc/javascript-common/
 
-    LOGIN="2000_roundcube"
+    LOGIN="0000_roundcube"
     PASSWORD="`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..10)'`"
     DESKEY="`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..24)'`"
 
@@ -40,7 +40,6 @@ then
     # Configuration template location
     TEMPLATE_DIR="/etc/alternc/templates"
     CONFIG_FILES="etc/roundcube/main.inc.php etc/roundcube/plugins/password/config.inc.php etc/roundcube/plugins/managesieve/config.inc.php"
-    LOGROTATE_FILES="etc/logrotate.d/roundcube-core"
 
     cat > $SED_SCRIPT <<EOF
 s\\%%ALTERNC_LOC%%\\$ALTERNC_LOC\\;
@@ -62,14 +61,6 @@ EOF
 
     echo "    Done"
 
-    for file in $LOGROTATE_FILES; do
-        TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
-        echo -n " $file"
-        if [ -f "$TEMPLATE" ]; then
-            cat $TEMPLATE > /$file
-        fi
-    done
-
     echo "    Done"
 
     . /usr/lib/alternc/functions.sh
@@ -99,10 +90,3 @@ EOF
     
 fi
 
-#This is necessary because upgrading roundcube from 7.1 to 7.2 changes this setting
-if [ "$1" = "end" ]; then
-  chown alternc-roundcube:root /etc/roundcube/main.inc.php
-fi
-
-
-

roundcube/templates/apache2/roundcube.conf

@@ -1,46 +1,46 @@
 <VirtualHost *:80>
   ServerName %%fqdn%%
-  AssignUserId alternc-roundcube nogroup
+  AssignUserId www-data www-data
-  SetEnv LOGIN "%%UID%%-%%LOGIN%%"
+  SetEnv LOGIN "0000-roundcube"
 
   DocumentRoot /var/lib/roundcube
 
-# Access to tinymce files
+  # Access to tinymce files
-<Directory "/usr/share/tinymce/www/">
+  <Directory "/usr/share/tinymce/www/">
         Options Indexes MultiViews FollowSymLinks
         AllowOverride None
         Order allow,deny
         allow from all
-</Directory>
+  </Directory>
 
-<Directory /var/lib/roundcube/>
+  <Directory /var/lib/roundcube/>
     Options +FollowSymLinks
     # This is needed to parse /var/lib/roundcube/.htaccess. See its
     # content before setting AllowOverride to None.
     AllowOverride All
     order allow,deny
     allow from all
-</Directory>
+  </Directory>
 
-# Protecting basic directories:
+  # Protecting basic directories:
-<Directory /var/lib/roundcube/config>
+  <Directory /var/lib/roundcube/config>
     Options -FollowSymLinks
     AllowOverride None
-</Directory>
+  </Directory>
 
-<Directory /var/lib/roundcube/temp>
+  <Directory /var/lib/roundcube/temp>
     Options -FollowSymLinks
     AllowOverride None
     Order allow,deny
     Deny from all
-</Directory>
+  </Directory>
 
-<Directory /var/lib/roundcube/logs>
+  <Directory /var/lib/roundcube/logs>
     Options -FollowSymLinks
     AllowOverride None
     Order allow,deny
     Deny from all
-</Directory>
+  </Directory>
 
   Alias /javascript /usr/share/javascript/
 

roundcube/templates/logrotate.d/roundcube-core

@@ -1,15 +0,0 @@
-######
-# Configuration file of Roundcube's logrotate for AlternC
-#
-# /!\ WARNING /!\ Do not edit this file, edit the one in
-# /etc/alternc/templates/logrotate.d/ and launch alternc.install again.
-######
-
-/var/log/roundcube/password /var/log/roundcube/errors /var/log/roundcube/sendmail /var/log/roundcube/userlogins {
-  create 0640 alternc-roundcube root 
-  compress
-  missingok
-  notifempty
-  rotate 52
-  weekly
-}