diff --git a/configure.ac b/configure.ac index bddb7b4e2..7977164f7 100644 --- a/configure.ac +++ b/configure.ac @@ -372,7 +372,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 misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf 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/ConfigData.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/zmApache.conf]) +AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf 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/ConfigData.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]) # Create the definitions for compilation and defaults for the database AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl]) diff --git a/misc/apache.conf.in b/misc/apache.conf.in index 3cb1fafd9..06c9beb15 100644 --- a/misc/apache.conf.in +++ b/misc/apache.conf.in @@ -1,22 +1,22 @@ # # PLEASE NOTE THAT THIS FILE IS INTENDED FOR GUIDANCE ONLY AND MAY NOT BE APPROPRIATE FOR YOUR DISTRIBUTION # -# Sample Apache config file to use ZoneMinder in a virtual hosting -# environment. +# Sample configuration file for running ZoneMinder as name based virtual host +# Some values may need to manually adjusted to suit your setup # - ServerName zm.local + ServerName @WEB_HOST@ ServerAdmin webmaster@localhost - DocumentRoot @WEB_PREFIX@ - + DocumentRoot "@WEB_PREFIX@" + Options FollowSymLinks AllowOverride All ScriptAlias /cgi-bin/ "@CGI_PREFIX@" - - Options FollowSymLinks + + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch AllowOverride All diff --git a/web/Makefile.am b/web/Makefile.am index a3222f34a..077a4ff91 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -20,9 +20,6 @@ SUBDIRS = \ dist_web_DATA = \ index.php -EXTRA_DIST = \ - zmApache.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/zmApache.conf.in b/web/zmApache.conf.in deleted file mode 100644 index 2db0a9612..000000000 --- a/web/zmApache.conf.in +++ /dev/null @@ -1,26 +0,0 @@ -# -# 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 -