first attempt at making alternc apache2-compatible
revert to manual configuration of modules.conf since apache-modconf doesn't really work move apache-ssl to recommends since it has no equivalent in the apache2 world
This commit is contained in:
parent
48fc717d1d
commit
d6cbfcb1ce
|
@ -9,8 +9,8 @@ Standards-Version: 3.7.2.1
|
|||
Package: alternc
|
||||
Architecture: all
|
||||
Pre-depends: debconf (>= 0.5.00) | debconf-2.0
|
||||
Depends: debianutils (>= 1.13.1), libapache-mod-php5 | libapache-mod-php4, apache, apache-ssl, courier-ssl, courier-imap-ssl, courier-pop-ssl, mysql-server, 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
|
||||
Recommends: libapache-mod-gzip
|
||||
Depends: debianutils (>= 1.13.1), libapache-mod-php5 | libapache2-mod-php5 | libapache-mod-php4 | libapache2-mod-php4, courier-ssl, courier-imap-ssl, courier-pop-ssl, mysql-server, 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
|
||||
Recommends: libapache-mod-gzip, apache-ssl
|
||||
Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4)
|
||||
Provides: alternc-admintools
|
||||
Replaces: alternc-admintools
|
||||
|
|
|
@ -180,11 +180,22 @@ touch /var/run/alternc/refresh_slave
|
|||
|
||||
# Apache will not start without this file
|
||||
touch /var/alternc/apacheconf/override_php.conf
|
||||
# Enable vhost_alias apache module at the right place (ie: BEFORE mod_alias, but apache knows this ... )
|
||||
# well, apache-modconf works like crap in a shell script ...
|
||||
apache-modconf apache enable mod_vhost_alias quiet </dev/null || true
|
||||
apache-modconf apache enable `dpkg -l libapache-mod-php*|grep ii | cut -f 3 -d ' '|cut -b 11-18|sed -e 's/-/_/'` quiet </dev/null|| true
|
||||
apache-modconf apache-ssl enable `dpkg -l libapache-mod-php*|grep ii | cut -f 3 -d ' '|cut -b 11-18|sed -e 's/-/_/'` quiet </dev/null|| true
|
||||
php=`dpkg -l libapache-mod-php* | grep ^ii | sed -e 's/^.*libapache.?-mod-php\(.\).*$/php\1/' | tail -1`
|
||||
if [ -x /usr/sbin/apache ]
|
||||
then
|
||||
# Enable vhost_alias apache module at the right place (ie: BEFORE mod_alias)
|
||||
if ! grep -q "vhost_alias_module" /etc/apache/modules.conf
|
||||
then
|
||||
sed -i -e 's/^\(LoadModule.*config_log.*\)$/LoadModule vhost_alias_module \/usr\/lib\/apache\/1.3\/mod_vhost_alias.so\n\1/' /etc/apache/modules.conf
|
||||
fi
|
||||
echo "LoadModule $php_module /usr/lib/apache/1.3/lib$php.so" | append_no_dupe /etc/apache/modules.conf
|
||||
echo "LoadModule $php_module /usr/lib/apache/1.3/lib$php.so" | append_no_dupe /etc/apache-ssl/modules.conf
|
||||
fi
|
||||
if [ -x /usr/sbin/apache2 ]
|
||||
then
|
||||
a2enmod vhost_alias
|
||||
a2enmod $php
|
||||
fi
|
||||
|
||||
# Copy postfix *_checks if they do not exist
|
||||
for file in body_checks header_checks; do
|
||||
|
|
Loading…
Reference in New Issue