Changeset 1926

Show
Ignore:
Timestamp:
09/09/07 21:17:45 (1 year ago)
Author:
anarcat
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • alternc/trunk/debian/control

    r1917 r1926  
    1010Architecture: all 
    1111Pre-depends: debconf (>= 0.5.00) | debconf-2.0 
    12 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 
    13 Recommends: libapache-mod-gzip 
     12Depends: 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 
     13Recommends: libapache-mod-gzip, apache-ssl 
    1414Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4) 
    1515Provides: alternc-admintools 

  • alternc/trunk/install/alternc.install

    r1923 r1926  
    181181# Apache will not start without this file 
    182182touch /var/alternc/apacheconf/override_php.conf 
    183 # Enable vhost_alias apache module at the right place (ie: BEFORE mod_alias, but apache knows this ... ) 
    184 # well, apache-modconf works like crap in a shell script ... 
    185 apache-modconf apache enable mod_vhost_alias quiet </dev/null || true 
    186 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 
    187 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 
     183php=`dpkg -l libapache-mod-php* | grep ^ii | sed -e 's/^.*libapache.?-mod-php\(.\).*$/php\1/' | tail -1` 
     184if [ -x /usr/sbin/apache ] 
     185then 
     186    # Enable vhost_alias apache module at the right place (ie: BEFORE mod_alias) 
     187    if ! grep -q "vhost_alias_module" /etc/apache/modules.conf 
     188    then 
     189        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 
     190    fi 
     191    echo "LoadModule $php_module /usr/lib/apache/1.3/lib$php.so" | append_no_dupe /etc/apache/modules.conf 
     192    echo "LoadModule $php_module /usr/lib/apache/1.3/lib$php.so" | append_no_dupe /etc/apache-ssl/modules.conf 
     193fi 
     194if [ -x /usr/sbin/apache2 ] 
     195then 
     196    a2enmod vhost_alias 
     197    a2enmod $php 
     198fi 
    188199 
    189200# Copy postfix *_checks if they do not exist