From dc9e2755b0835d83b9d09e6667e76a4e550e97a2 Mon Sep 17 00:00:00 2001 From: stan Date: Mon, 3 Jan 2011 23:27:58 +0000 Subject: [PATCH] Added sample apache config file. git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f --- Makefile.in | 1 + configure | 23 +++++++++++++++++++++- configure.ac | 12 +++++++++++- db/Makefile.in | 1 + scripts/Makefile.in | 1 + src/Makefile.in | 1 + web/Makefile.am | 3 +++ web/Makefile.in | 10 ++++++++-- web/ajax/Makefile.in | 1 + web/css/Makefile.in | 1 + web/graphics/Makefile.in | 1 + web/includes/Makefile.in | 1 + web/js/Makefile.in | 1 + web/lang/Makefile.in | 1 + web/skins/Makefile.in | 1 + web/skins/classic/Makefile.in | 1 + web/skins/classic/ajax/Makefile.in | 1 + web/skins/classic/css/Makefile.in | 1 + web/skins/classic/graphics/Makefile.in | 1 + web/skins/classic/includes/Makefile.in | 1 + web/skins/classic/js/Makefile.in | 1 + web/skins/classic/lang/Makefile.in | 1 + web/skins/classic/views/Makefile.in | 1 + web/skins/classic/views/css/Makefile.in | 1 + web/skins/classic/views/js/Makefile.in | 1 + web/skins/mobile/Makefile.in | 1 + web/skins/mobile/ajax/Makefile.in | 1 + web/skins/mobile/css/Makefile.in | 1 + web/skins/mobile/graphics/Makefile.in | 1 + web/skins/mobile/includes/Makefile.in | 1 + web/skins/mobile/lang/Makefile.in | 1 + web/skins/mobile/views/Makefile.in | 1 + web/skins/mobile/views/css/Makefile.in | 1 + web/skins/xml/Makefile.in | 1 + web/skins/xml/includes/Makefile.in | 1 + web/skins/xml/views/Makefile.in | 1 + web/tools/Makefile.in | 1 + web/tools/mootools/Makefile.in | 1 + web/views/Makefile.in | 1 + web/zmHttpd.conf.in | 26 +++++++++++++++++++++++++ 40 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 web/zmHttpd.conf.in diff --git a/Makefile.in b/Makefile.in index c8cd54ed0..01ad25c5d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -209,6 +209,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/configure b/configure index 53eb01671..8e68f068d 100755 --- a/configure +++ b/configure @@ -645,6 +645,7 @@ LDFLAGS CXXFLAGS CXX ENABLE_MMAP +WEB_HOST WEB_GROUP WEB_USER CGI_PREFIX @@ -737,6 +738,7 @@ with_webdir with_cgidir with_webuser with_webgroup +with_webhost enable_debug enable_crashtrace enable_mmap @@ -1392,6 +1394,7 @@ Optional Packages: --with-cgidir= prefix of cgi directory --with-webuser= name of web user, default apache --with-webgroup= name of web group, default apache + --with-webhost= name of web hostname, default zm.local Some influential environment variables: ZM_DB_HOST Hostname where ZoneMinder database located, default localhost @@ -3092,6 +3095,23 @@ fi +WEB_HOST=zm.local + +# Check whether --with-webhost was given. +if test "${with_webhost+set}" = set; then : + withval=$with_webhost; WEB_HOST=$with_webhost +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You can call configure with the --with-webhost option. + This tells configure what the host name is for name based virtual hosting. This is only used to populate the sample web/zmHttpd.conf file. + e.g. --with-webhost=zm.localdomain" >&5 +$as_echo "$as_me: WARNING: You can call configure with the --with-webhost option. + This tells configure what the host name is for name based virtual hosting. This is only used to populate the sample web/zmHttpd.conf file. + e.g. --with-webhost=zm.localdomain" >&2;} + +fi + + + ENABLE_DEBUG=yes # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then : @@ -9277,7 +9297,7 @@ fi -ac_config_files="$ac_config_files Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile" +ac_config_files="$ac_config_files Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile web/zmHttpd.conf" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -10057,6 +10077,7 @@ do "web/skins/xml/Makefile") CONFIG_FILES="$CONFIG_FILES web/skins/xml/Makefile" ;; "web/skins/xml/views/Makefile") CONFIG_FILES="$CONFIG_FILES web/skins/xml/views/Makefile" ;; "web/skins/xml/includes/Makefile") CONFIG_FILES="$CONFIG_FILES web/skins/xml/includes/Makefile" ;; + "web/zmHttpd.conf") CONFIG_FILES="$CONFIG_FILES web/zmHttpd.conf" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 0a35fcf05..b00d8c8e1 100644 --- a/configure.ac +++ b/configure.ac @@ -138,6 +138,16 @@ AC_ARG_WITH(webgroup, ) AC_SUBST(WEB_GROUP) +WEB_HOST=zm.local +AC_ARG_WITH(webhost, + [ --with-webhost= name of web hostname, default zm.local], + [WEB_HOST=$with_webhost], + AC_MSG_WARN([You can call configure with the --with-webhost option. + This tells configure what the host name is for name based virtual hosting. This is only used to populate the sample web/zmHttpd.conf file. + e.g. --with-webhost=zm.localdomain]) +) +AC_SUBST(WEB_HOST) + ENABLE_DEBUG=yes AC_ARG_ENABLE(debug, [ --enable-debug= enable or disable debug, default enabled], @@ -347,7 +357,7 @@ fi AC_SUBST(PERL_MM_PARMS) AC_SUBST(EXTRA_PERL_LIB) -AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile]) +AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile web/zmHttpd.conf]) AC_OUTPUT #AC_CHECK_FILE(scripts/ZoneMinder/Makefile,,[cd scripts/ZoneMinder;perl Makefile.PL PREFIX=$PREFIX]) diff --git a/db/Makefile.in b/db/Makefile.in index 248eb2cd3..b2fc338db 100644 --- a/db/Makefile.in +++ b/db/Makefile.in @@ -121,6 +121,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 559ddfe35..7a49b007b 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -195,6 +195,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/src/Makefile.in b/src/Makefile.in index e0acb5c1c..2e7d022b2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -185,6 +185,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/Makefile.am b/web/Makefile.am index 077a4ff91..dcb597f57 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -20,6 +20,9 @@ SUBDIRS = \ dist_web_DATA = \ index.php +EXTRA_DIST = \ + zmHttpd.conf.in + # Yes, you are correct. This is a HACK! install-data-hook: ( cd $(DESTDIR)$(webdir); chown $(webuser):$(webgroup) $(dist_web_DATA) ) diff --git a/web/Makefile.in b/web/Makefile.in index e65b8ddeb..bfcbd198b 100644 --- a/web/Makefile.in +++ b/web/Makefile.in @@ -34,7 +34,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = web DIST_COMMON = $(dist_web_DATA) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in + $(srcdir)/Makefile.in $(srcdir)/zmHttpd.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac @@ -42,7 +42,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = zmHttpd.conf CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = @@ -185,6 +185,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ @@ -262,6 +263,9 @@ SUBDIRS = \ dist_web_DATA = \ index.php +EXTRA_DIST = \ + zmHttpd.conf.in + all: all-recursive .SUFFIXES: @@ -295,6 +299,8 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +zmHttpd.conf: $(top_builddir)/config.status $(srcdir)/zmHttpd.conf.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-dist_webDATA: $(dist_web_DATA) @$(NORMAL_INSTALL) test -z "$(webdir)" || $(MKDIR_P) "$(DESTDIR)$(webdir)" diff --git a/web/ajax/Makefile.in b/web/ajax/Makefile.in index 0946a2903..c8113a158 100644 --- a/web/ajax/Makefile.in +++ b/web/ajax/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/css/Makefile.in b/web/css/Makefile.in index f8a469e70..86fa2b99a 100644 --- a/web/css/Makefile.in +++ b/web/css/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/graphics/Makefile.in b/web/graphics/Makefile.in index 28c3e3859..eacd5d167 100644 --- a/web/graphics/Makefile.in +++ b/web/graphics/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/includes/Makefile.in b/web/includes/Makefile.in index c0318eb75..e342dddc3 100644 --- a/web/includes/Makefile.in +++ b/web/includes/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/js/Makefile.in b/web/js/Makefile.in index d6fac8db5..9404ee19d 100644 --- a/web/js/Makefile.in +++ b/web/js/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/lang/Makefile.in b/web/lang/Makefile.in index f69bb2a9f..4e35b8786 100644 --- a/web/lang/Makefile.in +++ b/web/lang/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/Makefile.in b/web/skins/Makefile.in index 2350852ff..54e14023d 100644 --- a/web/skins/Makefile.in +++ b/web/skins/Makefile.in @@ -160,6 +160,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/Makefile.in b/web/skins/classic/Makefile.in index cd07e3c82..72e1bfd28 100644 --- a/web/skins/classic/Makefile.in +++ b/web/skins/classic/Makefile.in @@ -185,6 +185,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/ajax/Makefile.in b/web/skins/classic/ajax/Makefile.in index d2e9ec98b..79691dbc5 100644 --- a/web/skins/classic/ajax/Makefile.in +++ b/web/skins/classic/ajax/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/css/Makefile.in b/web/skins/classic/css/Makefile.in index 4e15f4f9e..64ca56316 100644 --- a/web/skins/classic/css/Makefile.in +++ b/web/skins/classic/css/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/graphics/Makefile.in b/web/skins/classic/graphics/Makefile.in index d9fca05d9..32b15d19b 100644 --- a/web/skins/classic/graphics/Makefile.in +++ b/web/skins/classic/graphics/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/includes/Makefile.in b/web/skins/classic/includes/Makefile.in index 5e5a825ce..ddaf7a2a8 100644 --- a/web/skins/classic/includes/Makefile.in +++ b/web/skins/classic/includes/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/js/Makefile.in b/web/skins/classic/js/Makefile.in index fd2969984..d20e75930 100644 --- a/web/skins/classic/js/Makefile.in +++ b/web/skins/classic/js/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/lang/Makefile.in b/web/skins/classic/lang/Makefile.in index 29c6edfa8..5a1e2cf91 100644 --- a/web/skins/classic/lang/Makefile.in +++ b/web/skins/classic/lang/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/views/Makefile.in b/web/skins/classic/views/Makefile.in index b98d24de9..e3553467a 100644 --- a/web/skins/classic/views/Makefile.in +++ b/web/skins/classic/views/Makefile.in @@ -185,6 +185,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/views/css/Makefile.in b/web/skins/classic/views/css/Makefile.in index bd41e099e..9fe8f47b5 100644 --- a/web/skins/classic/views/css/Makefile.in +++ b/web/skins/classic/views/css/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/classic/views/js/Makefile.in b/web/skins/classic/views/js/Makefile.in index c0f4b88f2..b50e8c7af 100644 --- a/web/skins/classic/views/js/Makefile.in +++ b/web/skins/classic/views/js/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/mobile/Makefile.in b/web/skins/mobile/Makefile.in index 9382c86d5..665f08d4a 100644 --- a/web/skins/mobile/Makefile.in +++ b/web/skins/mobile/Makefile.in @@ -185,6 +185,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/mobile/ajax/Makefile.in b/web/skins/mobile/ajax/Makefile.in index 8f2818d9e..eb8552c19 100644 --- a/web/skins/mobile/ajax/Makefile.in +++ b/web/skins/mobile/ajax/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/mobile/css/Makefile.in b/web/skins/mobile/css/Makefile.in index 5a546b724..5fc08feb6 100644 --- a/web/skins/mobile/css/Makefile.in +++ b/web/skins/mobile/css/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/mobile/graphics/Makefile.in b/web/skins/mobile/graphics/Makefile.in index 3e9aa159c..227a3d6a3 100644 --- a/web/skins/mobile/graphics/Makefile.in +++ b/web/skins/mobile/graphics/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/mobile/includes/Makefile.in b/web/skins/mobile/includes/Makefile.in index 60fa672b6..ddb387f38 100644 --- a/web/skins/mobile/includes/Makefile.in +++ b/web/skins/mobile/includes/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/mobile/lang/Makefile.in b/web/skins/mobile/lang/Makefile.in index 28d367a8b..a3a746bcd 100644 --- a/web/skins/mobile/lang/Makefile.in +++ b/web/skins/mobile/lang/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/mobile/views/Makefile.in b/web/skins/mobile/views/Makefile.in index abcb1dadd..2f5224200 100644 --- a/web/skins/mobile/views/Makefile.in +++ b/web/skins/mobile/views/Makefile.in @@ -185,6 +185,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/mobile/views/css/Makefile.in b/web/skins/mobile/views/css/Makefile.in index ea433207a..68aca2168 100644 --- a/web/skins/mobile/views/css/Makefile.in +++ b/web/skins/mobile/views/css/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/xml/Makefile.in b/web/skins/xml/Makefile.in index 07a81d184..a6e76080a 100644 --- a/web/skins/xml/Makefile.in +++ b/web/skins/xml/Makefile.in @@ -185,6 +185,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/xml/includes/Makefile.in b/web/skins/xml/includes/Makefile.in index 60d5c2f8b..6fca07331 100644 --- a/web/skins/xml/includes/Makefile.in +++ b/web/skins/xml/includes/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/skins/xml/views/Makefile.in b/web/skins/xml/views/Makefile.in index da244c350..614cda7c5 100644 --- a/web/skins/xml/views/Makefile.in +++ b/web/skins/xml/views/Makefile.in @@ -185,6 +185,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/tools/Makefile.in b/web/tools/Makefile.in index 224ae9332..861d0a5bc 100644 --- a/web/tools/Makefile.in +++ b/web/tools/Makefile.in @@ -160,6 +160,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/tools/mootools/Makefile.in b/web/tools/mootools/Makefile.in index f94e8e6dd..289799241 100644 --- a/web/tools/mootools/Makefile.in +++ b/web/tools/mootools/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/views/Makefile.in b/web/views/Makefile.in index 9e74cf64a..c44b7ed66 100644 --- a/web/views/Makefile.in +++ b/web/views/Makefile.in @@ -145,6 +145,7 @@ SYSCONFDIR = @SYSCONFDIR@ TIME_BUILD = @TIME_BUILD@ VERSION = @VERSION@ WEB_GROUP = @WEB_GROUP@ +WEB_HOST = @WEB_HOST@ WEB_PREFIX = @WEB_PREFIX@ WEB_USER = @WEB_USER@ ZM_CONFIG = @ZM_CONFIG@ diff --git a/web/zmHttpd.conf.in b/web/zmHttpd.conf.in new file mode 100644 index 000000000..2db0a9612 --- /dev/null +++ b/web/zmHttpd.conf.in @@ -0,0 +1,26 @@ +# +# Sample configuration file for running ZoneMinder as name based virtual host +# Some values may need to manually adjusted to suit your setup +# + + ServerName @WEB_HOST@ + ServerAdmin webmaster@localhost + + DocumentRoot "@WEB_PREFIX@" + + Options FollowSymLinks + + ScriptAlias /cgi-bin/ "@CGI_PREFIX@" + + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + + + # May be required if libraries are installed in unusual places + #SetEnv LD_LIBRARY_PATH @FFMPEG_PREFIX@/@LIB_ARCH@ + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + ErrorLog @LOGDIR@/zm-error.log + CustomLog @LOGDIR@/zm-access.log combined +