adding correct dependency on apache2 version + adding default_mx2 variable in debhelper + updating changelog to reflect MX changes + removing MX field in domaines table + restricting defmx/defmx2 to ADMIN only (xals, could you merge please?)

This commit is contained in:
Benjamin Sonntag 2011-06-04 08:46:54 +00:00
parent fdc8ec1dde
commit 78657e960f
9 changed files with 150 additions and 99 deletions

View File

@ -100,6 +100,12 @@ if [ -z "$RET" ]
db_set alternc/default_mx "$DEFAULT_MX"
fi
db_get alternc/default_mx2
if [ -z "$RET" ]
then
db_set alternc/default_mx2 "$DEFAULT_SECONDARY_MX"
fi
db_get alternc/mysql/host
if [ -z "$RET" ]
then
@ -156,6 +162,7 @@ db_input medium alternc/default_mx || true
db_input medium alternc/ns1 || true
db_input medium alternc/ns2 || true
db_input low alternc/alternc_location || true
db_input low alternc/default_mx2 || true
db_input low alternc/mysql/host || true
db_input low alternc/mysql/db || true
db_input low alternc/mysql/user || true

View File

@ -123,6 +123,7 @@ EOF
update_var alternc/ns1 NS1_HOSTNAME
update_var alternc/ns2 NS2_HOSTNAME
update_var alternc/default_mx DEFAULT_MX
update_var alternc/default_mx2 DEFAULT_SECONDARY_MX
update_var alternc/mysql/client MYSQL_CLIENT
update_var alternc/sql/backup_type SQLBACKUP_TYPE
update_var alternc/sql/backup_overwrite SQLBACKUP_OVERWRITE

5
debian/changelog vendored
View File

@ -1,4 +1,4 @@
alternc (1.0~rc2) stable; urgency=low
alternc (1.0~rc3) stable; urgency=low
* Major patch
* Web & DNS file generation rebuild from scratch
* Drop of apache 1 support
@ -13,13 +13,14 @@ alternc (1.0~rc2) stable; urgency=low
* Possibility to create a temporary mail (not yet shown, need cron)
* Admin can connect to other account and go back to their own
* Language link is back inside the menu
* MX and secondary MX are now available in debconf
* Bugfixes
* Too many to be listed (we change the historic update_domaines.sh)
* Dash compatibility
* Use iana.org to have whois server list up to date
* Preseeding compatibility : don't ask for questions when already set
-- Alan Garcia <fufroma@mailfr.com> Fri, 11 Mar 2011 10:24:30 +0200
-- Benjamin Sonntag <benjamin@alternc.org> Sat, 04 June 2011 10:15:30 +0200
alternc (1.0~rc1) stable; urgency=low

10
debian/control vendored
View File

@ -10,12 +10,12 @@ Standards-Version: 3.8.0
Package: alternc
Architecture: all
Pre-depends: debconf (>= 0.5.00) | debconf-2.0
Depends: debianutils (>= 1.13.1), apache2, libapache2-mod-php5, courier-ssl, courier-imap-ssl, courier-pop-ssl, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, squirrelmail, squirrelmail-locales, postfix-tls, bind9, wget, rsync, quota, courier-authmysql | courier-authlib-mysql, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, fam, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), pdksh (>= 5.2.14-6), adduser, mysql-client, dnsutils, bash
Recommends: apache2, mysql-server
Depends: debianutils (>= 1.13.1), apache2-mpm-prefork, libapache2-mod-php5, courier-ssl, courier-imap-ssl, courier-pop-ssl, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, squirrelmail, squirrelmail-locales, postfix-tls, bind9, wget, rsync, quota, courier-authmysql | courier-authlib-mysql, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, fam, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), adduser, mysql-client, dnsutils, bash
Recommends: mysql-server
Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4)
Provides: alternc-admintools
Replaces: alternc-admintools
Suggests: alternc-awstats, alternc-mailman, alternc-changepass, pop-before-smtp, magpierss, zip, ncompress, bzip2
Suggests: alternc-awstats, alternc-mailman, alternc-changepass, amavisd-new, clamav-daemon, spamassassin, pop-before-smtp, magpierss, zip, ncompress, bzip2
Description: hosting software managment suite for Debian
Hosting software suite based on Valentin Lacambre's altern.org French hosting
service. It uses Apache, Postfix, Sympa, MySQL and PHP to allow a web-based
@ -29,12 +29,12 @@ Homepage: http://www.alternc.org/
Package: alternc-slave
Architecture: all
Pre-depends: debconf (>= 0.5.00) | debconf-2.0
Depends: debianutils (>= 1.13.1), apache2, libapache2-mod-php5, courier-ssl, courier-imap-ssl, courier-pop-ssl, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, squirrelmail, postfix-tls, bind9, wget, rsync, quota, courier-authmysql | courier-authlib-mysql, 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), pdksh (>= 5.2.14-6), adduser, mysql-client, postgrey, sudo
Depends: debianutils (>= 1.13.1), apache2, libapache2-mod-php5, courier-ssl, courier-imap-ssl, courier-pop-ssl, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, squirrelmail, postfix-tls, bind9, wget, rsync, quota, courier-authmysql | courier-authlib-mysql, 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), adduser, mysql-client, postgrey, sudo
Recommends: apache2
Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4), alternc
Provides: alternc
Replaces: alternc
Suggests: alternc-awstats, alternc-mailman, alternc-changepass, pop-before-smtp, magpierss, zip, ncompress, bzip2
Suggests: alternc-awstats, alternc-mailman, alternc-changepass, amavisd-new, clamav-daemon, spamassassin, pop-before-smtp, magpierss, zip, ncompress, bzip2
Description: hosting software managment suite for Debian, frontend web node
Hosting software suite based on Valentin Lacambre's altern.org French hosting
service. It uses Apache, Postfix, Sympa, MySQL and PHP to allow a web-based

72
debian/po/fr.po vendored
View File

@ -14,15 +14,15 @@
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"
"Report-Msgid-Bugs-To: alternc@packages.debian.org\n"
"POT-Creation-Date: 2011-06-04 10:33+0200\n"
"PO-Revision-Date: 2006-04-26 11:16+0200\n"
"Last-Translator: Benjamin Sonntag <benjamin@sonntag.fr>\n"
"Language-Team: Team AlternC <team@alternc.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: \n"
#. Type: boolean
#. Description
@ -247,7 +247,7 @@ msgstr ""
#. Description
#: ../templates:10001
msgid "The server to GRANT permissions to:"
msgstr ""
msgstr "Le serveur SQL à qui autoriser les permissions:"
#. Type: string
#. Description
@ -262,8 +262,8 @@ msgstr ""
#. Type: select
#. Description
#: ../templates:11001
msgid "The way backup rotation is executated"
msgstr ""
msgid "The way backup rotation is executed"
msgstr "De quelle façon sont tournés les backups"
#. Type: select
#. Description
@ -271,7 +271,7 @@ msgstr ""
msgid ""
"AlternC enables users to configure their own backups, on demand, with "
"automatic rotation. This option determines how the backups are rotated."
msgstr ""
msgstr "AlternC permet aux utilisateurs de configurer leurs propres backups, à la demande, avec rotation automatique. Cette option détermine la manière dont les backups sont tournés."
#. Type: select
#. Description
@ -285,7 +285,7 @@ msgstr ""
#. Description
#: ../templates:12001
msgid "Behavior of the backup script when it encounters a unmanaged file"
msgstr ""
msgstr "Comportement du script de backup quand il rencontre un fichier non géré"
#. Type: select
#. Description
@ -295,6 +295,8 @@ msgid ""
"when doing backups. The default behavior is to skip those files and ignore "
"it."
msgstr ""
"Le script de backup SQL peut renommer ou écraser un fichier préexistant."
"Le comportement par défaut est de passer ces fichiers et de les ignorer."
#. Type: string
#. Description
@ -317,7 +319,7 @@ msgstr ""
#. Description
#: ../templates:14001
msgid "The internal IP of this server:"
msgstr "l'adresse IP interne du serveur : "
msgstr "L'adresse IP interne du serveur : "
#. Type: string
#. Description
@ -356,12 +358,28 @@ msgstr ""
#. Type: string
#. Description
#: ../templates:16001
msgid "The default Backup MX to assign to new domains:"
msgstr "le MX de secours à assigner aux nouveaux domaines : "
#. Type: string
#. Description
#: ../templates:16001
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 va assigner ce nom de domaine comme enregistrement MX de secours pour tous les "
"domaines qu'il héberge. Si vous ne savez pas de quoi il s'agit, laissez ce champ vide."
#. Type: string
#. Description
#: ../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 +389,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 +411,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 +429,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 +447,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 +473,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 "

View File

@ -7,11 +7,12 @@
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"
"Report-Msgid-Bugs-To: alternc@packages.debian.org\n"
"POT-Creation-Date: 2011-06-04 10:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
@ -298,32 +299,46 @@ msgstr ""
#. Type: string
#. Description
#: ../templates:16001
msgid "The path where AlternC is installed:"
msgid "The default Backup MX to assign to new domains:"
msgstr ""
#. Type: string
#. Description
#: ../templates:16001
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 ""
#. Type: string
#. Description
#: ../templates:17001
msgid "The path where AlternC is installed:"
msgstr ""
#. Type: string
#. Description
#: ../templates:17001
msgid ""
"Please enter the partition name where alternc is installed. This is used "
"mainly for disk quotas."
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 +346,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 +361,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 +376,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 "

12
debian/templates vendored
View File

@ -92,7 +92,7 @@ _Description: The server to GRANT permissions to:
Template: alternc/sql/backup_type
Type: select
Choices: rotate, date
_Description: The way backup rotation is executated
_Description: The way backup rotation is executed
AlternC enables users to configure their own backups, on demand, with
automatic rotation. This option determines how the backups are rotated.
.
@ -125,8 +125,14 @@ _Description: The internal IP of this server:
Template: alternc/default_mx
Type: string
_Description: The default MX to assign to new domains:
AlternC will assign this hostname as the MX record for all the domains it
hosts. It is usually better be left alone.
AlternC will assign this hostname as the MX record for all
the domains it hosts. It is usually better be left alone.
Template: alternc/default_mx2
Type: string
_Description: The default Backup MX to assign to new domains:
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.
Template: alternc/alternc_location
Type: string

View File

@ -150,7 +150,6 @@ CREATE TABLE IF NOT EXISTS db (
CREATE TABLE IF NOT EXISTS domaines (
compte int(10) unsigned NOT NULL default '0',
domaine varchar(64) NOT NULL default '',
mx varchar(64) default NULL,
gesdns int(1) NOT NULL default '1',
gesmx int(1) NOT NULL default '1',
noerase tinyint(4) NOT NULL default '0',
@ -494,17 +493,18 @@ CREATE TABLE IF NOT EXISTS `domaines_type` (
PRIMARY KEY ( `name` )
) COMMENT = 'Type of domains allowed';
INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, only_dns, need_dns, advanced) values
('vhost','Locally hosted', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
('url','URL redirection', 'URL', '%SUB% IN A @@PUBLIC_IP@@','txt', true, true, false),
('ip','IPv4 redirect', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt,mx,mx2,defmx,defmx2', false, true, false),
('webmail', 'Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
('ipv6','IPv6 redirect', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt,mx,mx2,defmx,defmx2',true, true, true ),
('cname', 'CNAME DNS entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt,mx,mx2,defmx,defmx2',true, true, true ),
('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2,defmx,defmx2',true, true, true),
('mx', 'MX DNS entry', 'DOMAIN', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true),
('mx2', 'secondary MX DNS entry', 'DOMAIN', '%SUB% IN MX 10 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true),
('defmx', 'Default mail server', 'NONE', '%SUB% IN MX 5 @@DEFAULT_MX@@', 'vhost,url,ip,webmail,ipv6,cname,txt,defmx2',true, false, true),
('defmx2', 'Default backup mail server', 'DOMAIN', '%SUB% IN MX 10 @@DEFAULT_SECONDARY_MX@@', 'vhost,url,ip,webmail,ipv6,cname,txt,defmx',true, false, true),
('panel', 'AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true)
INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, only_dns, need_dns, advanced, enable) values
('vhost','Locally hosted', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false, 'ALL'),
('url','URL redirection', 'URL', '%SUB% IN A @@PUBLIC_IP@@','txt', true, true, false, 'ALL'),
('ip','IPv4 redirect', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt,mx,mx2,defmx,defmx2', false, true, false, 'ALL'),
('webmail', 'Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false, 'ALL'),
('ipv6','IPv6 redirect', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt,mx,mx2,defmx,defmx2',true, true, true , 'ALL'),
('cname', 'CNAME DNS entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt,mx,mx2,defmx,defmx2',true, true, true , 'ALL'),
('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2,defmx,defmx2',true, true, true, 'ALL'),
('mx', 'MX DNS entry', 'DOMAIN', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true, 'ALL'),
('mx2', 'secondary MX DNS entry', 'DOMAIN', '%SUB% IN MX 10 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true, 'ALL'),
('defmx', 'Default mail server', 'NONE', '%SUB% IN MX 5 @@DEFAULT_MX@@', 'vhost,url,ip,webmail,ipv6,cname,txt,defmx2',true, false, true, 'ADMIN'),
('defmx2', 'Default backup mail server', 'DOMAIN', '%SUB% IN MX 10 @@DEFAULT_SECONDARY_MX@@', 'vhost,url,ip,webmail,ipv6,cname,txt,defmx',true, false, true, 'ADMIN'),
('panel', 'AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true, 'ALL')
;

View File

@ -19,36 +19,39 @@ CREATE TABLE IF NOT EXISTS `domaines_type` (
PRIMARY KEY ( `name` )
) COMMENT = 'Type of domains allowed';
INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, only_dns, need_dns, advanced) values
('vhost','Locally hosted', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
('url','URL redirection', 'URL', '%SUB% IN A @@PUBLIC_IP@@','txt', true, true, false),
('ip','IPv4 redirect', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt,mx,mx2,defmx,defmx2', false, true, false),
('webmail', 'Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false),
('ipv6','IPv6 redirect', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt,mx,mx2,defmx,defmx2',true, true, true ),
('cname', 'CNAME DNS entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt,mx,mx2,defmx,defmx2',true, true, true ),
('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2,defmx,defmx2',true, true, true),
('mx', 'MX DNS entry', 'DOMAIN', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true),
('mx2', 'secondary MX DNS entry', 'DOMAIN', '%SUB% IN MX 10 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true),
('defmx', 'Default mail server', 'NONE', '%SUB% IN MX 5 @@DEFAULT_MX@@', 'vhost,url,ip,webmail,ipv6,cname,txt,defmx2',true, false, true),
('defmx2', 'Default backup mail server', 'DOMAIN', '%SUB% IN MX 10 @@DEFAULT_SECONDARY_MX@@', 'vhost,url,ip,webmail,ipv6,cname,txt,defmx',true, false, true),
('panel', 'AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true)
INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, only_dns, need_dns, advanced, enable) values
('vhost','Locally hosted', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false, 'ALL'),
('url','URL redirection', 'URL', '%SUB% IN A @@PUBLIC_IP@@','txt', true, true, false, 'ALL'),
('ip','IPv4 redirect', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt,mx,mx2,defmx,defmx2', false, true, false, 'ALL'),
('webmail', 'Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', false, false, false, 'ALL'),
('ipv6','IPv6 redirect', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt,mx,mx2,defmx,defmx2',true, true, true , 'ALL'),
('cname', 'CNAME DNS entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt,mx,mx2,defmx,defmx2',true, true, true , 'ALL'),
('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2,defmx,defmx2',true, true, true, 'ALL'),
('mx', 'MX DNS entry', 'DOMAIN', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true, 'ALL'),
('mx2', 'secondary MX DNS entry', 'DOMAIN', '%SUB% IN MX 10 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true, 'ALL'),
('defmx', 'Default mail server', 'NONE', '%SUB% IN MX 5 @@DEFAULT_MX@@', 'vhost,url,ip,webmail,ipv6,cname,txt,defmx2',true, false, true, 'ADMIN'),
('defmx2', 'Default backup mail server', 'DOMAIN', '%SUB% IN MX 10 @@DEFAULT_SECONDARY_MX@@', 'vhost,url,ip,webmail,ipv6,cname,txt,defmx',true, false, true, 'ADMIN'),
('panel', 'AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',true, false, true, 'ALL')
;
-- Changing standby use
alter table domaines add column dns_action enum ('OK','UPDATE','DELETE') NOT NULL default 'UPDATE';
alter table domaines add column dns_result varchar(255) not null default '';
alter table sub_domaines add column web_action enum ('OK','UPDATE','DELETE') NOT NULL default 'UPDATE';
alter table sub_domaines add column web_result varchar(255) not null default '';
alter table sub_domaines add column enable enum ('ENABLED', 'ENABLE', 'DISABLED', 'DISABLE') NOT NULL DEFAULT 'ENABLED';
drop table sub_domaines_standby;
drop table domaines_standby;
ALTER TABLE domaines ADD COLUMN dns_action enum ('OK','UPDATE','DELETE') NOT NULL default 'UPDATE';
ALTER TABLE domaines ADD COLUMN dns_result varchar(255) not null default '';
ALTER TABLE sub_domaines ADD COLUMN web_action enum ('OK','UPDATE','DELETE') NOT NULL default 'UPDATE';
ALTER TABLE sub_domaines ADD COLUMN web_result varchar(255) not null default '';
ALTER TABLE sub_domaines ADD COLUMN enable enum ('ENABLED', 'ENABLE', 'DISABLED', 'DISABLE') NOT NULL DEFAULT 'ENABLED';
DROP TABLE sub_domaines_standby;
DROP TABLE domaines_standby;
update sub_domaines set type='VHOST' where type='0'; -- We decide to drop massvhost.
update sub_domaines set type='URL' where type='1';
update sub_domaines set type='IP' where type='2';
update sub_domaines set type='WEBMAIL' where type='3';
update sub_domaines set type='IPV6' where type='4';
update sub_domaines set type='CNAME' where type='5';
update sub_domaines set type='TXT' where type='6';
update sub_domaines set web_action='UPDATE';
UPDATE sub_domaines SET type='VHOST' WHERE type='0'; -- We decide to drop massvhost.
UPDATE sub_domaines SET type='URL' WHERE type='1';
UPDATE sub_domaines SET type='IP' WHERE type='2';
UPDATE sub_domaines SET type='WEBMAIL' WHERE type='3';
UPDATE sub_domaines SET type='IPV6' WHERE type='4';
UPDATE sub_domaines SET type='CNAME' WHERE type='5';
UPDATE sub_domaines SET type='TXT' WHERE type='6';
UPDATE sub_domaines SET web_action='UPDATE';
-- not needed : it's now a subdomain with defmx and/or defmx2 type (this type is admin-only) :
ALTER TABLE `domaines` DROP `mx` ;