Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

install: detect /etc/apache2/conf-available on debian with apache2.4

refs #4508
  • Loading branch information...
dnsmichi committed Aug 3, 2013
1 parent 69c420d commit df322c4792e186ab9cee1ef988deb5c1e1eae6cb
Showing with 8 additions and 2 deletions.
  1. +6 −0 Makefile.in
  2. +1 −1 configure
  3. +1 −1 configure.ac
@@ -206,10 +206,16 @@ install-javascript:
ln -sf $(DESTDIR)$(prefix)/lib/ext3 $(DESTDIR)$(prefix)/pub/js/ext3

install-apache-config:
$(INSTALL) -m 755 -d $(INSTALL_OPTS) $(DESTDIR)$(WEB_APACHE_PATH)
${INSTALL} -b -m 664 $(INSTALL_OPTS) etc/apache2/icinga-web.conf $(DESTDIR)$(WEB_APACHE_PATH)/icinga-web.conf
@printf "\nInstalled configuration in '%s'.\n" "$(WEB_APACHE_PATH)"
@printf "Please make sure that the directory is included or \n"
@printf "include %s/icinga-web.conf manually.\n" "$(WEB_APACHE_PATH)"

@if [ "$(WEB_APACHE_PATH)" = "/etc/apache2/conf-available" ]; then \
printf "Enable the configuration using 'a2enconf icinga-web'.\n"; \
fi

@printf "\nPlease restart your apache in order to complete this step.\n\n"

install-lib:
@@ -2330,7 +2330,7 @@ if test "${with_web_apache_path+set}" = set; then :
else
web_apache_path=
web_apache_path=/etc/apache2/conf.d
for x in /etc/httpd/conf.d /etc/apache2/conf.d /etc/apache/conf.d; do
for x in /etc/httpd/conf.d /etc/apache2/conf-available /etc/apache2/conf.d /etc/apache/conf.d; do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if path $x exists" >&5
$as_echo_n "checking if path $x exists... " >&6; }
if test -d $x; then :
@@ -94,7 +94,7 @@ AC_ARG_WITH([web_absolute_path],
AC_ARG_WITH([web_apache_path],
AS_HELP_STRING([--with-web-apache-path=PATH], [Include folder apache2 (default /etc/apache2/conf.d]),
web_apache_path=$withval,
web_apache_path=ACICINGA_PATH_GUESS([/etc/httpd/conf.d /etc/apache2/conf.d /etc/apache/conf.d], [web_apache_path], [/etc/apache2/conf.d])
web_apache_path=ACICINGA_PATH_GUESS([/etc/httpd/conf.d /etc/apache2/conf-available /etc/apache2/conf.d /etc/apache/conf.d], [web_apache_path], [/etc/apache2/conf.d])
)

AC_ARG_WITH([clearcache_path],

0 comments on commit df322c4

Please sign in to comment.
You can’t perform that action at this time.