Changeset 2913

Timestamp:

03/28/11 10:04:18 (2 years ago)

Author:

benjamin

Message:

• remember 'empty' value when the user answer empty value in templates
• changelog
• MX is a DNS field, not an IP field !
• don't ask for mysql password if we already got it
• code cleanup
• added "secondary MX DNS entry" domain type

Location:

alternc/trunk

Files:

• bureau/locales/fr_FR/LC_MESSAGES/manual.po (modified) (1 diff)
• debian/alternc.postinst (modified) (2 diffs)
• debian/changelog (modified) (9 diffs)
• install/mysql.sh (modified) (1 diff)
• install/mysql.sql (modified) (1 diff)
• install/upgrades/1.0.sql (modified) (1 diff)

alternc/trunk/bureau/locales/fr_FR/LC_MESSAGES/manual.po

@@ -835 +835 @@
 msgstr "Entrée DNS MX"
 
+msgid "secondary MX DNS entry"
+msgstr "Entrée DNS MX secondaire"
+

alternc/trunk/debian/alternc.postinst

@@ -14 +14 @@
     var="$2"
     db_get "$question"
-    if [ ! -z "$RET" ]; then
-        grep -Eq "^ *$var=" $CONFIGFILE || echo "$var=" >> $CONFIGFILE
-        SED_SCRIPT="$SED_SCRIPT;s\\^ *$var=.*\\$var=\"$RET\"\\"
-    fi
+
+    grep -Eq "^ *$var=" $CONFIGFILE || echo "$var=" >> $CONFIGFILE
+    SED_SCRIPT="$SED_SCRIPT;s\\^ *$var=.*\\$var=\"$RET\"\\"
 }
 
@@ -146 +145 @@
         . /usr/share/alternc/install/mysql.sh
     fi
-
-# We don't force seen or reset the data : this will allow preseeding
-#    db_reset alternc/mysql/password || true
-#    db_fset alternc/mysql/password "seen" "false" || true
 
     if [ -e $CONFIGFILE ]; then

alternc/trunk/debian/changelog

@@ -3 +3 @@
     * Web & DNS file generation rebuild from scratch
     * Drop of apache 1 support
-    * Big changes in database schema (domaines, sub_domaines, *_standby)
+    * Big changes in database schema (domaines, sub_domaines, *_standby removal)
   * Major changes
     * Drop mass virtual hosting, now use full vhost
-    * Panel URL do not need anymore /admin/ (but you can still use it)
+    * Panel URL do not need anymore /admin/ (but you can still use it, we put a 301 redirect)
+    * JQuery is now used by AlternC (but not needed for any usual feature usage)
   * New features
     * Domains type are dynamic, the administrator can create domaine type with his own apache template
     * Advanced DNS options (ipv6, cname, txt, mx)
-    * Possibility to create a temporary mail
+    * 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
   * Bugfixes
-    * Too many to be listed (we change the update_domaines.sh)
+    * 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
 
@@ -24 +28 @@
     * Sanitizing of get/request/post parameters using getFields function. May allow alternc not to use register_globals some day ...
   * security: passwords are now MANDATORY in MySQL class (whoosh...)
-  * security: now using htmlspecialchars on every form default values ... yes it's 2010 ;) 
+  * security: now using htmlspecialchars on every form default values ... yes it's 2010 ;)
   * i18n: charset is now variable depending on the current language
   * new features:
@@ -33 +37 @@
     * #1163: fix sqlbackup script call routine to retain backwards
       compatibility
-    * fix usage of ISO8859-15 charset (that may NOT be defined in locales...) 
+    * fix usage of ISO8859-15 charset (that may NOT be defined in locales...)
       and add it to the correct url (%%fqdn_lettre%%...)
   * major changes:
@@ -44 +48 @@
     * send an email on new account creation. the actual email needs to be
       configured through the AlternC variables for this to work.
-    * added the password policy management module : you can choose which 
+    * added the password policy management module : you can choose which
       password complexity you want to force for each place a password is required.
   * API changes
@@ -145 +149 @@
   * fix proftpd and saslauthd configuration for Etch (#1046, #1069)
   * fix .eu, .be, .name whois issue (#571)
-  * change apache log format to a working one (using host request), also fix awstats issues. 
+  * change apache log format to a working one (using host request), also fix awstats issues.
   * fix modules manipulation rules (#1062)
   * try to support apache2, at least with the right dependencies
@@ -185 +189 @@
   * Fix mail accounts creation. Closes: #1003.
   * Fix a race condition in update_domains.sh which could allow users to
-    bypass openbasedir protection when creating domains. Reported by 
+    bypass openbasedir protection when creating domains. Reported by
     Jerome Moinet.
 
@@ -223 +227 @@
   * see https://dev.alternc.org/trac/alternc/milestone/0.9.4 for milestone
   * changelog at https://dev.alternc.org/trac/alternc/query?status=closed&milestone=0.9.4
-  However, this version contains mainly : 
+  However, this version contains mainly :
   * Integration of Globenet patchs (replacement of do_domains.sh by update_domains.sh and others)
   * Changing mysql database creation from uid to login name
@@ -264 +268 @@
 alternc (0.9.3.9-globenet8) unstable; urgency=low
 
-  * Finally fix empty host handling in update_domains.sh. 
+  * Finally fix empty host handling in update_domains.sh.
 
  -- Lunar <lunar@anargeek.net>  Wed, 21 Sep 2005 23:45:06 +0200
@@ -372 +376 @@
 
  -- Benjamin Sonntag <benjamin@alternc.org>  Tue, 27 Aug 2002 19:31:26 +0200
-
-
-
-        

alternc/trunk/install/mysql.sh

@@ -46 +46 @@
 # The grant all is the most important right needed in this script.
 echo "Granting users..."
-# cat <<EOF
-# host: $host
-# user: $user
-# password: $password
-# database: $database
-# EOF
 
 MYSQL_CONFIG="/etc/alternc/my.cnf"

alternc/trunk/install/mysql.sql

@@ -498 +498 @@
 ('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', false, true, false),
+('ip','IPv4 redirect', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt,mx,mx2', 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',true, true, true ),
+('ipv6','IPv6 redirect', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt,mx,mx2',true, true, true ),
 ('cname', 'CNAME DNS entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt',true, true, true ),
-('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx',true, true, true),
-('mx', 'MX DNS entry', 'IP', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx',true, false, true),
-('panel', 'AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, true)
+('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',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,mx2',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)
 ;

alternc/trunk/install/upgrades/1.0.sql

@@ -23 +23 @@
 ('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', false, true, false),
+('ip','IPv4 redirect', 'IP', '%SUB% IN A %TARGET%','url,ip,ipv6,txt,mx,mx2', 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',true, true, true ),
+('ipv6','IPv6 redirect', 'IPV6', '%SUB% IN AAAA %TARGET%','ip,ipv6,webmail,txt,mx,mx2',true, true, true ),
 ('cname', 'CNAME DNS entry', 'DOMAIN', '%SUB% CNAME %TARGET%', 'txt',true, true, true ),
-('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx',true, true, true),
-('mx', 'MX DNS entry', 'IP', '%SUB% IN MX 5 %TARGET%', 'vhost,url,ip,webmail,ipv6,cname,txt,mx',true, false, true),
-('panel', 'AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,ip,webmail,ipv6,cname,txt',true, false, true)
+('txt', 'TXT DNS entry', 'TXT', '%SUB% IN TXT "%TARGET%"','vhost,url,ip,webmail,ipv6,cname,txt,mx,mx2',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,mx2',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)
 ;