From 19317ccbece60cb71552d6bde97c83ce91ff02f3 Mon Sep 17 00:00:00 2001 From: Alan Garcia Date: Sun, 22 May 2011 19:18:43 +0000 Subject: [PATCH] =?UTF-8?q?Ca=20fait=20marcher=20mpm-itk=20mais=20ca=20cas?= =?UTF-8?q?se=20la=20g=C3=A9n=C3=A9ration=20du=20.deb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/alternc.config | 3 + debian/alternc.preinst | 1 - debian/po/fr.po | 138 +++++++++++++++++++++++++--------------- debian/po/templates.pot | 134 +++++++++++++++++++++++--------------- debian/rules | 2 + debian/templates | 11 ++++ install/alternc.install | 5 +- src/Makefile | 8 +-- src/fixperms.sh | 10 +-- src/mem_add | 2 +- 10 files changed, 197 insertions(+), 117 deletions(-) diff --git a/debian/alternc.config b/debian/alternc.config index 0045622d..1359eb46 100644 --- a/debian/alternc.config +++ b/debian/alternc.config @@ -19,6 +19,8 @@ if [ "$RET" = "false" ]; then exit 1 fi +db_input critical alternc/warningaclquota || true + # default values for local.sh MYSQL_HOST=127.0.0.1 MYSQL_DATABASE=alternc @@ -51,6 +53,7 @@ if [ -r /etc/alternc/my.cnf ]; then eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_USER/;s/password/MYSQL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my.cnf` fi + # mettre les valeurs de local.sh comme "default" pour debconf db_get alternc/hostingname if [ -z "$RET" ] diff --git a/debian/alternc.preinst b/debian/alternc.preinst index c78a04db..a6eec44d 100644 --- a/debian/alternc.preinst +++ b/debian/alternc.preinst @@ -20,7 +20,6 @@ case "$1" in 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" # Move /etc/bind files around diff --git a/debian/po/fr.po b/debian/po/fr.po index d5afe5d5..0ba8b670 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: AlternC 0.9.5\n" "Report-Msgid-Bugs-To: anarcat@koumbit.org\n" -"POT-Creation-Date: 2009-07-27 17:24-0400\n" +"POT-Creation-Date: 2011-05-22 20:29+0200\n" "PO-Revision-Date: 2006-04-26 11:16+0200\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: Team AlternC \n" @@ -59,15 +59,47 @@ msgstr "" msgid "YOU HAVE BEEN WARNED." msgstr "VOUS AVEZ ETE PREVENU !" -#. Type: string +#. Type: note #. Description #: ../templates:2001 +msgid "AlternC need ACL and QUOTA activated" +msgstr "AlternC nécessite les ACL et les QUOTA actif" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"AlternC can't work without ACL activated on his file. Please check your /etc/" +"fstab to activate ACL for AlternC." +msgstr "" +"AlternC ne peux pas fonctionner sans les ACL activé. N'oubliez pas de " +"vérifier /etc/fstab" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Run /usr/lib/alternc/fixperms.sh once it's activated." +msgstr "Executez /usr/lib/alternc/fixperms.sh une fois les ACL activent." + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"Also, you need to activate group quota (grpquota) to be able to use disk " +"quota." +msgstr "" +"Vous avez aussi besoin des quota de groupe (grpquota) pour pouvoir utiliser" +"les quotas disque." + +#. Type: string +#. Description +#: ../templates:3001 msgid "Fully qualified name of the desktop:" msgstr "Nom de domaine du bureau :" #. Type: string #. Description -#: ../templates:2001 +#: ../templates:3001 msgid "" "Please enter the fully qualified name of your server. This will be the " "domain part of the url you will use to access the virtual managment desktop. " @@ -79,7 +111,7 @@ msgstr "" #. Type: string #. Description -#: ../templates:2001 +#: ../templates:3001 msgid "The default should be ok if your machine is correctly configured." msgstr "" "La valeur par défaut doit convenir si votre machine est correctement " @@ -87,13 +119,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:3001 +#: ../templates:4001 msgid "Name of your hosting service:" msgstr "Nom de votre service d'hébergement :" #. Type: string #. Description -#: ../templates:3001 +#: ../templates:4001 msgid "" "Please enter the name of your hosting service. It may be your company's name " "or your personnal name or whatever you want to ..." @@ -103,13 +135,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:4001 +#: ../templates:5001 msgid "Name of the primary domain name server:" msgstr "Nom de domaine du serveur de dns primaire :" #. Type: string #. Description -#: ../templates:4001 +#: ../templates:5001 msgid "" "Please enter the fully qualified name of your primary dns server. It can be " "this server since bind is installed and configured by AlternC. Anyway, if " @@ -125,13 +157,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:5001 +#: ../templates:6001 msgid "Name of the secondary domain name server:" msgstr "Nom de domaine du serveur de dns secondaire :" #. Type: string #. Description -#: ../templates:5001 +#: ../templates:6001 msgid "" "Please enter the fully qualified name of your secondary dns server. It can " "be this server since bind is installed and configured by AlternC. Anyway, " @@ -145,7 +177,7 @@ msgstr "" #. Type: string #. Description -#: ../templates:5001 +#: ../templates:6001 msgid "" "You may contact the AlternC's users mailing list if you want to exchange dns " "service with other AlternC's users." @@ -156,13 +188,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:6001 +#: ../templates:7001 msgid "Name of the mysql server:" msgstr "Nom de domaine du serveur mysql :" #. Type: string #. Description -#: ../templates:6001 +#: ../templates:7001 msgid "" "Please enter the fully qualified name of your mysql server host. On small " "systems, it IS \"localhost\" since you may have installed a local mysql " @@ -184,13 +216,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:7001 +#: ../templates:8001 msgid "AlternC's mysql system database:" msgstr "Base système mysql d'AlternC : " #. Type: string #. Description -#: ../templates:7001 +#: ../templates:8001 msgid "" "AlternC will create a mysql database to store it's system data. Please " "choose the name of this database here. The default value should be good in " @@ -202,13 +234,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:8001 +#: ../templates:9001 msgid "AlternC's mysql account:" msgstr "Compte mysql d'AlternC : " #. Type: string #. Description -#: ../templates:8001 +#: ../templates:9001 msgid "" "AlternC will create a mysql administrator account. Please choose it's " "username here. The default value should be good in most case." @@ -219,13 +251,13 @@ msgstr "" #. Type: password #. Description -#: ../templates:9001 +#: ../templates:10001 msgid "Password of the AlternC's mysql account:" msgstr "Mot de passe du compte mysql : " #. Type: password #. Description -#: ../templates:9001 +#: ../templates:10001 msgid "" "AlternC requires an administrator account on the mysql server. It will be " "created automatically during the install process. Please choose a password " @@ -235,7 +267,7 @@ msgstr "" #. Type: password #. Description -#: ../templates:9001 +#: ../templates:10001 msgid "" "Please choose a quite complex password since it will have full access to the " "system database !!!" @@ -245,13 +277,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:10001 +#: ../templates:11001 msgid "The server to GRANT permissions to:" msgstr "" #. Type: string #. Description -#: ../templates:10001 +#: ../templates:11001 msgid "" "AlternC and MySQL can be installed on different servers. In order to have " "GRANT table properly created and manipulated, this parameter must be set to " @@ -261,13 +293,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:11001 +#: ../templates:12001 msgid "The way backup rotation is executated" msgstr "" #. Type: select #. Description -#: ../templates:11001 +#: ../templates:12001 msgid "" "AlternC enables users to configure their own backups, on demand, with " "automatic rotation. This option determines how the backups are rotated." @@ -275,7 +307,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:11001 +#: ../templates:12001 msgid "" "rotate - backup.sql, backup.sql.0, backup.sql.1 date - backup.sql, backup." "sql.20080709, backup.sql.20080708" @@ -283,13 +315,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:12001 +#: ../templates:13001 msgid "Behavior of the backup script when it encounters a unmanaged file" msgstr "" #. Type: select #. Description -#: ../templates:12001 +#: ../templates:13001 msgid "" "The SQL backups can rename or overwrite existing files it doesn't know about " "when doing backups. The default behavior is to skip those files and ignore " @@ -298,13 +330,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:13001 +#: ../templates:14001 msgid "The primary IP of this server:" msgstr "l'adresse IP principale de ce serveur : " #. Type: string #. Description -#: ../templates:13001 +#: ../templates:14001 msgid "" "AlternC will default the A records for domains it hosts to this address. In " "other words, this is the address everyone can reach to server at." @@ -315,13 +347,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:14001 +#: ../templates:15001 msgid "The internal IP of this server:" msgstr "l'adresse IP interne du serveur : " #. Type: string #. Description -#: ../templates:14001 +#: ../templates:15001 msgid "" "AlternC will configure Apache and other services to listen to this address. " "This is usually the same as the primary IP of the server, unless the server " @@ -333,19 +365,19 @@ msgstr "" #. Type: string #. Description -#: ../templates:14001 +#: ../templates:15001 msgid "In other words, this is the IP address of eth0." msgstr "En d'autres mots, ceci est l'adresse assignée à eth0." #. Type: string #. Description -#: ../templates:15001 +#: ../templates:16001 msgid "The default MX to assign to new domains:" msgstr "le MX à assigner aux nouveaux domaines : " #. Type: string #. Description -#: ../templates:15001 +#: ../templates:16001 msgid "" "AlternC will assign this hostname as the MX record for all the domains it " "hosts. It is usually better be left alone." @@ -355,13 +387,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:16001 +#: ../templates:17001 msgid "The path where AlternC is installed:" msgstr "Emplacement d'AlternC : " #. Type: string #. Description -#: ../templates:16001 +#: ../templates:17001 msgid "" "Please enter the partition name where alternc is installed. This is used " "mainly for disk quotas." @@ -371,19 +403,19 @@ msgstr "" #. Type: string #. Description -#: ../templates:16001 +#: ../templates:17001 msgid "Warning : Be careful ! It can generate some problems." msgstr "Attention : Prenez garde ! Cela peut entraîner quelques problèmes." #. Type: string #. Description -#: ../templates:17001 +#: ../templates:18001 msgid "The monitoring server:" msgstr "serveur de surveillance : " #. Type: string #. Description -#: ../templates:17001 +#: ../templates:18001 msgid "" "The IP address (or ip/prefix) of the server(s) which must be authorized to " "ping us and access apache status pages. Completely optional." @@ -393,13 +425,13 @@ msgstr "" #. Type: note #. Description -#: ../templates:18001 +#: ../templates:19001 msgid "POP Before SMTP deprecated" msgstr "POP Before SMTP déprécié" #. Type: note #. Description -#: ../templates:18001 +#: ../templates:19001 msgid "" "AlternC doesn't automatically configure the pop-before-smtp package anymore, " "since it is correctly configured for SASL authentification these days. If " @@ -411,13 +443,13 @@ msgstr "" #. Type: note #. Description -#: ../templates:18001 +#: ../templates:19001 msgid "# For Courier-POP3 and Courier-IMAP:" msgstr "# For Courier-POP3 and Courier-IMAP:" #. Type: note #. Description -#: ../templates:18001 +#: ../templates:19001 msgid "" "in the /etc/pop-before-smtp/pop-before-smtp.conf and uncomment it. hash:/var/" "lib/pop-before-smtp/hosts must also be added to the mynetworks directive of /" @@ -429,25 +461,25 @@ msgstr "" #. Type: boolean #. Description -#: ../templates:19001 +#: ../templates:20001 msgid "Should AlternC remove all databases (/var/lib/mysql/) ?" msgstr "Les bases de données doivent elles être supprimés (/var/lib/mysql) ?" #. Type: boolean #. Description -#: ../templates:19001 +#: ../templates:20001 msgid "All users databases will be trashed" msgstr "Toutes les bases de données des utilisateurs seront perdues" #. Type: boolean #. Description -#: ../templates:20001 +#: ../templates:21001 msgid "Should AlternC remove users datas ?" msgstr "Les données des utilisateurs doivent elles êtres supprimés ?" #. Type: boolean #. Description -#: ../templates:20001 +#: ../templates:21001 msgid "The files and apache redirections created by users will be trashed" msgstr "" "Les fichiers et les redirections d'apache créés par les utilisateurs seront " @@ -455,38 +487,38 @@ msgstr "" #. Type: boolean #. Description -#: ../templates:21001 +#: ../templates:22001 msgid "Should AlternC remove bind zones ?" msgstr "Les zones de bind doivent elles être supprimées ?" #. Type: boolean #. Description -#: ../templates:21001 +#: ../templates:22001 msgid "It will delete all bind zones created by AlternC" msgstr "Cela supprimera toutes les zone de bind créées par AlternC" #. Type: boolean #. Description -#: ../templates:22001 +#: ../templates:23001 msgid "Should AlternC remove mailboxes ?" msgstr "Les boites mails doivent elles être supprimées ?" #. Type: boolean #. Description -#: ../templates:22001 +#: ../templates:23001 msgid "If you accept all users e-mails will be deleted" msgstr "" "Si vous acceptez, toutes les e-mails des utilisateurs seront supprimées" #. Type: string #. Description -#: ../templates:23001 +#: ../templates:24001 msgid "Slave servers" msgstr "Serveurs esclaves" #. Type: string #. Description -#: ../templates:23001 +#: ../templates:24001 msgid "" "This is a space-separated list of servers that are \"slaves\" to the master " "server (this server). When writing apache configuration files, the master " diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 0d455759..5ec772d9 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: anarcat@koumbit.org\n" -"POT-Creation-Date: 2009-07-27 17:24-0400\n" +"POT-Creation-Date: 2011-05-22 20:29+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,15 +45,43 @@ msgstr "" msgid "YOU HAVE BEEN WARNED." msgstr "" -#. Type: string +#. Type: note #. Description #: ../templates:2001 +msgid "AlternC need ACL and QUOTA activated" +msgstr "" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"AlternC can't work without ACL activated on his file. Please check your /etc/" +"fstab to activate ACL for AlternC." +msgstr "" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "Run /usr/lib/alternc/fixperms.sh once it's activated." +msgstr "" + +#. Type: note +#. Description +#: ../templates:2001 +msgid "" +"Also, you need to activate group quota (grpquota) to be able to use disk " +"quota." +msgstr "" + +#. Type: string +#. Description +#: ../templates:3001 msgid "Fully qualified name of the desktop:" msgstr "" #. Type: string #. Description -#: ../templates:2001 +#: ../templates:3001 msgid "" "Please enter the fully qualified name of your server. This will be the " "domain part of the url you will use to access the virtual managment desktop. " @@ -62,19 +90,19 @@ msgstr "" #. Type: string #. Description -#: ../templates:2001 +#: ../templates:3001 msgid "The default should be ok if your machine is correctly configured." msgstr "" #. Type: string #. Description -#: ../templates:3001 +#: ../templates:4001 msgid "Name of your hosting service:" msgstr "" #. Type: string #. Description -#: ../templates:3001 +#: ../templates:4001 msgid "" "Please enter the name of your hosting service. It may be your company's name " "or your personnal name or whatever you want to ..." @@ -82,13 +110,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:4001 +#: ../templates:5001 msgid "Name of the primary domain name server:" msgstr "" #. Type: string #. Description -#: ../templates:4001 +#: ../templates:5001 msgid "" "Please enter the fully qualified name of your primary dns server. It can be " "this server since bind is installed and configured by AlternC. Anyway, if " @@ -99,13 +127,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:5001 +#: ../templates:6001 msgid "Name of the secondary domain name server:" msgstr "" #. Type: string #. Description -#: ../templates:5001 +#: ../templates:6001 msgid "" "Please enter the fully qualified name of your secondary dns server. It can " "be this server since bind is installed and configured by AlternC. Anyway, " @@ -115,7 +143,7 @@ msgstr "" #. Type: string #. Description -#: ../templates:5001 +#: ../templates:6001 msgid "" "You may contact the AlternC's users mailing list if you want to exchange dns " "service with other AlternC's users." @@ -123,13 +151,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:6001 +#: ../templates:7001 msgid "Name of the mysql server:" msgstr "" #. Type: string #. Description -#: ../templates:6001 +#: ../templates:7001 msgid "" "Please enter the fully qualified name of your mysql server host. On small " "systems, it IS \"localhost\" since you may have installed a local mysql " @@ -143,13 +171,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:7001 +#: ../templates:8001 msgid "AlternC's mysql system database:" msgstr "" #. Type: string #. Description -#: ../templates:7001 +#: ../templates:8001 msgid "" "AlternC will create a mysql database to store it's system data. Please " "choose the name of this database here. The default value should be good in " @@ -158,13 +186,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:8001 +#: ../templates:9001 msgid "AlternC's mysql account:" msgstr "" #. Type: string #. Description -#: ../templates:8001 +#: ../templates:9001 msgid "" "AlternC will create a mysql administrator account. Please choose it's " "username here. The default value should be good in most case." @@ -172,13 +200,13 @@ msgstr "" #. Type: password #. Description -#: ../templates:9001 +#: ../templates:10001 msgid "Password of the AlternC's mysql account:" msgstr "" #. Type: password #. Description -#: ../templates:9001 +#: ../templates:10001 msgid "" "AlternC requires an administrator account on the mysql server. It will be " "created automatically during the install process. Please choose a password " @@ -187,7 +215,7 @@ msgstr "" #. Type: password #. Description -#: ../templates:9001 +#: ../templates:10001 msgid "" "Please choose a quite complex password since it will have full access to the " "system database !!!" @@ -195,13 +223,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:10001 +#: ../templates:11001 msgid "The server to GRANT permissions to:" msgstr "" #. Type: string #. Description -#: ../templates:10001 +#: ../templates:11001 msgid "" "AlternC and MySQL can be installed on different servers. In order to have " "GRANT table properly created and manipulated, this parameter must be set to " @@ -211,13 +239,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:11001 +#: ../templates:12001 msgid "The way backup rotation is executated" msgstr "" #. Type: select #. Description -#: ../templates:11001 +#: ../templates:12001 msgid "" "AlternC enables users to configure their own backups, on demand, with " "automatic rotation. This option determines how the backups are rotated." @@ -225,7 +253,7 @@ msgstr "" #. Type: select #. Description -#: ../templates:11001 +#: ../templates:12001 msgid "" "rotate - backup.sql, backup.sql.0, backup.sql.1 date - backup.sql, backup." "sql.20080709, backup.sql.20080708" @@ -233,13 +261,13 @@ msgstr "" #. Type: select #. Description -#: ../templates:12001 +#: ../templates:13001 msgid "Behavior of the backup script when it encounters a unmanaged file" msgstr "" #. Type: select #. Description -#: ../templates:12001 +#: ../templates:13001 msgid "" "The SQL backups can rename or overwrite existing files it doesn't know about " "when doing backups. The default behavior is to skip those files and ignore " @@ -248,13 +276,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:13001 +#: ../templates:14001 msgid "The primary IP of this server:" msgstr "" #. Type: string #. Description -#: ../templates:13001 +#: ../templates:14001 msgid "" "AlternC will default the A records for domains it hosts to this address. In " "other words, this is the address everyone can reach to server at." @@ -262,13 +290,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:14001 +#: ../templates:15001 msgid "The internal IP of this server:" msgstr "" #. Type: string #. Description -#: ../templates:14001 +#: ../templates:15001 msgid "" "AlternC will configure Apache and other services to listen to this address. " "This is usually the same as the primary IP of the server, unless the server " @@ -277,19 +305,19 @@ msgstr "" #. Type: string #. Description -#: ../templates:14001 +#: ../templates:15001 msgid "In other words, this is the IP address of eth0." msgstr "" #. Type: string #. Description -#: ../templates:15001 +#: ../templates:16001 msgid "The default MX to assign to new domains:" msgstr "" #. Type: string #. Description -#: ../templates:15001 +#: ../templates:16001 msgid "" "AlternC will assign this hostname as the MX record for all the domains it " "hosts. It is usually better be left alone." @@ -297,13 +325,13 @@ msgstr "" #. Type: string #. Description -#: ../templates:16001 +#: ../templates:17001 msgid "The path where AlternC is installed:" msgstr "" #. Type: string #. Description -#: ../templates:16001 +#: ../templates:17001 msgid "" "Please enter the partition name where alternc is installed. This is used " "mainly for disk quotas." @@ -311,19 +339,19 @@ msgstr "" #. Type: string #. Description -#: ../templates:16001 +#: ../templates:17001 msgid "Warning : Be careful ! It can generate some problems." msgstr "" #. Type: string #. Description -#: ../templates:17001 +#: ../templates:18001 msgid "The monitoring server:" msgstr "" #. Type: string #. Description -#: ../templates:17001 +#: ../templates:18001 msgid "" "The IP address (or ip/prefix) of the server(s) which must be authorized to " "ping us and access apache status pages. Completely optional." @@ -331,13 +359,13 @@ msgstr "" #. Type: note #. Description -#: ../templates:18001 +#: ../templates:19001 msgid "POP Before SMTP deprecated" msgstr "" #. Type: note #. Description -#: ../templates:18001 +#: ../templates:19001 msgid "" "AlternC doesn't automatically configure the pop-before-smtp package anymore, " "since it is correctly configured for SASL authentification these days. If " @@ -346,13 +374,13 @@ msgstr "" #. Type: note #. Description -#: ../templates:18001 +#: ../templates:19001 msgid "# For Courier-POP3 and Courier-IMAP:" msgstr "" #. Type: note #. Description -#: ../templates:18001 +#: ../templates:19001 msgid "" "in the /etc/pop-before-smtp/pop-before-smtp.conf and uncomment it. hash:/var/" "lib/pop-before-smtp/hosts must also be added to the mynetworks directive of /" @@ -361,61 +389,61 @@ msgstr "" #. Type: boolean #. Description -#: ../templates:19001 +#: ../templates:20001 msgid "Should AlternC remove all databases (/var/lib/mysql/) ?" msgstr "" #. Type: boolean #. Description -#: ../templates:19001 +#: ../templates:20001 msgid "All users databases will be trashed" msgstr "" #. Type: boolean #. Description -#: ../templates:20001 +#: ../templates:21001 msgid "Should AlternC remove users datas ?" msgstr "" #. Type: boolean #. Description -#: ../templates:20001 +#: ../templates:21001 msgid "The files and apache redirections created by users will be trashed" msgstr "" #. Type: boolean #. Description -#: ../templates:21001 +#: ../templates:22001 msgid "Should AlternC remove bind zones ?" msgstr "" #. Type: boolean #. Description -#: ../templates:21001 +#: ../templates:22001 msgid "It will delete all bind zones created by AlternC" msgstr "" #. Type: boolean #. Description -#: ../templates:22001 +#: ../templates:23001 msgid "Should AlternC remove mailboxes ?" msgstr "" #. Type: boolean #. Description -#: ../templates:22001 +#: ../templates:23001 msgid "If you accept all users e-mails will be deleted" msgstr "" #. Type: string #. Description -#: ../templates:23001 +#: ../templates:24001 msgid "Slave servers" msgstr "" #. Type: string #. Description -#: ../templates:23001 +#: ../templates:24001 msgid "" "This is a space-separated list of servers that are \"slaves\" to the master " "server (this server). When writing apache configuration files, the master " diff --git a/debian/rules b/debian/rules index 4eb0bf64..74fed0de 100755 --- a/debian/rules +++ b/debian/rules @@ -68,6 +68,8 @@ install: build done ;\ done + chown alterncpanel:alterncpanel debian/alternc/var/alternc/html/* + # Ex old alternc-admintools install tools/top_http_users debian/alternc/usr/bin install tools/top_mysql_users debian/alternc/usr/bin diff --git a/debian/templates b/debian/templates index 7a329e70..d003c5a4 100644 --- a/debian/templates +++ b/debian/templates @@ -11,6 +11,17 @@ _Description: Do you REALLY want to install AlternC on this computer ? . YOU HAVE BEEN WARNED. +Template: alternc/warningaclquota +Type: note +_Description: AlternC need ACL and QUOTA activated + AlternC can't work without ACL activated on his file. + Please check your /etc/fstab to activate ACL for AlternC. + . + Run /usr/lib/alternc/fixperms.sh once it's activated. + . + Also, you need to activate group quota (grpquota) + to be able to use disk quota. + Template: alternc/desktopname Type: string _Description: Fully qualified name of the desktop: diff --git a/install/alternc.install b/install/alternc.install index 41c5bcf8..d00f4511 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -320,13 +320,16 @@ done # Last touches # +chown alterncpanel:alterncpanel "$ALTERNC_LOC/html/"* +setfacl -b -k -m d:g:alterncpanel:rw- -m g:alterncpanel:rw- "$ALTERNC_LOC/html/"* + # Creating admin user if needed HAS_ROOT=`mysql --defaults-file=/etc/alternc/my.cnf -e "SELECT COUNT(*) FROM membres WHERE login = 'admin' OR login = 'root' and su = 1" | tail -1` if [ "$HAS_ROOT" != "1" ]; then echo "Creating admin user..." echo "" - if su - alterncpanel -c /usr/share/alternc/install/newone.php + if su - alterncpanel -s /bin/bash -c /usr/share/alternc/install/newone.php then echo "*******************************************" echo "* *" diff --git a/src/Makefile b/src/Makefile index 0a906afc..43f4bd62 100644 --- a/src/Makefile +++ b/src/Makefile @@ -31,8 +31,8 @@ LIBS=functions.sh functions_hosting.sh functions_dns.sh BIN=$(DESTDIR)/usr/lib/alternc/ install: - chown root:www-data $(BIN) + chown root:alterncpanel $(BIN) chmod 755 $(BIN) - install -o root -g www-data -m4750 $(SETUID) du.pl $(BIN) - install -o root -g www-data -m0750 $(SCRIPTS) $(BIN) - install -o root -g www-data -m0644 $(LIBS) $(BIN) + install -o root -g alterncpanel -m4750 $(SETUID) du.pl $(BIN) + install -o root -g alterncpanel -m0750 $(SCRIPTS) $(BIN) + install -o root -g alterncpanel -m0644 $(LIBS) $(BIN) diff --git a/src/fixperms.sh b/src/fixperms.sh index 3701107e..d5da2a05 100755 --- a/src/fixperms.sh +++ b/src/fixperms.sh @@ -51,20 +51,22 @@ doone() { read GID LOGIN while [ "$LOGIN" ] ; do if [ "$DEBUG" ]; then - echo "Setting rights and ownership for user $LOGIN having gid $GID" + echo "Setting rights and ownership for user $LOGIN having gid $GID" fi INITIALE=`echo $LOGIN |cut -c1` REP="$ALTERNC_LOC/html/$INITIALE/$LOGIN" # Set the file readable only for the AlternC User - chown -R $GID:$GID "$REP" + chown -R $GID:$GID "$REP" chmod 2770 -R "$REP" # Delete existings ACL # Set the defaults acl on all the files - setfacl -b -k -m d:g:alterncpanel:rw- -R "$REP" \; + setfacl -b -k -m d:g:alterncpanel:rw- -m d:u:$GID:rw- -m d:g:$GID:rw- \ + -m g:alterncpanel:rw- -m u:$GID:rw- -m g:$GID:rw- \ + -R "$REP" - read GID LOGIN + read GID LOGIN done } diff --git a/src/mem_add b/src/mem_add index c7ba55eb..b06809e7 100755 --- a/src/mem_add +++ b/src/mem_add @@ -33,7 +33,7 @@ for my $p (@create_paths) { mkdir($p); chown($uid, $uid, $p); system("/bin/chmod 02770 '$p'"); - system("/usr/bin/setfacl -m d:g:alterncpanel:rw- -m d:u:$uid:rw- -m d:g:$uid:rw- '$p'"); + system("/usr/bin/setfacl -m d:g:alterncpanel:rw- -m d:u:$uid:rw- -m d:g:$uid:rw- -m g:alterncpanel:rw- -m u:$uid:rw- -m g:$uid:rw- '$p'"); } 0;