diff --git a/DEBIAN_COMPLIANCE b/DEBIAN_COMPLIANCE index 07f6df37..a9b52c4a 100644 --- a/DEBIAN_COMPLIANCE +++ b/DEBIAN_COMPLIANCE @@ -29,6 +29,10 @@ in a debian server could help finding the right way to do it (eg: bind9 ) ;) - W: alternc: virtual-package-depends-without-real-package-depends depends: mailx +- We should NOT ask for "do you REALLY want to install AlternC blabla" since we don't launch alternc.install at postinst anymore. + This question MAY be asked to the user when launching alternc installer manually (on an interactive shell) + + Easy to fix NOW : E: alternc: dir-or-file-in-var-run var/run/alternc/ @@ -39,21 +43,13 @@ W: alternc: maintainer-script-ignores-errors prerm E: alternc-upnp: php-script-but-no-phpX-cli-dep usr/lib/alternc/update_upnp.sh W: alternc-upnp: executable-not-elf-or-script usr/lib/alternc/install.d/upnp-install W: alternc-awstats: possible-debconf-note-abuse preinst:13 alternc-awstats/errorinstall -W: executable-is-not-world-readable /usr/lib/alternc/update_quota_mail.sh 0750 E: alternc: duplicate-conffile etc/cron.d/alternc E: alternc: duplicate-conffile etc/logrotate.d/alternc W: alternc: malformed-prompt-in-templates alternc/slaves -W: alternc: malformed-question-in-templates alternc/use_local_mysql -W: alternc: malformed-question-in-templates alternc/use_remote_mysql -W: alternc: malformed-question-in-templates alternc/remote_mysql_error -W: alternc: using-question-in-extended-description-in-templates alternc/remote_mysql_error -W: alternc: malformed-question-in-templates alternc/use_private_ip -W: alternc: using-question-in-extended-description-in-templates alternc/use_private_ip -W: alternc source: out-of-date-standards-version 3.9.1 (current is 3.9.2) -W: alternc source: dh-clean-k-is-deprecated -W: alternc source: maintainer-script-lacks-debhelper-token debian/alternc-roundcube.postinst -W: alternc source: maintainer-script-lacks-debhelper-token debian/alternc-squirrelmail.postinst + + + ******************************************************************************** @@ -80,3 +76,19 @@ W: alternc source: debhelper-but-no-misc-depends alternc-roundcube W: alternc source: debhelper-but-no-misc-depends alternc-squirrelmail W: alternc source: debhelper-but-no-misc-depends alternc W: alternc source: debhelper-but-no-misc-depends alternc-awstats + +W: alternc source: out-of-date-standards-version 3.9.1 (current is 3.9.2) + +W: alternc source: maintainer-script-lacks-debhelper-token debian/alternc-roundcube.postinst +W: alternc source: maintainer-script-lacks-debhelper-token debian/alternc-squirrelmail.postinst + +W: alternc source: dh-clean-k-is-deprecated + +W: alternc: using-question-in-extended-description-in-templates alternc/remote_mysql_error +W: alternc: using-question-in-extended-description-in-templates alternc/use_private_ip + +W: executable-is-not-world-readable /usr/lib/alternc/update_quota_mail.sh 0750 +W: alternc: malformed-question-in-templates alternc/use_local_mysql +W: alternc: malformed-question-in-templates alternc/use_remote_mysql +W: alternc: malformed-question-in-templates alternc/remote_mysql_error +W: alternc: malformed-question-in-templates alternc/use_private_ip diff --git a/debian/alternc-roundcube.postinst b/debian/alternc-roundcube.postinst index 3d003f7d..0eac4a65 100644 --- a/debian/alternc-roundcube.postinst +++ b/debian/alternc-roundcube.postinst @@ -43,3 +43,6 @@ case "$1" in ;; esac +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# diff --git a/debian/alternc-slave.config b/debian/alternc-slave.config index c230d90b..80ef4fbb 100644 --- a/debian/alternc-slave.config +++ b/debian/alternc-slave.config @@ -6,19 +6,6 @@ set -e . /usr/share/debconf/confmodule db_title AlternC -db_input critical alternc-slave/welcomeconfirm || true - -db_go -# Check the answer. -db_get alternc-slave/welcomeconfirm || true - -if [ "$RET" = "false" ]; then - # reset the welcomeconfirm flag if user refuses so it gets asked again next time - db_reset alternc-slave/welcomeconfirm || true - db_fset alternc-slave/welcomeconfirm "seen" "false" || true - exit 1 -fi - # default values for local.sh MYSQL_HOST=127.0.0.1 MYSQL_DATABASE=alternc diff --git a/debian/alternc-slave.templates b/debian/alternc-slave.templates index 0b7f9fea..672dfdba 100644 --- a/debian/alternc-slave.templates +++ b/debian/alternc-slave.templates @@ -1,16 +1,3 @@ -Template:alternc-slave/welcomeconfirm -Type: boolean -Default: true -_Description: Do you REALLY want to install AlternC on this computer ? - You are currently trying to install AlternC on your computer. Be aware - that this package will overwrite critical system files, including but not - limited to the config files of bind, postfix, dovecot, squirrelmail and proftpd. - . - A backup of your old configuration will be stored in - "/var/backups/alternc/etc-original-`date`.tar.gz". - . - YOU HAVE BEEN WARNED. - Template:alternc-slave/desktopname Type: string _Description: Fully qualified name of the desktop: diff --git a/debian/alternc-squirrelmail.postinst b/debian/alternc-squirrelmail.postinst index 16a04df2..050004b3 100644 --- a/debian/alternc-squirrelmail.postinst +++ b/debian/alternc-squirrelmail.postinst @@ -30,3 +30,6 @@ case "$1" in ;; esac +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# diff --git a/debian/alternc.config b/debian/alternc.config index f12ec6ce..6a71e7dd 100644 --- a/debian/alternc.config +++ b/debian/alternc.config @@ -82,25 +82,9 @@ SQLBACKUP_TYPE="rotate" SQLBACKUP_OVERWRITE="no" QUEST_STATE=1 -while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 14 ]; do +while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 12 ]; do case "$QUEST_STATE" in 1) - db_title AlternC - db_input critical alternc/welcomeconfirm || true - #db_go - ;; - 2) - # Check the answer. - db_get alternc/welcomeconfirm || true - - if [ "$RET" = "false" ]; then - # reset the welcomeconfirm flag if user refuses so it gets asked again next time - db_reset alternc/welcomeconfirm || true - db_fset alternc/welcomeconfirm "seen" "false" || true - exit 3 - fi - ;; - 3) if [ -r /etc/alternc/local.sh ]; then # source the current config . /etc/alternc/local.sh @@ -111,7 +95,7 @@ while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 14 ]; do db_set alternc/desktopname "$FQDN" db_input high alternc/hostingname || true ;; - 4) + 2) # Get the FQDN db_input high alternc/desktopname || true # Be sure that the FQDN is lowercase (Bug #1405) @@ -119,7 +103,7 @@ while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 14 ]; do db_set alternc/desktopname "`echo $RET | tr '[:upper:]' '[:lower:]'`" # End bug #1405 ;; - 5) + 3) #we ask for the public and private ip db_set alternc/public_ip "$PUBLIC_IP" STATE=0 @@ -147,7 +131,7 @@ while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 14 ]; do fi done ;; - 6) + 4) #private IP db_set alternc/internal_ip "$INTERNAL_IP" @@ -163,39 +147,39 @@ while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 14 ]; do fi done ;; - 7) + 5) #We ask for the DNS server for the ip # db_set alternc/ns1 "$NS1_HOSTNAME" db_input high alternc/ns1 || true ;; - 8) + 6) db_set alternc/ns1 "$NS2_HOSTNAME" db_input high alternc/ns2 || true ;; - 9) + 7) db_set alternc/default_mx "$DEFAULT_MX" db_input high alternc/default_mx || true ;; - 10) + 8) if [ "`mysql --defaults-file=/etc/mysql/debian.cnf -Bse 'SELECT "OK";' 2>/dev/null`" = "OK" ]; then db_input critical alternc/use_local_mysql || true else db_input critical alternc/use_remote_mysql || true fi ;; - 11) + 9) db_get alternc/use_local_mysql || true if [ "$RET" = "false" ]; then #user want to use a remote server check_mysql fi ;; - 12) + 10) db_input low alternc/alternc_location || true ;; - 13) + 11) # We need to check the alternc_location here because we have to test for quotas and acls db_get alternc/alternc_location if [ -z "$RET" ] diff --git a/debian/alternc.templates b/debian/alternc.templates index 237d724f..368ec0c6 100644 --- a/debian/alternc.templates +++ b/debian/alternc.templates @@ -1,16 +1,3 @@ -Template: alternc/welcomeconfirm -Type: boolean -Default: true -_Description: Do you REALLY want to install AlternC on this computer ? - You are currently trying to install AlternC on your computer. Be aware - that this package will overwrite critical system files, including but not - limited to the config files of bind, postfix, dovecot, squirrelmail and proftpd. - . - A backup of your old configuration will be stored in - "/var/backups/alternc/etc-original-`date`.tar.gz". - . - YOU HAVE BEEN WARNED. - Template: alternc/warningaclquota Type: note _Description: AlternC need ACL and QUOTA activated @@ -218,22 +205,22 @@ _Description: POP Before SMTP deprecated Template: alternc/postrm_remove_databases Type: boolean -_Description: Should AlternC remove all databases (/var/lib/mysql/) ? +_Description: Should AlternC remove all databases (/var/lib/mysql/)? All users databases will be trashed Template: alternc/postrm_remove_datafiles Type: boolean -_Description: Should AlternC remove users datas ? +_Description: Should AlternC remove users datas? The files and apache redirections created by users will be trashed Template: alternc/postrm_remove_bind Type: boolean -_Description: Should AlternC remove bind zones ? +_Description: Should AlternC remove bind zones? It will delete all bind zones created by AlternC Template: alternc/postrm_remove_mailboxes Type: boolean -_Description: Should AlternC remove mailboxes ? +_Description: Should AlternC remove mailboxes? If you accept all users e-mails will be deleted Template: alternc/slaves @@ -247,21 +234,26 @@ _Description: Slave servers Template: alternc/use_local_mysql Type: boolean -_Description: - A local MySQL connection was established on the server. Do you Want to Use it. If not remote MySQL server connection parameters will be needed. +_Description: Shall we use locally found MySQL server? + A local MySQL connection was established on the server. + Tell us if you want to use it. If not remote MySQL server + connection parameters will be needed. Template: alternc/use_remote_mysql Type: boolean -_Description: - No local Mysql server was found. Do you want to use a remote Mysql Server. If not AlternC cannot be installed. +_Description: Shall we use a remote MySQL server? + No local Mysql server was found. + Please confirm you want to use a remote Mysql Server. + If not AlternC cannot be installed. Template: alternc/remote_mysql_error Type: boolean -_Description: - Remote connection failed. Do you want to try again ? +_Description: MySQL connection error. Try again? + Remote connection to the MySQL server failed. + Please confirm that we shall try again. Template: alternc/use_private_ip Type: boolean -_Description: - The ip appears to be private, do you want to use it anyway ? The server might not be reachable from outside your network. - +_Description: Private IP detected, use it anyway? + The ip appears to be private, please confirm you want to use it anyway. + The server might not be reachable from outside your network. diff --git a/debian/control b/debian/control index 22b6a34d..a0bee5e3 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Antoine Beaupré Uploaders: Benjamin Sonntag Build-Depends-Indep: findutils (>= 4.1.7), gettext (>= 0.10.40-5) Build-Depends: debhelper (>= 4.0.2), po-debconf -Standards-Version: 3.9.1 +Standards-Version: 3.9.4 Package: alternc Architecture: all diff --git a/debian/rules b/debian/rules index 8c307da6..46e18fde 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,8 @@ install: DH_OPTIONS= install: build dh_testdir dh_testroot - dh_clean -k +# FIXME: if alternc still works with this commented out : remove it :-D +# dh_clean -k dh_installdirs # Install