wok-next rev 15364
apache: keep httpd name
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Oct 03 16:27:18 2013 +0000 (2013-10-03) |
parents | 2a21689b0af7 |
children | bd6312b5bcda |
files | apache/receipt |
line diff
1.1 --- a/apache/receipt Thu Oct 03 09:52:57 2013 +0000 1.2 +++ b/apache/receipt Thu Oct 03 16:27:18 2013 +0000 1.3 @@ -26,7 +26,6 @@ 1.4 grep -q Slitaz config.layout || \ 1.5 cat $stuff/slitaz.layout >> config.layout 1.6 ./configure --mandir=/usr/share/man \ 1.7 - --with-program-name=apache \ 1.8 --enable-mods-shared=all \ 1.9 --enable-proxy \ 1.10 --enable-ssl \ 1.11 @@ -57,8 +56,8 @@ 1.12 -e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \ 1.13 -e 's|/etc/apache/server.crt|/etc/ssl/apache/apache.pem|' \ 1.14 -e 's|/etc/apache/server.key|/etc/ssl/apache/apache.pem|' \ 1.15 - $fs/etc/apache/apache.conf $fs/etc/apache/extra/httpd-ssl.conf 1.16 - echo "Include /etc/apache/conf.d" >> $fs/etc/apache/apache.conf 1.17 + $fs/etc/apache/httpd.conf $fs/etc/apache/extra/httpd-ssl.conf 1.18 + echo "Include /etc/apache/conf.d" >> $fs/etc/apache/httpd.conf 1.19 } 1.20 1.21 # Pre and post install commands for Tazpkg.