diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po index 442a96e0..5565bcc9 100644 --- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po +++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po @@ -3034,19 +3034,10 @@ msgstr "Ce compte est maintenant un compte normal" msgid "This account is now an administrator account" msgstr "Ce compte est maintenant un compte administrateur" -#: ../admin/adm_edit.php:73 -msgid "Account Enabled?" -msgstr "Compte Actif ? " - -# #: ../admin/adm_edit.php:76 msgid "You cannot disable your own account." msgstr "Vous ne pouvez pas désactiver votre propre compte !" -#: ../admin/adm_edit.php:123 -msgid "Reset quotas to default?" -msgstr "Réinitialiser les quotas de ce compte ?" - #: ../admin/adm_list.php:66 msgid "AlternC account list" msgstr "Liste des comptes AlternC" diff --git a/debian/alternc.postinst b/debian/alternc.postinst index fe080700..cd883a76 100644 --- a/debian/alternc.postinst +++ b/debian/alternc.postinst @@ -199,12 +199,12 @@ EOF /usr/share/alternc/install/upgrade_check.sh $2 echo "config phpmyadmin" - include_str='include("/etc/alternc/phpmyadmin.inc.php")' - pma_config=/etc/phpmyadmin/config.inc.php # Mise à jour sur une configuration existante # recherche la chaine include_str (avec les / echappées) et supprime les - sed 's//\1;/g' $pma_config > $pma_config'_2' - mv $pma_config'_2' $pma_config + # ${include_str//\//\\/}"'\) c'est uniquement BASH, on est en SH/DASH + include_str='include("/etc/alternc/phpmyadmin.inc.php")' + pma_config='/etc/phpmyadmin/config.inc.php' + bash -c "include_str='include(\"/etc/alternc/phpmyadmin.inc.php\")';pma_config='/etc/phpmyadmin/config.inc.php';sed 's//\1;/g' \$pma_config > \$pma_config'_2' && mv \$pma_config'_2' \$pma_config" # Sur une configuration vierge, inclure la configuration alternc if ! grep -e "$include_str" $pma_config > /dev/null 2>&1; then @@ -215,9 +215,10 @@ EOF find /var/alternc/dns/ -type l -lname /var/alternc/bureau -exec rm {} \; # Add access to the management panel + PUBLIC_IP_C=$(echo $PUBLIC_IP|cut -c 1) ln -nsf /var/alternc/bureau /var/alternc/dns/$FQDN_LETTER/$FQDN - mkdir -p /var/alternc/dns/${PUBLIC_IP:0:1} - ln -nsf /var/alternc/bureau /var/alternc/dns/${PUBLIC_IP:0:1}/$PUBLIC_IP + mkdir -p /var/alternc/dns/$PUBLIC_IP_C + ln -nsf /var/alternc/bureau /var/alternc/dns/$PUBLIC_IP_C/$PUBLIC_IP # Bind stuff touch /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf diff --git a/install/alternc.install b/install/alternc.install index d7bf4b0d..46dc52cb 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # AlternC Main install script. # This script should be launched only once, when installing AlternC @@ -128,7 +128,7 @@ if [ -z "$MONITOR_IP" ]; then MONITOR_IP="127.0.0.1" fi -PUBLIC_IP_BEGIN=${PUBLIC_IP:0:1} +PUBLIC_IP_BEGIN=$(echo $PUBLIC_IP|cut -c 1) # XXX: I assume this is secure if /tmp is sticky (+t) # we should have a better way to deal with templating, of course. @@ -210,6 +210,7 @@ then ln -sf /etc/alternc/apache.conf /etc/apache/conf.d/alternc.conf fi + touch /var/alternc/apacheconf/override_php.conf if [ ! -h /etc/apache/conf.d/override_php.conf ] && [ -e /etc/apache/conf.d/ ]; then ln -sf /var/alternc/apacheconf/override_php.conf /etc/apache/conf.d/override_php.conf fi