revert back to r2306: stay with only two packages for now, which should unbreak the main alternc package

.gitattributes

@@ -245,23 +245,23 @@ bureau/locales/manual.pot -text
 bureau/locales/messages.pot -text
 bureau/locales/pt_BR/LC_MESSAGES/messages.po -text
 debian/README.Debian -text
-debian/alternc-bureau.install -text
+debian/alternc-slave.dirs -text
-debian/alternc-misc.cron.d -text
+debian/alternc-slave.install -text
-debian/alternc-misc.dirs -text
+debian/alternc-slave.links -text
-debian/alternc-misc.links -text
+debian/alternc-slave.lintian -text
-debian/alternc-misc.postinst -text
+debian/alternc-slave.logrotate -text
-debian/alternc-misc.postrm -text
+debian/alternc-slave.postinst -text
-debian/alternc-misc.preinst -text
+debian/alternc-slave.postrm -text
-debian/alternc-misc.prerm -text
+debian/alternc-slave.prerm -text
-debian/alternc-node.dirs -text
+debian/alternc.cron.d -text
-debian/alternc-node.install -text
+debian/alternc.dirs -text
-debian/alternc-node.links -text
+debian/alternc.links -text
-debian/alternc-node.lintian -text
+debian/alternc.lintian -text
-debian/alternc-node.logrotate -text
+debian/alternc.logrotate -text
-debian/alternc-node.postinst -text
+debian/alternc.postinst -text
-debian/alternc-node.postrm -text
+debian/alternc.postrm -text
-debian/alternc-node.prerm -text
+debian/alternc.preinst -text
-debian/alternc.install -text
+debian/alternc.prerm -text
 debian/changelog -text
 debian/compat -text
 debian/config -text

debian/alternc-bureau.install

@@ -1 +0,0 @@
-var/alternc/bureau/*

debian/alternc-misc.postinst

@@ -1,88 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-CONFIGFILE="/etc/alternc/local.sh"
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-  configure)
-
-    if [ -e $CONFIGFILE ]; then
-      # source local.sh variables
-      . $CONFIGFILE
-    fi
-
-    # /var/alternc/dns/d/www.example.com
-    FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"
-    if [ "$FQDN_LETTER" = "$FQDN" ]
-    then
-           FQDN_LETTER="_"
-    fi
-
-    # Erase all apacheconf file
-    # They will be regenerated without the bug by upgrade_check.sh below.
-    if dpkg --compare-versions "$2" le "0.9.3.9-globenet14"; then
-        rm -f /var/alternc/apacheconf/*/*
-        rm -f /var/alternc/apacheconf/override_php.conf
-    fi
-
-    # Add access to the management panel
-    ln -nsf /var/alternc/bureau /var/alternc/dns/$FQDN_LETTER/$FQDN
-
-    # Bind stuff
-    touch /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
-    chown root:bind /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
-    chmod 640 /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
-    touch /var/run/alternc/refresh_slave
-    /usr/lib/alternc/slave_dns
-    # Apache will not start without this file
-    touch /var/alternc/apacheconf/override_php.conf
-
-    # Update l18n files
-    /usr/share/alternc/install/dopo.sh
-
-    # Add basedir protection
-    /usr/lib/alternc/basedir_prot.sh
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-# vim: et sw=4

debian/alternc.dirs

@@ -1,3 +1,18 @@
+etc/alternc
+etc/alternc/templates
+etc/bind
+etc/bind/templates
+etc/courier
+etc/cron.d
+etc/phpmyadmin
+etc/postfix
+etc/squirrelmail
+usr/bin
+usr/lib/alternc
+usr/sbin
+usr/share/alternc/install
+usr/share/locale/fr/LC_MESSAGES
+usr/share/lintian/overrides/
 var/alternc/apacheconf
 var/alternc/apacheconf/_
 var/alternc/apacheconf/0
@@ -196,3 +211,6 @@ var/alternc/mail/z
 var/alternc/mla
 var/alternc/redir
 var/alternc/tmp
+var/backups/alternc
+var/log/alternc
+var/run/alternc

debian/alternc.lintian

@@ -0,0 +1,44 @@
+alternc: non-standard-dir-in-var var/alternc/
+alternc: non-standard-dir-in-var var/backups/
+alternc: file-in-unusual-dir
+alternc: possible-bashism-in-maintainer-script
+alternc: setuid-binary usr/lib/alternc/mail_add 4750 root/www-data
+alternc: setuid-binary usr/lib/alternc/mail_del 4750 root/www-data
+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: setuid-binary usr/lib/alternc/du.pl 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/basedir_prot.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/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: 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/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/mail_add 4750
+alternc: executable-is-not-world-readable usr/lib/alternc/mail_del 4750
+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/du.pl 4750
+alternc: executable-is-not-world-readable usr/lib/alternc/quota_init 0750 != 0755
+alternc: executable-is-not-world-readable usr/lib/alternc/basedir_prot.sh 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

debian/alternc.logrotate

@@ -0,0 +1,32 @@
+#
+# Logrotate.d script for AlternC
+# $Id: alternc.logrotate,v 1.1 2004/05/25 02:35:38 anonymous Exp $
+#
+
+/var/log/alternc/bureau.log {
+        monthly
+        missingok
+        create 0640 www-data www-data
+        rotate 12
+        compress
+        delaycompress
+}
+
+/var/log/alternc/domaines.log {
+        monthly
+        missingok
+        create 0640 root root
+        rotate 12
+        compress
+        delaycompress
+}
+
+/var/log/alternc/sub_domaines.log {
+        monthly
+        missingok
+        create 0640 root root
+        rotate 12
+        compress
+        delaycompress
+}
+

debian/alternc.postinst

@@ -0,0 +1,255 @@
+#!/bin/sh
+
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+CONFIGFILE="/etc/alternc/local.sh"
+
+update_var() {
+    local question="$1"
+    local 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
+}
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+  configure)
+
+    # ajoute l'user postfix au groupe sasl
+    adduser --quiet postfix sasl
+
+    # corriger les permissions du chroot
+    mkdir -p /var/spool/postfix/var/run/saslauthd || true
+    dpkg-statoverride --quiet --update --add root sasl 710 /var/spool/postfix/var/run/saslauthd  || true
+
+    # build local.sh if it does not exist
+    if [ ! -f $CONFIGFILE ]; then
+        cat > $CONFIGFILE <<EOF
+#!/bin/sh
+#
+# AlternC - Web Hosting System - Configuration
+# This file will be modified on package configuration
+# (e.g. upgrade or dpkg-reconfigure alternc)
+
+# Hosting service name
+HOSTING=""
+
+# Primary hostname for this box (will be used to access the management panel)
+FQDN=""
+
+# Public IP
+PUBLIC_IP=""
+
+# Internal IP
+# (most of the time, should be equal to PUBLIC_IP, unless you are behind
+# firewall doing address translation)
+INTERNAL_IP=""
+
+# Monitoring IP or network (will be allowed to access Apache status)
+MONITOR_IP=""
+
+# Primary DNS hostname
+NS1_HOSTNAME=""
+
+# Secondary DNS hostname
+NS2_HOSTNAME=""
+
+# IP that have privilegied access to the DNS server. Separated by ';'.
+BIND_INTERNAL=""
+
+# Mail server hostname
+DEFAULT_MX=""
+
+# Note: MySQL username/password configuration now stored in /etc/alternc/my.cnf
+
+# quels clients mysql sont permis (%, localhost, etc)
+MYSQL_CLIENT=""
+
+# Folder holding data (used for quota management)
+ALTERNC_LOC=""
+
+# Networks that SMTP should relay, separated with spaces
+SMTP_RELAY_NETWORKS=""
+
+# the type of backup created by the sql backup script
+# valid options are "rotate" (newsyslog-style) or "date" (suffix is the date)
+SQLBACKUP_TYPE=""
+
+# overwrite existing files when backing up
+SQLBACKUP_OVERWRITE=""
+EOF
+
+        chown root:www-data $CONFIGFILE
+        chmod 640 $CONFIGFILE
+    fi
+
+    # Update local.sh
+    # 1. use cp to keep permissions
+    # 2. add missing variable to local.sh
+    # 3. use sed to set variables with current values
+    echo "Updating $CONFIGFILE"
+    cp -a -f $CONFIGFILE $CONFIGFILE.tmp
+    # SED_SCRIPT will be modified by update_var
+    SED_SCRIPT=""
+    update_var alternc/hostingname HOSTING
+    update_var alternc/desktopname FQDN 
+    update_var alternc/public_ip PUBLIC_IP
+    update_var alternc/internal_ip INTERNAL_IP
+    update_var alternc/monitor_ip MONITOR_IP
+    update_var alternc/ns1 NS1_HOSTNAME
+    update_var alternc/ns2 NS2_HOSTNAME
+    update_var alternc/bind_internal BIND_INTERNAL
+    update_var alternc/default_mx DEFAULT_MX 
+    update_var alternc/mysql/client MYSQL_CLIENT 
+    update_var alternc/sql/backup_type SQLBACKUP_TYPE
+    update_var alternc/sql/backup_overwrite SQLBACKUP_OVERWRITE
+    update_var alternc/alternc_location ALTERNC_LOC
+    update_var alternc/mynetwork SMTP_RELAY_NETWORKS
+    sed -e "$SED_SCRIPT" < $CONFIGFILE > $CONFIGFILE.tmp
+    mv -f $CONFIGFILE.tmp $CONFIGFILE
+
+    # Setup grants
+    db_get "alternc/mysql/host"
+    MYSQL_HOST="$RET"
+    if [ "$MYSQL_HOST" != "localhost" -o -e /usr/sbin/mysqld ]; then
+        # compatibility shims with my.cnf
+        host="$RET"
+        db_get "alternc/mysql/db"
+        database="$RET"
+        db_get "alternc/mysql/user"
+        user="$RET"
+        db_get "alternc/mysql/password"
+        password="$RET"
+        
+        # we source (instead of forking) mysql.sh so that it gets the local environment above
+        . /usr/share/alternc/install/mysql.sh
+    fi
+
+    # forget the password
+    db_reset alternc/mysql/password || true
+    db_fset alternc/mysql/password "seen" "false" || true
+
+    if [ -e $CONFIGFILE ]; then
+      # source local.sh variables
+      . $CONFIGFILE
+    fi
+
+    # /var/alternc/dns/d/www.example.com
+    FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"
+    if [ "$FQDN_LETTER" = "$FQDN" ]
+    then
+           FQDN_LETTER="_"
+    fi
+
+    # Erase all apacheconf file
+    # They will be regenerated without the bug by upgrade_check.sh below.
+    if dpkg --compare-versions "$2" le "0.9.3.9-globenet14"; then
+        rm -f /var/alternc/apacheconf/*/*
+        rm -f /var/alternc/apacheconf/override_php.conf
+    fi
+
+    echo "checking for upgrades"
+    /usr/share/alternc/install/upgrade_check.sh $2
+
+    echo "config phpmyadmin"
+    include_str='include("/etc/alternc/phpmyadmin.inc.php")'
+    pma_config=/etc/phpmyadmin/config.inc.php
+    if ! grep -e "$include_str" $pma_config > /dev/null 2>&1; then
+        echo "<?php $include_str ?>" >> $pma_config
+    fi
+
+    # Add access to the management panel
+    ln -nsf /var/alternc/bureau /var/alternc/dns/$FQDN_LETTER/$FQDN
+
+    # Bind stuff
+    touch /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
+    chown root:bind /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
+    chmod 640 /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf
+    touch /var/run/alternc/refresh_slave
+    /usr/lib/alternc/slave_dns
+    # Apache will not start without this file
+    touch /var/alternc/apacheconf/override_php.conf
+
+    # Update l18n files
+    /usr/share/alternc/install/dopo.sh
+
+    # important: postinst gele sans ca
+    db_stop
+
+    echo "running alternc.install"
+    alternc.install
+
+    # Add basedir protection
+    /usr/lib/alternc/basedir_prot.sh
+
+    if [ -x /usr/sbin/apache ]; then
+        if [ ! -h /etc/apache-ssl/conf.d/alternc.conf ]; then
+            ln -sf /etc/alternc/apache-ssl.conf \
+                /etc/apache-ssl/conf.d/alternc.conf
+        fi
+
+        if [ ! -h /etc/apache/conf.d/alternc.conf ]; then
+            ln -sf /etc/alternc/apache.conf \
+                /etc/apache/conf.d/alternc.conf
+        fi
+
+        if [ ! -h /etc/apache/conf.d/override_php.conf ]; then
+            ln -sf /var/alternc/apacheconf/override_php.conf \
+                /etc/apache/conf.d/override_php.conf
+        fi
+    fi
+    if [ -x /usr/sbin/apache2 ]; then
+        if [ ! -h /etc/apache2/conf.d/alternc.conf ]; then
+            ln -sf /etc/alternc/apache.conf \
+                /etc/apache/conf.d/alternc.conf
+        fi
+        if [ ! -h /etc/apache2/conf.d/override_php.conf ]; then
+            ln -sf /var/alternc/apacheconf/override_php.conf \
+                /etc/apache/conf.d/override_php.conf
+        fi
+
+    fi 
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+# vim: et sw=4

debian/alternc.postrm

@@ -15,6 +15,9 @@ set -e
 
 case "$1" in
   purge)
+    rm -f /etc/alternc/local.sh /etc/alternc/my.cnf /etc/alternc/bureau.conf
+    rm -f /var/backups/alternc/etc-installed.tar.gz
+
     # Purge database?
     db_input high alternc/postrm_remove_databases || true
     db_go
@@ -28,7 +31,7 @@ case "$1" in
     db_go
     db_get alternc/postrm_remove_datafiles || true
     if [ "$RET" = "true" ]; then
-      rm -rf /var/alternc/dns /var/alternc/html /var/alternc/redir
+      rm -rf /var/backups/alternc /var/alternc/dns /var/alternc/html /var/alternc/redir
     fi
 
     # Purge bind zones
@@ -48,6 +51,7 @@ case "$1" in
     fi
 
     rm -rf /var/alternc/apacheconf /var/alternc/cgi-bin /var/alternc/bureau /var/alternc/exec.usr /var/alternc/mla /var/alternc/redir /var/alternc/tmp /var/log/alternc
+    rm -f /etc/apache/conf.d/override_php.conf /etc/apache/conf.d/alternc-ssl.conf /etc/apache/conf.d/alternc.conf
     ;;
   remove|upgrade|failed-upgrade|abort-install|abort-upgrade)
     ;;

debian/alternc.prerm

@@ -5,6 +5,9 @@
 
 case "$1" in
 remove)
+    # remove postfix from the sasl group (might not be user will though...)
+    deluser --quiet postfix sasl || true
+
     . /etc/alternc/local.sh
 
     FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"

debian/changelog

@@ -17,10 +17,8 @@ alternc (0.9.9) stable; urgency=low
     * #1131: allow admins to make all list URLs be based on the FQDN
     * #1087: allow admins to create user subdomains according to hardcoded
       value or available domains
-    * split alternc in multiple debian packages:
+    * make a new alternc-slave package that eases installation on NFS-backed
-      * alternc-bureau: the /var/alternc/bureau files
+      frontend nodes
-      * alternc-node: everything but the /var/alternc directory and cronjobs
-      * alternc-misc: the backend scripts and everything else
 
  -- Antoine Beaupré <anarcat@koumbit.org>  Tue, 15 Apr 2008 11:52:56 -0400
 

debian/control

@@ -10,62 +10,8 @@ Standards-Version: 3.7.3
 Package: alternc
 Architecture: all
 Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-Depends: alternc-bureau, alternc-misc, alternc-node, debianutils (>= 1.13.1)
-Recommends: mysql-server
-Conflicts: alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4)
-Suggests: alternc-awstats, alternc-mailman, alternc-changepass, pop-before-smtp, magpierss
-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
- managment of services, such as web hosting, mail hosting, mailing lists,
- virtual hosts, and so on.
- .
- AlternC is mainly a PHP based administration interface and some conf files
- for the softwares used by it.
- .
- This is a meta package that installs the whole AlternC suite.
-Homepage: http://www.alternc.org/
-
-Package: alternc-bureau
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-Depends: debianutils (>= 1.13.1), php5-mysql | php4-mysql, wget, rsync, locales, wwwconfig-common, php5-cli | php4-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), mysql-client
-Recommends: alternc-node, alternc
-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
- managment of services, such as web hosting, mail hosting, mailing lists,
- virtual hosts, and so on.
- .
- AlternC is mainly a PHP based administration interface and some conf files
- for the softwares used by it.
- .
- This package distributes the PHP files that make up the web interface.
-Homepage: http://www.alternc.org/
-
-Package: alternc-misc
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-Depends: debianutils (>= 1.13.1), php5-mysql | php4-mysql, wget, rsync, quota, ca-certificates, locales, perl-suid, perl, php5-cli | php4-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), pdksh (>= 5.2.14-6), adduser, mysql-client
-Recommends: alternc-node
-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
- managment of services, such as web hosting, mail hosting, mailing lists,
- virtual hosts, and so on.
- .
- AlternC is mainly a PHP based administration interface and some conf files
- for the softwares used by it.
- .
- This package provides backend cronjobs and all the stuff that doesn't fit 
- in other packages.
-Homepage: http://www.alternc.org/
-
-Package: alternc-node
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0
 Depends: debianutils (>= 1.13.1), apache | apache2, libapache-mod-php5 | libapache2-mod-php5 | libapache-mod-php4 | libapache2-mod-php4, courier-ssl, courier-imap-ssl, courier-pop-ssl, php5-mysql | php4-mysql, phpmyadmin, postfix, proftpd-mysql, 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 | php4-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), pdksh (>= 5.2.14-6), adduser, mysql-client
-Recommends: libapache-mod-gzip, apache-ssl
+Recommends: libapache-mod-gzip, apache-ssl, mysql-server
 Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4)
 Provides: alternc-admintools
 Replaces: alternc-admintools
@@ -77,9 +23,29 @@ Description: hosting software managment suite for Debian
  virtual hosts, and so on.
  .
  AlternC is mainly a PHP based administration interface and some conf files
- for the softwares used by it.
+ for the softwares used by it. More information at http://www.alternc.org/
+Homepage: http://www.alternc.org/
+
+Package: alternc-slave
+Architecture: all
+Pre-depends: debconf (>= 0.5.00) | debconf-2.0
+Depends: debianutils (>= 1.13.1), apache | apache2, libapache-mod-php5 | libapache2-mod-php5 | libapache-mod-php4 | libapache2-mod-php4, courier-ssl, courier-imap-ssl, courier-pop-ssl, php5-mysql | php4-mysql, phpmyadmin, postfix, proftpd-mysql, 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 | php4-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), pdksh (>= 5.2.14-6), adduser, mysql-client
+Recommends: libapache-mod-gzip, apache-ssl
+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
+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
+ managment of services, such as web hosting, mail hosting, mailing lists,
+ virtual hosts, and so on.
+ .
+ AlternC is mainly a PHP based administration interface and some conf files
+ for the softwares used by it. More information at http://www.alternc.org/
  .
  This package is designed for frontend nodes in a load balancing setup, where
  the /var/alternc directory is not touched and managed over NFS.
 Homepage: http://www.alternc.org/
 
+

debian/rules

@@ -81,7 +81,8 @@ install: build
 	# Remove CVS directories
 	/usr/bin/find debian/alternc -depth -type d -name CVS -exec rm {} -rf \;
 	/usr/bin/find debian/alternc -depth -type d -name .svn -exec rm {} -rf \;
-	cp debian/alternc-node.lintian debian/alternc/usr/share/lintian/overrides/alternc-slavedns
+	cp debian/alternc.lintian debian/alternc/usr/share/lintian/overrides/alternc
+	cp debian/alternc-slave.lintian debian/alternc/usr/share/lintian/overrides/alternc-slavedns
 
 # This single target is used to build all the packages, all at once, or
 # one at a time. So keep in mind: any options passed to commands here will

debian/templates

@@ -1,4 +1,4 @@
-Template: alternc-node/welcomeconfirm
+Template: alternc/welcomeconfirm
 Type: boolean
 Default: true
 _Description: Do you REALLY want to install AlternC on this computer ?
@@ -11,7 +11,7 @@ _Description: Do you REALLY want to install AlternC on this computer ?
  .
  YOU HAVE BEEN WARNED.
 
-Template: alternc-node/desktopname
+Template: alternc/desktopname
 Type: string
 _Description: Fully qualified name of the desktop:
  Please enter the fully qualified name of your server. This will be the
@@ -20,13 +20,13 @@ _Description: Fully qualified name of the desktop:
  .
  The default should be ok if your machine is correctly configured.
 
-Template: alternc-node/hostingname
+Template: alternc/hostingname
 Type: string
 _Description: Name of your hosting service:
  Please enter the name of your hosting service. It may be your company's
  name or your personnal name or whatever you want to ...
 
-Template: alternc-node/ns1
+Template: alternc/ns1
 Type: string
 _Description: Name of the primary domain name server:
  Please enter the fully qualified name of your primary dns server. It can
@@ -35,7 +35,7 @@ _Description: Name of the primary domain name server:
  name server that keep in sync with your alternc's server(s). . The default
  value should be good in most case.
 
-Template: alternc-node/ns2
+Template: alternc/ns2
 Type: string
 _Description: Name of the secondary domain name server:
  Please enter the fully qualified name of your secondary dns server. It can
@@ -46,7 +46,7 @@ _Description: Name of the secondary domain name server:
  You may contact the AlternC's users mailing list if you want to exchange
  dns service with other AlternC's users.
 
-Template: alternc-node/mysql/host
+Template: alternc/mysql/host
 Type: string
 _Description: Name of the mysql server:
  Please enter the fully qualified name of your mysql server host. On small
@@ -58,20 +58,20 @@ _Description: Name of the mysql server:
  "127.0.0.1" instead of "localhost" if your postfix installation is
  configured in a chroot (which is the case, by default).
 
-Template: alternc-node/mysql/db
+Template: alternc/mysql/db
 Type: string
 _Description: AlternC's mysql system database:
  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
  most case.
 
-Template: alternc-node/mysql/user
+Template: alternc/mysql/user
 Type: string
 _Description: AlternC's mysql account:
  AlternC will create a mysql administrator account. Please choose it's
  username here. The default value should be good in most case.
 
-Template: alternc-node/mysql/password
+Template: alternc/mysql/password
 Type: password
 _Description: Password of the AlternC's mysql account:
  AlternC requires an administrator account on the mysql server. It will be
@@ -81,7 +81,7 @@ _Description: Password of the AlternC's mysql account:
  Please choose a quite complex password since it will have full access to
  the system database !!!
 
-Template: alternc-node/mysql/client
+Template: alternc/mysql/client
 Type: string
 _Description: The server to GRANT permissions to:
  AlternC and MySQL can be installed on different servers. In order to have
@@ -89,7 +89,7 @@ _Description: The server to GRANT permissions to:
  to the hostname or IP the Apache server will appear as connecting from to
  the MySQL server.
 
-Template: alternc-node/sql/backup_type
+Template: alternc/sql/backup_type
 Type: select
 Choices: rotate, date
 _Description: The way backup rotation is executated
@@ -99,7 +99,7 @@ _Description: The way backup rotation is executated
  rotate - backup.sql, backup.sql.0, backup.sql.1
  date - backup.sql, backup.sql.20080709, backup.sql.20080708
 
-Template: alternc-node/sql/backup_overwrite
+Template: alternc/sql/backup_overwrite
 Type: select
 Choices: no, rename, overwrite
 _Description: Behavior of the backup script when it encounters a unmanaged file
@@ -107,13 +107,13 @@ _Description: Behavior of the backup script when it encounters a unmanaged file
  about when doing backups. The default behavior is to skip those files
  and ignore it.
 
-Template: alternc-node/public_ip
+Template: alternc/public_ip
 Type: string
 _Description: The primary IP of this server:
  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.
 
-Template: alternc-node/internal_ip
+Template: alternc/internal_ip
 Type: string
 _Description: The internal IP of this server:
  AlternC will configure Apache and other services to listen to this
@@ -122,13 +122,13 @@ _Description: The internal IP of this server:
  .
  In other words, this is the IP address of eth0.
 
-Template: alternc-node/default_mx
+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.
 
-Template: alternc-node/alternc_location
+Template: alternc/alternc_location
 Type: string
 _Description: The path where AlternC is installed:
  Please enter the partition name where alternc is installed. This is used
@@ -136,24 +136,24 @@ _Description: The path where AlternC is installed:
  .
  Warning : Be careful ! It can generate some problems.
 
-Template: alternc-node/monitor_ip
+Template: alternc/monitor_ip
 Type: string
 _Description: The monitoring server:
  The IP address (or ip/prefix) of the server(s) which must be authorized to 
  ping us and access apache status pages. Completely optional.
 
-Template: alternc-node/bind_internal
+Template: alternc/bind_internal
 Type: string
 _Description: trusted servers for bind:
  IP address or prefix of trusted machines for DNS transfers,
  delimited by ';', optional.
 
-Template: alternc-node/mynetwork
+Template: alternc/mynetwork
 Type: string
 _Description: SMTP authorized networks:
  IP addresses of the networks authorized in SMTP, space-delimited.
 
-Template: alternc-node/pop_before_smtp_warning
+Template: alternc/pop_before_smtp_warning
 Type: note
 _Description: POP Before SMTP deprecated
  AlternC doesn't automatically configure the pop-before-smtp package
@@ -167,22 +167,22 @@ _Description: POP Before SMTP deprecated
  hash:/var/lib/pop-before-smtp/hosts must also be added to the mynetworks
  directive of /etc/postfix/main.cf
 
-Template: alternc-node/postrm_remove_databases
+Template: alternc/postrm_remove_databases
 Type: boolean
 _Description: Should AlternC remove all databases (/var/lib/mysql/) ?
  All users databases will be trashed
 
-Template: alternc-node/postrm_remove_datafiles
+Template: alternc/postrm_remove_datafiles
 Type: boolean
 _Description: Should AlternC remove users datas ?
  The files and apache redirections created by users will be trashed
 
-Template: alternc-node/postrm_remove_bind
+Template: alternc/postrm_remove_bind
 Type: boolean
 _Description: Should AlternC remove bind zones ?
  It will delete all bind zones created by AlternC
 
-Template: alternc-node/postrm_remove_mailboxes
+Template: alternc/postrm_remove_mailboxes
 Type: boolean
 _Description: Should AlternC remove bind mailboxes ?
  If you accept all users e-mails will be deleted