wok rev 18960
apache: remove /etc/apache/ssl/httpd-ssl.conf symlink
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Mar 09 09:21:24 2016 +0100 (2016-03-09) |
parents | 12da1d122488 |
children | cd7c90022605 |
files | apache/receipt |
line diff
1.1 --- a/apache/receipt Wed Mar 09 08:59:01 2016 +0100 1.2 +++ b/apache/receipt Wed Mar 09 09:21:24 2016 +0100 1.3 @@ -36,7 +36,7 @@ 1.4 genpkg_rules() 1.5 { 1.6 mkdir -p $fs/usr/share/apache $fs/etc/init.d $fs/etc/apache/conf.d 1.7 - mkdir -p $fs/etc/ssl/apache $fs/etc/apache/ssl 1.8 + mkdir -p $fs/etc/ssl/apache 1.9 cp -a $install/usr/share/apache/icons $fs/usr/share/apache 1.10 cp -a $install/usr/share/apache/error $fs/usr/share/apache 1.11 cp -a $install/usr/share/apache/modules $fs/usr/share/apache 1.12 @@ -64,7 +64,6 @@ 1.13 # Unsafe, see CVE-2014-3566 POODLE 1.14 SSLProtocol All -SSLv2 -SSLv3 1.15 EOT 1.16 - ln -s ../extra/httpd-ssl.conf $fs/etc/apache/ssl/httpd-ssl.conf 1.17 } 1.18 1.19 # Pre and post install commands for Tazpkg. 1.20 @@ -86,7 +85,7 @@ 1.21 sed -i "s/localhost/$(hostname) localhost/" "$1/etc/hosts" 1.22 sed -i -e "s/^#\(LoadModule.*slotmem_shm.*\)$/\1/" \ 1.23 -e "s/.*ServerName www.example.*/ServerName ${hostname:-slitaz}/" \ 1.24 - $1/etc/apache/httpd.conf $1/etc/apache/ssl/httpd-ssl.conf 1.25 + $1/etc/apache/httpd.conf $1/etc/apache/extra/httpd-ssl.conf 1.26 grep -qs Apache $1/var/www/index.html && 1.27 sed -i 's|^LighTTPD.*|&\nApache configs : /etc/apache|' \ 1.28 $1/var/www/index.html