diff --git a/.gitattributes b/.gitattributes index a3bf168e..28587d6b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -404,6 +404,7 @@ bureau/locales/fr_FR/LC_MESSAGES/alternc -text bureau/locales/fr_FR/LC_MESSAGES/manual.po -text bureau/locales/fr_FR/LC_MESSAGES/messages.po -text bureau/locales/it_IT/LC_MESSAGES/alternc -text +bureau/locales/it_IT/LC_MESSAGES/alternc.mo -text bureau/locales/it_IT/LC_MESSAGES/manual.po -text bureau/locales/it_IT/LC_MESSAGES/messages.po -text bureau/locales/manual.pot -text diff --git a/bureau/locales/it_IT/LC_MESSAGES/alternc.mo b/bureau/locales/it_IT/LC_MESSAGES/alternc.mo new file mode 100644 index 00000000..f0efea3c Binary files /dev/null and b/bureau/locales/it_IT/LC_MESSAGES/alternc.mo differ diff --git a/debian/alternc.config b/debian/alternc.config index b985a3a6..00be1268 100644 --- a/debian/alternc.config +++ b/debian/alternc.config @@ -181,11 +181,11 @@ LOCATION="$RET" #checking acl and quota activation, does't work with NFS yet. should now work with lxc MOUNT_POINT=$(df -P ${LOCATION%/*} | tail -n 1 | awk '{print $6}') -# Get the mount options for the path:$ -MOUNT_OPTS=$(awk '$2=="'$MOUNT_POINT'" { print $4 }' /proc/mounts) +# Get the mount options for the path: (warning, / may have multiple declarations, take the last one only : +MOUNT_OPTS=$(awk '$2=="'$MOUNT_POINT'" { print $4 }' /proc/mounts | tail -1) -# Check to see if acl is one of the mount points:$ -ACL="$(echo "$MOUNT_OPTS" | tr "," "\\n" | egrep '^acl|attr2$')" || true +# Check to see if acl is one of the mount points: +ACL="$(echo "$MOUNT_OPTS" | tr "," "\\n" | egrep '^acl|attr2|user_xattr$')" || true if [ -z "$ACL" ]; then db_input critical alternc/acluninstalled || true diff --git a/debian/alternc.postinst b/debian/alternc.postinst index e02244f9..060d7243 100644 --- a/debian/alternc.postinst +++ b/debian/alternc.postinst @@ -250,9 +250,11 @@ EOF echo "copy content of /usr/share/doc/examples/example.sudoers into /etc/sudoers.d for to run properly" fi - # important: postinst freezes withtout that: + # important: postinst freezes without that: db_stop + # instead of preinst, we launch it here : + /usr/lib/alternc/fixperms.sh echo "**********************************************" echo "* ALTERNC: *" echo "* Please run alternc.install to fully deploy *" diff --git a/debian/alternc.preinst b/debian/alternc.preinst index 5b75f7f9..d75fef2b 100644 --- a/debian/alternc.preinst +++ b/debian/alternc.preinst @@ -18,10 +18,10 @@ case "$1" in upgrade) # Set correct rights on files - echo "/!\ Warning /!\ Defaults ACL will be applied" - echo "If error, please remount $ALTERNC_LOC with ACL" - echo "and re-run /usr/lib/alternc/fixperms.sh " - /usr/lib/alternc/fixperms.sh +# echo "/!\ Warning /!\ Defaults ACL will be applied" +# echo "If error, please remount $ALTERNC_LOC with ACL" +# echo "and re-run /usr/lib/alternc/fixperms.sh " +# /usr/lib/alternc/fixperms.sh if dpkg --compare-versions "$2" lt "0.9.4"; then echo "Upgrading bind configuration" diff --git a/debian/control b/debian/control index 9f023d06..08a9a029 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Standards-Version: 3.9.1 Package: alternc Architecture: all Pre-depends: debconf (>= 0.5.00) | debconf-2.0 -Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, bind9, wget, rsync, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), sudo, adduser, mysql-client, dnsutils, bash (>= 4), acl, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d, vlogger, mailx +Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, bind9, wget, rsync, ca-certificates, locales, perl-suid | perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), sudo, adduser, mysql-client, dnsutils, bash (>= 4), acl, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d, vlogger, mailx Recommends: mysql-server(>= 5.0), ntp, quota Conflicts: alternc-admintools, alternc-awstats (< 1.0), alternc-webalizer (<= 0.9.4), alternc-mailman (< 2.0) Provides: alternc-admintools