Changeset 1934

Show
Ignore:
Timestamp:
09/09/07 22:31:35 (1 year ago)
Author:
anarcat
Message:

try to reload apache2 too, install symlinks for apache2 if available

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • alternc/trunk/debian/postinst

    r1778 r1934  
    158158    alternc.install 
    159159 
    160     if [ ! -h /etc/apache-ssl/conf.d/alternc.conf ]; then 
    161         ln -sf /etc/alternc/apache-ssl.conf \ 
    162             /etc/apache-ssl/conf.d/alternc.conf 
    163     fi 
    164  
    165     if [ ! -h /etc/apache/conf.d/alternc.conf ]; then 
    166         ln -sf /etc/alternc/apache.conf \ 
    167             /etc/apache/conf.d/alternc.conf 
    168     fi 
    169  
    170     if [ ! -h /etc/apache/conf.d/override_php.conf ]; then 
    171         ln -sf /var/alternc/apacheconf/override_php.conf \ 
    172             /etc/apache/conf.d/override_php.conf 
    173     fi 
    174  
     160    if [ -x /usr/sbin/apache ]; then 
     161        if [ ! -h /etc/apache-ssl/conf.d/alternc.conf ]; then 
     162            ln -sf /etc/alternc/apache-ssl.conf \ 
     163                /etc/apache-ssl/conf.d/alternc.conf 
     164        fi 
     165 
     166        if [ ! -h /etc/apache/conf.d/alternc.conf ]; then 
     167            ln -sf /etc/alternc/apache.conf \ 
     168                /etc/apache/conf.d/alternc.conf 
     169        fi 
     170 
     171        if [ ! -h /etc/apache/conf.d/override_php.conf ]; then 
     172            ln -sf /var/alternc/apacheconf/override_php.conf \ 
     173                /etc/apache/conf.d/override_php.conf 
     174        fi 
     175    fi 
     176    if [ -x /usr/sbin/apache2 ]; then 
     177        if [ ! -h /etc/apache2/conf.d/alternc.conf ]; then 
     178            ln -sf /etc/alternc/apache.conf \ 
     179                /etc/apache/conf.d/alternc.conf 
     180        fi 
     181        if [ ! -h /etc/apache2/conf.d/override_php.conf ]; then 
     182            ln -sf /var/alternc/apacheconf/override_php.conf \ 
     183                /etc/apache/conf.d/override_php.conf 
     184        fi 
     185 
     186    fi  
    175187    ;; 
    176188 

  • alternc/trunk/install/alternc.install

    r1929 r1934  
    181181# Apache will not start without this file 
    182182touch /var/alternc/apacheconf/override_php.conf 
    183 php=`dpkg -l libapache-mod-php* | grep ^ii | sed -e 's/^.*libapache.\?-mod-php\(.\).*$/php\1/' | tail -1` 
     183php=`dpkg -l libapache*-mod-php* | grep ^ii | sed -e 's/^.*libapache.\?-mod-php\(.\).*$/php\1/' | tail -1` 
    184184if [ -x /usr/sbin/apache ] 
    185185then 
    …… 
    191191    echo "LoadModule $php_module /usr/lib/apache/1.3/lib$php.so" | append_no_dupe /etc/apache/modules.conf 
    192192    echo "LoadModule $php_module /usr/lib/apache/1.3/lib$php.so" | append_no_dupe /etc/apache-ssl/modules.conf 
     193    SERVICES="$SERVICES apache apache-ssl" 
    193194fi 
    194195if [ -x /usr/sbin/apache2 ] 
    …… 
    196197    a2enmod vhost_alias 
    197198    a2enmod $php 
     199    SERVICES="$SERVICES apache2" 
    198200fi 
    199201 
    …… 
    248250# Reload services 
    249251# 
    250 for service in apache apache-ssl postfix bind9 courier-authdaemon \ 
     252for service in $SERVICES postfix bind9 courier-authdaemon \ 
    251253               courier-imap courier-imap-ssl courier-pop courier-pop-ssl \ 
    252254               cron proftpd; do