/[gentoo-x86]/eclass/apache-2.eclass
Gentoo

Diff of /eclass/apache-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.27 Revision 1.29
1# Copyright 1999-2012 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.27 2012/03/05 08:20:52 patrick Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.29 2012/05/23 03:24:44 flameeyes Exp $
4 4
5# @ECLASS: apache-2.eclass 5# @ECLASS: apache-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# apache-devs@gentoo.org 7# apache-devs@gentoo.org
8# @BLURB: Provides a common set of functions for apache-2.x ebuilds 8# @BLURB: Provides a common set of functions for apache-2.x ebuilds
465# @FUNCTION: apache-2_src_install 465# @FUNCTION: apache-2_src_install
466# @DESCRIPTION: 466# @DESCRIPTION:
467# This function runs `emake install' and generates, installs and adapts the gentoo 467# This function runs `emake install' and generates, installs and adapts the gentoo
468# specific configuration files found in the tarball 468# specific configuration files found in the tarball
469apache-2_src_install() { 469apache-2_src_install() {
470 make DESTDIR="${D}" install || die "make install failed" 470 emake DESTDIR="${D}" MKINSTALLDIRS="mkdir -p" install || die "make install failed"
471 471
472 # install our configuration files 472 # install our configuration files
473 keepdir /etc/apache2/vhosts.d 473 keepdir /etc/apache2/vhosts.d
474 keepdir /etc/apache2/modules.d 474 keepdir /etc/apache2/modules.d
475 475
537 537
538 # empty dirs 538 # empty dirs
539 for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do 539 for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
540 keepdir ${i} 540 keepdir ${i}
541 fowners apache:apache ${i} 541 fowners apache:apache ${i}
542 fperms 0755 ${i} 542 fperms 0750 ${i}
543 done 543 done
544} 544}
545 545
546# @FUNCTION: apache-2_pkg_postinst 546# @FUNCTION: apache-2_pkg_postinst
547# @DESCRIPTION: 547# @DESCRIPTION:
548# This function creates test certificates if SSL is enabled and installs the 548# This function creates test certificates if SSL is enabled and installs the
549# default index.html to /var/www/localhost if it does not exist. We do this here 549# default index.html to /var/www/localhost if it does not exist. We do this here
550# because the default webroot is a copy of the files that exist elsewhere and we 550# because the default webroot is a copy of the files that exist elsewhere and we
551# don't want them to be managed/removed by portage when apache is upgraded. 551# don't want them to be managed/removed by portage when apache is upgraded.
552apache-2_pkg_postinst() { 552apache-2_pkg_postinst() {
553 # fix previously wrong set permissions Bug#398899
554 einfo "Sanitizing directory permissions ..."
555 for i in /var/lib/dav /var/log/apache2 /var/cache/apache2 ; do
556 chmod 0750 ${i}
557 done
558
553 if use ssl && [[ ! -e "${ROOT}/etc/ssl/apache2/server.pem" ]]; then 559 if use ssl && [[ ! -e "${ROOT}/etc/ssl/apache2/server.pem" ]]; then
554 SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}" 560 SSL_ORGANIZATION="${SSL_ORGANIZATION:-Apache HTTP Server}"
555 install_cert /etc/ssl/apache2/server 561 install_cert /etc/ssl/apache2/server
556 ewarn 562 ewarn
557 ewarn "The location of SSL certificates has changed. If you are" 563 ewarn "The location of SSL certificates has changed. If you are"

Legend:
Removed from v.1.27  
changed lines
  Added in v.1.29

  ViewVC Help
Powered by ViewVC 1.1.20