diff --git a/DEBIAN_COMPLIANCE b/DEBIAN_COMPLIANCE index b7de2dab..0c754a1f 100644 --- a/DEBIAN_COMPLIANCE +++ b/DEBIAN_COMPLIANCE @@ -1,6 +1,7 @@ ******************************************************************************************** * 2013: We are trying to make AlternC enter Debian repositories and follow Debian rules :) * +* 2018: Still trying :) * ******************************************************************************************** The main issues we know as of today are: @@ -14,38 +15,7 @@ Questions: - some binaries / scripts don't have a man page -- we are packaging some JS library ourself : - W: alternc: embedded-javascript-library var/alternc/bureau/admin/js/prototype.js - W: alternc: embedded-javascript-library var/alternc/bureau/admin/js/jquery.min.js -- 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/ -W: alternc: binary-without-manpage usr/bin/alternc_get_path -W: alternc: binary-without-manpage usr/bin/alternc_reload -W: alternc: maintainer-script-ignores-errors prerm -W: alternc-awstats: possible-debconf-note-abuse preinst:13 alternc-awstats/errorinstall - -E: alternc: duplicate-conffile etc/cron.d/alternc -E: alternc: duplicate-conffile etc/logrotate.d/alternc -W: alternc: malformed-prompt-in-templates alternc/slaves - -******************************************************************************** -Should be fixed, need more test: -- the control panel is located in /var/alternc/bureau => move it to /usr/share/alternc/panel -- the html data are in /var/alternc/html/[a-z0-9] => move them to /var/www/alternc/[a-z0-9] -- the mail data are in /var/alternc/mail/[a-z0-9] => move them to /var/mail/alternc/[a-z0-9] -- the bind zones, apache vhosts and other dynamic data are in /var/alternc/(bind|apache-vhost)/ => move them to /var/lib/alternc/(samename) -- /var/alternc/db => not used anymore, drop -- /var/alternc/mla => not used anymore, drop -- there is /var/alternc/cgi-bin/ is forgotten and now we use the standard /usr/lib/cgi-bin/ -- /var/alternc/exec.usr/ => usr/lib/alternc/safe_mode_exec_dir -- /var/alternc/sessions/ disapear for the standard PHP sessions dir. ******************************************************************************** FIXED: @@ -89,3 +59,33 @@ W: alternc: malformed-question-in-templates alternc/use_private_ip W: alternc: command-with-path-in-maintainer-script config:205 /usr/bin/awk +- we are packaging some JS library ourself : + W: alternc: embedded-javascript-library var/alternc/bureau/admin/js/prototype.js + W: alternc: embedded-javascript-library var/alternc/bureau/admin/js/jquery.min.js + +- 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/ +W: alternc: binary-without-manpage usr/bin/alternc_get_path +W: alternc: binary-without-manpage usr/bin/alternc_reload +W: alternc: maintainer-script-ignores-errors prerm +W: alternc-awstats: possible-debconf-note-abuse preinst:13 alternc-awstats/errorinstall + +E: alternc: duplicate-conffile etc/cron.d/alternc +E: alternc: duplicate-conffile etc/logrotate.d/alternc +W: alternc: malformed-prompt-in-templates alternc/slaves + +- the control panel is located in /var/alternc/bureau => move it to /usr/share/alternc/panel +- the html data are in /var/alternc/html/[a-z0-9] => move them to /var/www/alternc/[a-z0-9] +- the mail data are in /var/alternc/mail/[a-z0-9] => move them to /var/mail/alternc/[a-z0-9] +- the bind zones, apache vhosts and other dynamic data are in /var/alternc/(bind|apache-vhost)/ => move them to /var/lib/alternc/(samename) +- /var/alternc/db => not used anymore, drop +- /var/alternc/mla => not used anymore, drop +- there is /var/alternc/cgi-bin/ is forgotten and now we use the standard /usr/lib/cgi-bin/ +- /var/alternc/exec.usr/ => usr/lib/alternc/safe_mode_exec_dir +- /var/alternc/sessions/ disapear for the standard PHP sessions dir. diff --git a/debian/alternc-awstats.postinst b/debian/alternc-awstats.postinst index 8a9b7cce..52839b7b 100755 --- a/debian/alternc-awstats.postinst +++ b/debian/alternc-awstats.postinst @@ -29,10 +29,10 @@ case "$1" in # configure /etc/alternc/templates/apache/httpd.conf # configure /etc/alternc/templates/apache-ssl/httpd.conf - if [ -x /usr/sbin/apache2 ]; then - if [ ! -h /etc/apache2/conf.d/alterncawstats.conf ]; then + if [ -d /etc/apache2/conf-enabled ]; then + if [ ! -L /etc/apache2/conf-enabled/alterncawstats.conf ]; then ln -sf /etc/alternc/alterncawstats.conf \ - /etc/apache2/conf.d/alterncawstats.conf + /etc/apache2/conf-enabled/alterncawstats.conf fi # build awstats.log.alternc.conf if it does not exist if [ ! -f $LOGAPACHE ]; then @@ -47,13 +47,6 @@ EOF chmod 644 $LOGAPACHE fi - if [ -x /usr/sbin/apache-ssl ]; then - if [ ! -h /etc/apache-ssl/conf.d/alterncawstats.conf ]; then - ln -sf /etc/alternc/alterncawstats.conf \ - /etc/apache-ssl/conf.d/alterncawstats.conf - fi - fi - logrotate_apache # Add htpasswd : diff --git a/debian/alternc-awstats.preinst b/debian/alternc-awstats.preinst index 7a33fb70..e3becd31 100755 --- a/debian/alternc-awstats.preinst +++ b/debian/alternc-awstats.preinst @@ -9,8 +9,6 @@ else . /usr/share/debconf/confmodule db_version 2.0 db_title AlternC-Awstats - db_fset alternc-awstats/errorinstall seen false - db_input medium alternc-awstats/errorinstall db_go exit 1 fi diff --git a/debian/alternc-awstats.templates b/debian/alternc-awstats.templates index 929e7a33..23d538ec 100644 --- a/debian/alternc-awstats.templates +++ b/debian/alternc-awstats.templates @@ -7,12 +7,3 @@ _Description: Default quota value for awstats stats: number of statistic set. Please specify the default quota they will have for this service. -Template: alternc-awstats/errorinstall -Type: note -_Description: Error installing AlternC-Awstats - AlternC-Awstats requires a complete installed AlternC system to get installed properly! - . - Please install AlternC and CONFIGURE IT before installing alternc-awstats or additional - modules (don't forget to launch 'alternc.install'). - . - Please check out the AlternC installation documentation before proceeding. diff --git a/debian/alternc.config b/debian/alternc.config index 31d55f04..768d7288 100644 --- a/debian/alternc.config +++ b/debian/alternc.config @@ -89,7 +89,7 @@ MYSQL_MAIL_USER=alternc_user MYSQL_MAIL_PASS="`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..10)' `" MYSQL_CLIENT=localhost FQDN="`(cat /etc/mailname 2>/dev/null || hostname -f)|tr '[:upper:]' '[:lower:]'`" -INTERNAL_IP="`env LANG=C /sbin/ip addr show|grep 'inet ' | grep -v 127.0.0.1| head -1 | sed -e 's/^.*inet \([0-9\.]*\).*$/\1/' 2>/dev/null || hostname -f`" +INTERNAL_IP="`env LANG=C ip addr show|grep 'inet ' | grep -v 127.0.0.1| head -1 | sed -e 's/^.*inet \([0-9\.]*\).*$/\1/' 2>/dev/null || hostname -f`" PUBLIC_IP="$INTERNAL_IP" DEFAULT_MX="`cat /etc/mailname 2>/dev/null || hostname -f`" ALTERNC_HTML="/var/www/alternc/" diff --git a/debian/alternc.lintian b/debian/alternc.lintian index b51b7292..c91a58f3 100644 --- a/debian/alternc.lintian +++ b/debian/alternc.lintian @@ -1,41 +1,6 @@ -alternc: non-standard-dir-in-var var/alternc/ -alternc: non-standard-dir-in-var var/backups/ -alternc: file-in-unusual-dir +alternc: non-standard-dir-perm var/lib/alternc/backups/ 0700 != 0755 alternc: setuid-binary usr/lib/alternc/quota_edit 4750 root/www-data alternc: setuid-binary usr/lib/alternc/quota_get 4750 root/www-data alternc: setuid-binary usr/lib/alternc/mem_add 4750 root/www-data alternc: setuid-binary usr/lib/alternc/mem_del 4750 root/www-data alternc: setuid-binary usr/lib/alternc/db_create 4750 root/www-data -alternc: non-standard-executable-perm usr/lib/alternc/quota_edit.sh 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/quota_get.sh 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/sqlbackup.sh 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/rawstat.daily 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/quota_init 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/quota_delete 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/update_domains.sh 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/functions_hosting.sh 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/functions_dns.sh 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/slave_dns 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/sendmail 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/spoolsize.php 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/fixperms.sh 0750 != 0755 -alternc: non-standard-executable-perm usr/lib/alternc/fixperms_mail.sh 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/sendmail 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/quota_edit.sh 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/fixperms.sh 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/fixperms_mail.sh 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/quota_edit 4750 -alternc: executable-is-not-world-readable usr/lib/alternc/quota_get.sh 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/mem_del 4750 -alternc: executable-is-not-world-readable usr/lib/alternc/quota_delete 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/mem_add 4750 -alternc: executable-is-not-world-readable usr/lib/alternc/sqlbackup.sh 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/quota_get 4750 -alternc: executable-is-not-world-readable usr/lib/alternc/slave_dns 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/update_domains.sh 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/functions_hosting.sh 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/functions_dns.sh 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/quota_init 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/spoolsize.php 0750 != 0755 -alternc: executable-is-not-world-readable usr/lib/alternc/rawstat.daily 0750 != 0755 -alternc: using-first-person-in-templates alternc/monitor_ip diff --git a/debian/changelog b/debian/changelog index 191ee5c7..f3914848 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -alternc (3.5.0rc1) stable; urgency=low +alternc (3.5.0~rc1) stable; urgency=low * AlternC 3.5 for Jessie & Stretch * added AlternC-ssl natively now, based on cert providers (external package) - -- Benjamin Sonntag Fri, 21 Jun 2018 15:26:00 +0100 + -- Benjamin Sonntag Sun, 24 Jun 2018 15:26:00 +0200 alternc (3.1.11) oldoldstable; urgency=low diff --git a/debian/control b/debian/control index 33805871..e2dce4c0 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: alternc Section: admin Priority: optional -Maintainer: Benjamin Sonntag +Maintainer: Benjamin Sonntag Build-Depends-Indep: perl , findutils (>= 4.1.7) , gettext (>= 0.10.40-5) Build-Depends: debhelper (>= 9) , po-debconf -Standards-Version: 3.9.4 +Standards-Version: 3.9.8 Package: alternc Architecture: all @@ -88,7 +88,7 @@ Suggests: alternc-awstats , ncompress , alternc-squirrelmail , alternc-roundcube -Description: Hosting software managment suite for Debian +Description: Hosting software management suite for Debian AlternC is a mutualized hosting software manager for Linux. It allows you to manage your websites, domains, ftp, emails, aliases, web statistics, mailing-lists, jabber accounts, etc. @@ -168,7 +168,7 @@ Suggests: alternc-awstats , zip , ncompress , bzip2 -Description: Hosting software managment suite for Debian +Description: Hosting software management suite for Debian AlternC is a mutualized hosting software manager for Linux. It allows you to manage your websites, domains, ftp, emails, aliases, web statistics, mailing-lists, jabber accounts, etc. diff --git a/debian/po/de.po b/debian/po/de.po index 2e8bf8a6..c87bd48a 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -14,15 +14,15 @@ msgid "" msgstr "" "Project-Id-Version: AlternC, hosting control panel\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2017-10-08 14:47+0200\n" +"POT-Creation-Date: 2018-06-24 17:17+0200\n" "PO-Revision-Date: 2017-10-08 12:49+0000\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: German (Germany) (http://www.transifex.com/octopuce/alternc/" "language/de_DE/)\n" +"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: error @@ -52,6 +52,14 @@ msgstr "" "Kontingent zu verwalten (ist aber nicht Verpflichtent wenn kein Kontingent " "vergeben werden soll)." +#. Type: error +#. Description +#. Type: error +#. Description +#: ../alternc.templates:1001 ../alternc.templates:36001 +msgid "This is a fatal error and will cause the package installation to fail." +msgstr "" + #. Type: note #. Description #: ../alternc.templates:2001 @@ -122,12 +130,33 @@ msgstr "" msgid "Name of the primary domain name server:" msgstr "Name des Primären Domain-Name-Server:" +#. Type: string +#. Description +#: ../alternc.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 " +"your hosting service is quite big, you may have an external primary name " +"server that keep in sync with your alternc's server(s). . The default value " +"should be good in most case." +msgstr "" + #. Type: string #. Description #: ../alternc.templates:6001 msgid "Name of the secondary domain name server:" msgstr "Name des zweiten Domain-Name-Server:" +#. Type: string +#. Description +#: ../alternc.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, " +"you should have 2 separate DNS servers if you want to provide a high quality " +"hosting service." +msgstr "" + #. Type: string #. Description #: ../alternc.templates:6001 @@ -201,6 +230,16 @@ msgstr "" msgid "Name of the mysql server:" msgstr "Name des MySQL Server:" +#. Type: string +#. Description +#: ../alternc.templates:10001 +msgid "" +"Please enter the fully qualified name of your mysql server host. This server " +"MUST be able to access the remote server at standard port (3306). It is " +"recommended to use \"127.0.0.1\" instead of \"localhost\" if your postfix " +"installation is configured in a chroot (which is the case, by default)." +msgstr "" + #. Type: string #. Description #: ../alternc.templates:11001 @@ -257,6 +296,14 @@ msgstr "" "Benutzerzugang damit alternc einen Benutzer einrichten kann mit -grant- " "Rechten." +#. Type: string +#. Description +#: ../alternc.templates:13001 +msgid "" +"The alternc sql user is responsible for granting access to user generated " +"databases, that is why it needs root access on the mysql installation." +msgstr "" + #. Type: password #. Description #. Type: password @@ -310,12 +357,38 @@ msgstr "Eintrag des Passwortes für den entfernten MySQL Zugang" msgid "The server to GRANT permissions to:" msgstr "Den Server hat GRANT Berechtigungen für:" +#. Type: string +#. Description +#: ../alternc.templates:18001 +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 " +"the hostname or IP the Apache server will appear as connecting from to the " +"MySQL server." +msgstr "" + #. Type: select #. Description #: ../alternc.templates:19001 msgid "The way backup rotation is executed" msgstr "Die Backup 'Rotation' ist ausgeführt." +#. Type: select +#. Description +#: ../alternc.templates:19001 +msgid "" +"AlternC enables users to configure their own backups, on demand, with " +"automatic rotation. This option determines how the backups are rotated." +msgstr "" + +#. Type: select +#. Description +#: ../alternc.templates:19001 +msgid "" +"rotate - backup.sql, backup.sql.0, backup.sql.1 date - backup.sql, backup." +"sql.20080709, backup.sql.20080708" +msgstr "" + #. Type: select #. Description #: ../alternc.templates:20001 @@ -324,12 +397,29 @@ msgstr "" "Das Verhalten des Backupscriptes wenn es eine nicht verwaltbare Datei " "erreicht hat." +#. Type: select +#. Description +#: ../alternc.templates:20001 +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 " +"it." +msgstr "" + #. Type: string #. Description #: ../alternc.templates:21001 msgid "The primary IP of this server:" msgstr "Die primäre IP von diesem Server:" +#. Type: string +#. Description +#: ../alternc.templates:21001 +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." +msgstr "" + #. Type: string #. Description #: ../alternc.templates:22001 @@ -370,6 +460,28 @@ msgstr "" "AlternC wird den HOSTNAMEN als MX Eintrag für alle Domänen übernehmen die " "vorhanden sind. Dieser Vorgang ist besser als ohne Eintrag." +#. Type: string +#. Description +#: ../alternc.templates:24001 +#, fuzzy +#| msgid "The default MX to assign to new domains:" +msgid "The default Backup MX to assign to new domains:" +msgstr "Diese Grundeinstellung für MX wird für alle Domänen übernommen." + +#. Type: string +#. Description +#: ../alternc.templates:24001 +#, fuzzy +#| msgid "" +#| "AlternC will assign this hostname as the MX record for all the domains it " +#| "hosts. It is usually better be left alone." +msgid "" +"AlternC will assign this hostname as the Backup MX record for all the " +"domains it hosts. Don't set it if you don't know what it is about." +msgstr "" +"AlternC wird den HOSTNAMEN als MX Eintrag für alle Domänen übernehmen die " +"vorhanden sind. Dieser Vorgang ist besser als ohne Eintrag." + #. Type: string #. Description #: ../alternc.templates:25001 @@ -399,6 +511,14 @@ msgstr "" msgid "The monitoring server:" msgstr "Der Überwachungsserver:" +#. Type: string +#. Description +#: ../alternc.templates:26001 +msgid "" +"The IP address (or ip/prefix) of the server(s) which must be authorized to " +"ping the server and access apache status pages. Completely optional." +msgstr "" + #. Type: boolean #. Description #: ../alternc.templates:27001 @@ -535,6 +655,12 @@ msgstr "" "bestätige das diese Situation gewollt ist, ansonsten ist dieser Server nicht " "von aussen zu erreichen." +#. Type: error +#. Description +#: ../alternc.templates:36001 +msgid "Remote mysql: connection error" +msgstr "" + #. Type: error #. Description #: ../alternc.templates:36001 @@ -561,36 +687,25 @@ msgstr "" "können einen bestimmten Zeitraum der Statistiken abrufen. Bitte setzen Sie " "eine Grundwert für diesen Service ein." -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "Error installing AlternC-Awstats" -msgstr "Fehler bei der Installation des AlternC-Awstats" +#~ msgid "Error installing AlternC-Awstats" +#~ msgstr "Fehler bei der Installation des AlternC-Awstats" -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly!" -msgstr "AlternC-Awstats benötigt eine komplett Installiertes AlternC System." +#~ msgid "" +#~ "AlternC-Awstats requires a complete installed AlternC system to get " +#~ "installed properly!" +#~ msgstr "" +#~ "AlternC-Awstats benötigt eine komplett Installiertes AlternC System." -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please install AlternC and CONFIGURE IT before installing alternc-awstats or " -"additional modules (don't forget to launch 'alternc.install')." -msgstr "" -"Bitte Installieren sie AlternC und Konfigurieren ihn bevor soe 'alternc-" -"awstats' oder zusätzliche Module Installieren (nicht vergessen den 'alternc." -"install' aus zu führen)." +#~ msgid "" +#~ "Please install AlternC and CONFIGURE IT before installing alternc-awstats " +#~ "or additional modules (don't forget to launch 'alternc.install')." +#~ msgstr "" +#~ "Bitte Installieren sie AlternC und Konfigurieren ihn bevor soe 'alternc-" +#~ "awstats' oder zusätzliche Module Installieren (nicht vergessen den " +#~ "'alternc.install' aus zu führen)." -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please check out the AlternC installation documentation before proceeding." -msgstr "" -"Bitte lesen sie in der AlternC Installation Beschreibung bevor sie weiter " -"machen." +#~ msgid "" +#~ "Please check out the AlternC installation documentation before proceeding." +#~ msgstr "" +#~ "Bitte lesen sie in der AlternC Installation Beschreibung bevor sie weiter " +#~ "machen." diff --git a/debian/po/en.po b/debian/po/en.po index de74c220..03776e88 100644 --- a/debian/po/en.po +++ b/debian/po/en.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.3.1\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2017-10-08 14:47+0200\n" +"POT-Creation-Date: 2018-06-24 17:17+0200\n" "PO-Revision-Date: 2005-05-15 18:24+0200\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: English \n" @@ -600,32 +600,3 @@ msgid "" "of statistic set. Please specify the default quota they will have for this " "service." msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "Error installing AlternC-Awstats" -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly!" -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please install AlternC and CONFIGURE IT before installing alternc-awstats or " -"additional modules (don't forget to launch 'alternc.install')." -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please check out the AlternC installation documentation before proceeding." -msgstr "" diff --git a/debian/po/es.po b/debian/po/es.po index 34af1ac4..a210e707 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -15,15 +15,15 @@ msgid "" msgstr "" "Project-Id-Version: AlternC, hosting control panel\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2017-10-08 14:47+0200\n" +"POT-Creation-Date: 2018-06-24 17:17+0200\n" "PO-Revision-Date: 2017-10-08 12:49+0000\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/octopuce/alternc/" "language/es_ES/)\n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: error @@ -52,6 +52,14 @@ msgstr "" "Además, si deseas utilizar las cuotas de disco, deves activar las cuotas de " "grupo (grpquota) (pero no es obligatorio)" +#. Type: error +#. Description +#. Type: error +#. Description +#: ../alternc.templates:1001 ../alternc.templates:36001 +msgid "This is a fatal error and will cause the package installation to fail." +msgstr "" + #. Type: note #. Description #: ../alternc.templates:2001 @@ -683,6 +691,12 @@ msgstr "" "igual quieres utilizarla. El servidor podrá no ser accesible desde fuera de " "tu red. " +#. Type: error +#. Description +#: ../alternc.templates:36001 +msgid "Remote mysql: connection error" +msgstr "" + #. Type: error #. Description #: ../alternc.templates:36001 @@ -710,36 +724,24 @@ msgstr "" "el valor por omisión de las cuotas que les serán asignadas para este " "servicio. " -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "Error installing AlternC-Awstats" -msgstr "Error al instalar AlternC-Awstats" +#~ msgid "Error installing AlternC-Awstats" +#~ msgstr "Error al instalar AlternC-Awstats" -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly!" -msgstr "" -"¡AlternC-Awstats requiere una instalación completa de AlternC para poder ser " -"instalado!" +#~ msgid "" +#~ "AlternC-Awstats requires a complete installed AlternC system to get " +#~ "installed properly!" +#~ msgstr "" +#~ "¡AlternC-Awstats requiere una instalación completa de AlternC para poder " +#~ "ser instalado!" -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please install AlternC and CONFIGURE IT before installing alternc-awstats or " -"additional modules (don't forget to launch 'alternc.install')." -msgstr "" -"Favor instalar y CONFIGURAR AlternC antes de instalar alternc-awstats y " -"otros módulos (no olvidar de lanzar 'alternc.install')." +#~ msgid "" +#~ "Please install AlternC and CONFIGURE IT before installing alternc-awstats " +#~ "or additional modules (don't forget to launch 'alternc.install')." +#~ msgstr "" +#~ "Favor instalar y CONFIGURAR AlternC antes de instalar alternc-awstats y " +#~ "otros módulos (no olvidar de lanzar 'alternc.install')." -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please check out the AlternC installation documentation before proceeding." -msgstr "" -"Favor leer la documentación de instalación de AlternC antes de continuar. " +#~ msgid "" +#~ "Please check out the AlternC installation documentation before proceeding." +#~ msgstr "" +#~ "Favor leer la documentación de instalación de AlternC antes de continuar. " diff --git a/debian/po/fr.po b/debian/po/fr.po index dfc26e5d..9939857a 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -23,15 +23,15 @@ msgid "" msgstr "" "Project-Id-Version: AlternC, hosting control panel\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2017-10-08 14:47+0200\n" +"POT-Creation-Date: 2018-06-24 17:17+0200\n" "PO-Revision-Date: 2017-10-08 12:51+0000\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: French (France) (http://www.transifex.com/octopuce/alternc/" "language/fr_FR/)\n" +"Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. Type: error @@ -185,6 +185,14 @@ msgstr "" "d'AlternC. Rendez-vous sur http://alternc.net/ pour créer un compte et en " "profiter." +#. Type: string +#. Description +#: ../alternc.templates:7001 +#, fuzzy +#| msgid "Path where alternc's logs files will be located:" +msgid "Path where AlternC's users html files will be located:" +msgstr "Répertoire dans lequel les fichiers logs d'AlternC seront stockés" + #. Type: string #. Description #: ../alternc.templates:7001 @@ -203,6 +211,14 @@ msgid "This directory will contain every AlternC users personal directories." msgstr "" "Ce répertoire contiendra les dossiers personnels de tous les comptes AlternC." +#. Type: string +#. Description +#: ../alternc.templates:8001 +#, fuzzy +#| msgid "Path where alternc's logs files will be located:" +msgid "Path where AlternC's users mails will be located:" +msgstr "Répertoire dans lequel les fichiers logs d'AlternC seront stockés" + #. Type: string #. Description #: ../alternc.templates:8001 @@ -290,6 +306,14 @@ msgstr "" "nom d'utilisateur qui sera créé. La valeur par défaut convient dans la " "plupart des cas." +#. Type: string +#. Description +#: ../alternc.templates:13001 +#, fuzzy +#| msgid "AlternC's mysql account:" +msgid "Remote root mysql user account:" +msgstr "Compte mysql d'AlternC : " + #. Type: string #. Description #: ../alternc.templates:13001 @@ -346,6 +370,14 @@ msgstr "" "Merci de choisir un mot de passe complexe, car il permet d'accéder à la base " "système ! Si vous n'entrez rien, un mot de passe aléatoire sera généré." +#. Type: password +#. Description +#: ../alternc.templates:15001 +#, fuzzy +#| msgid "Password of AlternC's mysql account:" +msgid "Password of the remote root mysql user account:" +msgstr "Mot de passe du compte MySQL d'AlternC :" + #. Type: password #. Description #: ../alternc.templates:15001 @@ -625,6 +657,14 @@ msgstr "" msgid "Use a remote MySQL server?" msgstr "Doit-on utiliser un serveur MySQL distant ?" +#. Type: boolean +#. Description +#: ../alternc.templates:33001 +msgid "" +"Please confirm you want to use a remote Mysql Server. If not, AlternC cannot " +"be installed." +msgstr "" + #. Type: boolean #. Description #: ../alternc.templates:34001 @@ -691,36 +731,25 @@ msgstr "" "Merci de préciser la valeur par défaut des quotas qui leurs seront assignés " "pour ce service." -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "Error installing AlternC-Awstats" -msgstr "Erreur à l'installation d'AlternC-Awstats" +#~ msgid "Error installing AlternC-Awstats" +#~ msgstr "Erreur à l'installation d'AlternC-Awstats" -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly!" -msgstr "" -"AlternC-Awstats requiert une installation complète d'AlternC pour pouvoir " -"être installé !" +#~ msgid "" +#~ "AlternC-Awstats requires a complete installed AlternC system to get " +#~ "installed properly!" +#~ msgstr "" +#~ "AlternC-Awstats requiert une installation complète d'AlternC pour pouvoir " +#~ "être installé !" -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please install AlternC and CONFIGURE IT before installing alternc-awstats or " -"additional modules (don't forget to launch 'alternc.install')." -msgstr "" -"Merci d'installer et de CONFIGURER AlternC avant d'installer alternc-awstats " -"ou d'autres modules (ne pas oublier de lancer 'alternc.install')." +#~ msgid "" +#~ "Please install AlternC and CONFIGURE IT before installing alternc-awstats " +#~ "or additional modules (don't forget to launch 'alternc.install')." +#~ msgstr "" +#~ "Merci d'installer et de CONFIGURER AlternC avant d'installer alternc-" +#~ "awstats ou d'autres modules (ne pas oublier de lancer 'alternc.install')." -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please check out the AlternC installation documentation before proceeding." -msgstr "" -"Merci de lire la documentation d'installation d'AlternC avant de continuer." +#~ msgid "" +#~ "Please check out the AlternC installation documentation before proceeding." +#~ msgstr "" +#~ "Merci de lire la documentation d'installation d'AlternC avant de " +#~ "continuer." diff --git a/debian/po/it.po b/debian/po/it.po index 5ee6c73f..96fefe77 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -10,15 +10,15 @@ msgid "" msgstr "" "Project-Id-Version: AlternC, hosting control panel\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2017-10-08 14:47+0200\n" +"POT-Creation-Date: 2018-06-24 17:17+0200\n" "PO-Revision-Date: 2017-10-08 12:49+0000\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: Italian (Italy) (http://www.transifex.com/octopuce/alternc/" "language/it_IT/)\n" +"Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it_IT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: error @@ -47,6 +47,14 @@ msgstr "" "Inoltre, serve attivare il gruppo quota (grpquota) per poter utilizzare il " "disco quota (ma non è obbligatorio)" +#. Type: error +#. Description +#. Type: error +#. Description +#: ../alternc.templates:1001 ../alternc.templates:36001 +msgid "This is a fatal error and will cause the package installation to fail." +msgstr "" + #. Type: note #. Description #: ../alternc.templates:2001 @@ -385,6 +393,14 @@ msgstr "" "AlternC abilita gli utenti a configurare i loro backup, on demand, a cicli " "automatici. Questa opzione determina la rotazione dei backup." +#. Type: select +#. Description +#: ../alternc.templates:19001 +msgid "" +"rotate - backup.sql, backup.sql.0, backup.sql.1 date - backup.sql, backup." +"sql.20080709, backup.sql.20080708" +msgstr "" + #. Type: select #. Description #: ../alternc.templates:20001 @@ -648,6 +664,12 @@ msgstr "" "tratta di una situazione prevista, dato che il server potrebbe non essere " "raggiungibile dall'esterno della vostra rete." +#. Type: error +#. Description +#: ../alternc.templates:36001 +msgid "Remote mysql: connection error" +msgstr "" + #. Type: error #. Description #: ../alternc.templates:36001 @@ -674,36 +696,25 @@ msgstr "" "possono richiedere un numero limitato di set di statistiche. Specificate la " "quota di default per questo servizio." -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "Error installing AlternC-Awstats" -msgstr "Errore nell'installazione di AlternC-AWStats" +#~ msgid "Error installing AlternC-Awstats" +#~ msgstr "Errore nell'installazione di AlternC-AWStats" -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly!" -msgstr "" -"AlternC-AWStats necessita di un'installazione completa del sistema AlternC " -"per essere installata correttamente!" +#~ msgid "" +#~ "AlternC-Awstats requires a complete installed AlternC system to get " +#~ "installed properly!" +#~ msgstr "" +#~ "AlternC-AWStats necessita di un'installazione completa del sistema " +#~ "AlternC per essere installata correttamente!" -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please install AlternC and CONFIGURE IT before installing alternc-awstats or " -"additional modules (don't forget to launch 'alternc.install')." -msgstr "" -"Installate AlternC e CONFIGURATELO prima di instalare alternc-awstats o " -"altri moduli aggiuntivi (non dimenticate di lanciare \"alternc.install\")." +#~ msgid "" +#~ "Please install AlternC and CONFIGURE IT before installing alternc-awstats " +#~ "or additional modules (don't forget to launch 'alternc.install')." +#~ msgstr "" +#~ "Installate AlternC e CONFIGURATELO prima di instalare alternc-awstats o " +#~ "altri moduli aggiuntivi (non dimenticate di lanciare \"alternc.install\")." -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please check out the AlternC installation documentation before proceeding." -msgstr "" -"Controllate la documentazione di installazione di AlternC prima di procedere." +#~ msgid "" +#~ "Please check out the AlternC installation documentation before proceeding." +#~ msgstr "" +#~ "Controllate la documentazione di installazione di AlternC prima di " +#~ "procedere." diff --git a/debian/po/nl.po b/debian/po/nl.po index a471bdfc..9fccff83 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: AlternC, hosting control panel\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2017-10-08 14:47+0200\n" +"POT-Creation-Date: 2018-06-24 17:17+0200\n" "PO-Revision-Date: 2013-02-08 14:51+0000\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: English \n" @@ -601,32 +601,3 @@ msgid "" "of statistic set. Please specify the default quota they will have for this " "service." msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "Error installing AlternC-Awstats" -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly!" -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please install AlternC and CONFIGURE IT before installing alternc-awstats or " -"additional modules (don't forget to launch 'alternc.install')." -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please check out the AlternC installation documentation before proceeding." -msgstr "" diff --git a/debian/po/pt.po b/debian/po/pt.po index c2310d02..64e94816 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: AlternC, hosting control panel\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2017-10-08 14:47+0200\n" +"POT-Creation-Date: 2018-06-24 17:17+0200\n" "PO-Revision-Date: 2013-02-08 14:51+0000\n" "Last-Translator: Benjamin Sonntag \n" "Language-Team: English \n" @@ -602,32 +602,3 @@ msgid "" "of statistic set. Please specify the default quota they will have for this " "service." msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "Error installing AlternC-Awstats" -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly!" -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please install AlternC and CONFIGURE IT before installing alternc-awstats or " -"additional modules (don't forget to launch 'alternc.install')." -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please check out the AlternC installation documentation before proceeding." -msgstr "" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 3c8f8685..d0bdd027 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the alternc package. # FIRST AUTHOR , YEAR. # #, fuzzy @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alternc\n" "Report-Msgid-Bugs-To: alternc@packages.debian.org\n" -"POT-Creation-Date: 2017-10-08 14:47+0200\n" +"POT-Creation-Date: 2018-06-24 17:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -601,32 +601,3 @@ msgid "" "of statistic set. Please specify the default quota they will have for this " "service." msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "Error installing AlternC-Awstats" -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"AlternC-Awstats requires a complete installed AlternC system to get " -"installed properly!" -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please install AlternC and CONFIGURE IT before installing alternc-awstats or " -"additional modules (don't forget to launch 'alternc.install')." -msgstr "" - -#. Type: note -#. Description -#: ../alternc-awstats.templates:2001 -msgid "" -"Please check out the AlternC installation documentation before proceeding." -msgstr "" diff --git a/install/mysql.sql b/install/mysql.sql index 02b196d4..e4e9acdf 100644 --- a/install/mysql.sql +++ b/install/mysql.sql @@ -794,4 +794,5 @@ CREATE TABLE IF NOT EXISTS `certificates` ( -- make it re-exec-proof DELETE FROM alternc_status WHERE name='alternc_version'; -INSERT INTO alternc_status SET name='alternc_version',value='3.5.0.2.php'; +INSERT INTO alternc_status SET name='alternc_version',value='3.5.0.1.sql'; + diff --git a/install/upgrades/3.4.5.sql b/install/upgrades/3.4.5.sql old mode 100755 new mode 100644 diff --git a/install/upgrades/3.5.0.2.php b/install/upgrades/3.5.0.2.php deleted file mode 100644 index a4abe2da..00000000 --- a/install/upgrades/3.5.0.2.php +++ /dev/null @@ -1,2 +0,0 @@ -