[mapguide-commits] r7826 - in sandbox/jng/webtier_upgrade_v2/Installer: . Support/Web/x64/configs/Apache2/conf Support/Web/x86 Support/Web/x86/configs/Apache2/conf
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Aug 30 08:13:07 PDT 2013
Author: jng
Date: 2013-08-30 08:13:06 -0700 (Fri, 30 Aug 2013)
New Revision: 7826
Added:
sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/httpd-2.4.6-x86-VC11.zip
sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/php-5.5.3-x86-VC11.zip
Removed:
sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/httpd-2.4.6-win32-VC11.zip
sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/php-5.5.3-Win32-VC11-x86.zip
Modified:
sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf
sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf
sandbox/jng/webtier_upgrade_v2/Installer/build.bat
Log:
Installer changes:
- Rename the x86 zip files
- Update build.bat to use the binary Tomcat tarball under Oem\LinuxApt. It's platform-independent after all, and this saves us having to check-in binary zips of Tomcat.
Modified: sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf
===================================================================
--- sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf 2013-08-30 09:30:15 UTC (rev 7825)
+++ sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf 2013-08-30 15:13:06 UTC (rev 7826)
@@ -151,10 +151,9 @@
#LoadModule auth_digest_module modules/mod_auth_digest.so
#LoadModule authn_anon_module modules/mod_authn_anon.so
#LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
LoadModule authn_file_module modules/mod_authn_file.so
#LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_user_module modules/mod_authz_user.so
@@ -167,6 +166,7 @@
LoadModule dir_module modules/mod_dir.so
LoadModule env_module modules/mod_env.so
#LoadModule expires_module modules/mod_expires.so
+LoadModule filter_module modules/mod_filter.so
#LoadModule file_cache_module modules/mod_file_cache.so
#LoadModule headers_module modules/mod_headers.so
LoadModule imagemap_module modules/mod_imagemap.so
@@ -192,7 +192,7 @@
#LoadModule usertrack_module modules/mod_usertrack.so
#LoadModule vhost_alias_module modules/mod_vhost_alias.so
#LoadModule ssl_module modules/mod_ssl.so
-LoadModule php5_module "%MG_WEB_PHP%/php5apache2_2.dll"
+LoadModule php5_module "%MG_WEB_PHP%/php5apache2_4.dll"
LoadModule mgmapagent_module modules/mod_mgmapagent.so
#
@@ -300,8 +300,7 @@
#
# Controls who can get stuff from this server.
#
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
@@ -356,8 +355,7 @@
# viewed by Web clients.
#
<Files ~ "^\.ht">
- Order allow,deny
- Deny from all
+ Require all denied
</Files>
#
@@ -367,17 +365,6 @@
TypesConfig conf/mime.types
#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value. If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-#
# The mod_mime_magic module allows the server to use various hints from the
# contents of the file itself to determine its type. The MIMEMagicFile
# directive tells the module where the hint definitions are located.
@@ -503,8 +490,7 @@
<Directory "%MG_WEB_APACHE%/icons">
Options Indexes MultiViews
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#
@@ -517,8 +503,7 @@
<Directory "%MG_WEB_APACHE%/manual">
Options Indexes
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
<Files *.html>
SetHandler type-map
@@ -545,8 +530,7 @@
<Directory "%MG_WEB_APACHE%/cgi-bin">
AllowOverride None
Options None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#
@@ -996,13 +980,11 @@
<Directory "%MG_WEB_ROOT%">
AllowOverride All
Options All -Indexes
- Order allow,deny
- Allow from all
+ Require all granted
# Restrict access via HTTP to webconfig.ini
<Files webconfig.ini>
- Order allow,deny
- Deny from all
+ Require all denied
</Files>
# Apache MapAgent Module
@@ -1027,6 +1009,7 @@
</Directory>
#Disable the AcceptEx call
-Win32DisableAcceptEx
+AcceptFilter http none
+AcceptFilter https none
-%MG_INCLUDE_TOMCAT%
+%MG_INCLUDE_TOMCAT%
\ No newline at end of file
Modified: sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf
===================================================================
--- sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf 2013-08-30 09:30:15 UTC (rev 7825)
+++ sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf 2013-08-30 15:13:06 UTC (rev 7826)
@@ -151,10 +151,9 @@
#LoadModule auth_digest_module modules/mod_auth_digest.so
#LoadModule authn_anon_module modules/mod_authn_anon.so
#LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
LoadModule authn_file_module modules/mod_authn_file.so
#LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
+LoadModule authz_core_module modules/mod_authz_core.so
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_user_module modules/mod_authz_user.so
@@ -167,6 +166,7 @@
LoadModule dir_module modules/mod_dir.so
LoadModule env_module modules/mod_env.so
#LoadModule expires_module modules/mod_expires.so
+LoadModule filter_module modules/mod_filter.so
#LoadModule file_cache_module modules/mod_file_cache.so
#LoadModule headers_module modules/mod_headers.so
LoadModule imagemap_module modules/mod_imagemap.so
@@ -192,7 +192,7 @@
#LoadModule usertrack_module modules/mod_usertrack.so
#LoadModule vhost_alias_module modules/mod_vhost_alias.so
#LoadModule ssl_module modules/mod_ssl.so
-LoadModule php5_module "%MG_WEB_PHP%/php5apache2_2.dll"
+LoadModule php5_module "%MG_WEB_PHP%/php5apache2_4.dll"
LoadModule mgmapagent_module modules/mod_mgmapagent.so
#
@@ -300,8 +300,7 @@
#
# Controls who can get stuff from this server.
#
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
@@ -356,8 +355,7 @@
# viewed by Web clients.
#
<Files ~ "^\.ht">
- Order allow,deny
- Deny from all
+ Require all denied
</Files>
#
@@ -367,17 +365,6 @@
TypesConfig conf/mime.types
#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value. If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-#
# The mod_mime_magic module allows the server to use various hints from the
# contents of the file itself to determine its type. The MIMEMagicFile
# directive tells the module where the hint definitions are located.
@@ -503,8 +490,7 @@
<Directory "%MG_WEB_APACHE%/icons">
Options Indexes MultiViews
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#
@@ -517,8 +503,7 @@
<Directory "%MG_WEB_APACHE%/manual">
Options Indexes
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
<Files *.html>
SetHandler type-map
@@ -545,8 +530,7 @@
<Directory "%MG_WEB_APACHE%/cgi-bin">
AllowOverride None
Options None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#
@@ -996,13 +980,11 @@
<Directory "%MG_WEB_ROOT%">
AllowOverride All
Options All -Indexes
- Order allow,deny
- Allow from all
+ Require all granted
# Restrict access via HTTP to webconfig.ini
<Files webconfig.ini>
- Order allow,deny
- Deny from all
+ Require all denied
</Files>
# Apache MapAgent Module
@@ -1027,6 +1009,7 @@
</Directory>
#Disable the AcceptEx call
-Win32DisableAcceptEx
+AcceptFilter http none
+AcceptFilter https none
-%MG_INCLUDE_TOMCAT%
+%MG_INCLUDE_TOMCAT%
\ No newline at end of file
Deleted: sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/httpd-2.4.6-win32-VC11.zip
===================================================================
(Binary files differ)
Copied: sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/httpd-2.4.6-x86-VC11.zip (from rev 7825, sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/httpd-2.4.6-win32-VC11.zip)
===================================================================
(Binary files differ)
Deleted: sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/php-5.5.3-Win32-VC11-x86.zip
===================================================================
(Binary files differ)
Copied: sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/php-5.5.3-x86-VC11.zip (from rev 7825, sandbox/jng/webtier_upgrade_v2/Installer/Support/Web/x86/php-5.5.3-Win32-VC11-x86.zip)
===================================================================
(Binary files differ)
Modified: sandbox/jng/webtier_upgrade_v2/Installer/build.bat
===================================================================
--- sandbox/jng/webtier_upgrade_v2/Installer/build.bat 2013-08-30 09:30:15 UTC (rev 7825)
+++ sandbox/jng/webtier_upgrade_v2/Installer/build.bat 2013-08-30 15:13:06 UTC (rev 7826)
@@ -80,12 +80,13 @@
rem ==================================================
rem Web dependencies
rem ==================================================
-SET HTTPD_VERSION=2.2.21
-SET PHP_VERSION=5.3.8
-SET TOMCAT_VERSION=7.0.23
-SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-vc10.zip
-SET TOMCAT_PACKAGE=apache-tomcat-%TOMCAT_VERSION%-windows-%PLATFORM_CLR%.zip
-SET PHP_TS_PACKAGE=php-%PHP_VERSION%-%PLATFORM_CLR%-vc10.zip
+SET HTTPD_VERSION=2.4.6
+SET PHP_VERSION=5.5.3
+SET TOMCAT_VERSION=7.0.42
+SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-VC11.zip
+SET TOMCAT_PACKAGE_NAME=apache-tomcat-%TOMCAT_VERSION%
+SET TOMCAT_PACKAGE=%MG_OEM%\LinuxApt\%TOMCAT_PACKAGE_NAME%.tar.gz
+SET PHP_TS_PACKAGE=php-%PHP_VERSION%-%PLATFORM_CLR%-VC11.zip
:study_params
if (%1)==() goto start_build
@@ -180,15 +181,19 @@
popd
echo [prepare] Unpack Apache httpd
pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
-7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web\Apache2"
+7z x %HTTPD_PACKAGE% -y -o"%MG_SOURCE%\Web"
popd
echo [prepare] Unpack Tomcat
pushd "%INSTALLER_DEV_SUPPORT%\Web\%PLATFORM_CLR%"
-copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache2\modules"
+copy /Y mod_jk.so "%MG_SOURCE%\Web\Apache24\modules"
REM we unpack to root because Tomcat is the root dir in the zip file
-7z x %TOMCAT_PACKAGE% -y -o"%MG_SOURCE%\Web"
+7z x "%TOMCAT_PACKAGE%" -y -o"%MG_SOURCE%\Web"
popd
pushd "%MG_SOURCE%\Web"
+if exist %TOMCAT_PACKAGE_NAME%.tar (
+ 7z x %TOMCAT_PACKAGE_NAME%.tar -y
+ del %TOMCAT_PACKAGE_NAME%.tar
+)
if exist Tomcat (
xcopy /S /Y apache-tomcat-%TOMCAT_VERSION%\*.* Tomcat
rd /S /Q apache-tomcat-%TOMCAT_VERSION%
@@ -206,9 +211,9 @@
echo [prepare] Php config
%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2 config
-%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Apache2" "%MG_SOURCE%\Web\Apache24" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2 mapagent so
-copy /Y "%MG_BUILD_MAPAGENT%" "%MG_SOURCE%\Web\Apache2\modules"
+copy /Y "%MG_BUILD_MAPAGENT%" "%MG_SOURCE%\Web\Apache24\modules"
echo [prepare] FDO providers.xml
copy /Y "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\FDO\providers.xml" "%MG_SOURCE%\Server\FDO\"
@@ -366,7 +371,7 @@
%PARAFFIN% -dir %MG_SOURCE%\CS-Map\Dictionaries -alias $(var.MgSource)\CS-Map\Dictionaries -custom CSMAPDICTFILES -dirref CSMAPLOCATION -ext ASC -ext C -ext CNT -ext GID -ext HLP -ext MAK -ext NMK -ext VCPROJ -ext USER %WIX_INC_CSMAP%\incCSMapDictionaryFiles.wxs
echo [generate]: Web - Apache
-%PARAFFIN% -dir %MG_SOURCE%\Web\Apache2 -alias $(var.MgSource)\Web\Apache2 -custom APACHEFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incApacheFiles.wxs
+%PARAFFIN% -dir %MG_SOURCE%\Web\Apache24 -alias $(var.MgSource)\Web\Apache24 -custom APACHEFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incApacheFiles.wxs
echo [generate]: Web - Php TS
%PARAFFIN% -dir %MG_SOURCE%\Web\Php -alias $(var.MgSource)\Web\Php -custom PHPFILES -dirref WEBEXTENSIONSLOCATION %WIX_INC_WEB%\incPhpFiles.wxs
More information about the mapguide-commits
mailing list