65. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 9/15/2018 10:47:17 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

65.1 Files compared

#	Location	File	Last Modified
1	MHV_2018.4.0.0.zip\2018.4.0.0\national portal\mhv_source\mhv_devops\src\main\portal-admin	httpdConf.sh	Thu Aug 23 21:39:14 2018 UTC
2	MHV_2018.4.0.0.zip\2018.4.0.0\national portal\mhv_source\mhv_devops\src\main\portal-admin	httpdConf.sh	Sat Sep 15 20:15:09 2018 UTC

65.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	3	116
Changed	2	10
Inserted	0	0
Removed	0	0

65.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

65.4 Active regular expressions

No regular expressions were active.

65.5 Comparison detail

	1	#!/bin/bas h
	2
	3	. /vagrant /shell/por tal-admin/ portal.dev .profile
	4
	5	read -r -d '' APACHE _CONF << E OM
	6
	7
	8	<IfModule mod_proxy. c>
	9	Pr oxyRequest s Off
	10	<P roxy *>
	11	Orde r allow,de ny
	12	Allo w from all
	13	</ Proxy>
	14
	15	ProxyPassM atch ^/mhv -portal-ad min/(.*)$ ajp:// IP : PORT /web/mhv-p ortal-admi n/REPLACE_ ME
	16	ProxyPass / ajp:// IP : PORT /
	17	ProxyPassR everse / a jp:// IP : PORT /
	18
	19	</IfModule >
	20
	21	EOM
	22
	23	read -r -d '' PORTAL _EXT_CONF << EOM
	24
	25
	26	# HTTP Pro xy Setting s
	27	web.server .http.port = PORT
	28	web.server .https.por t= PORT
	29
	30	EOM
	31
	32
	33	# make sur e httpd is installed
	34	if [ $(sud o yum -q l ist instal led httpd \| grep -c "httpd") - ne 1 ]
	35	then
	36	if [ $(sudo yum -y ins tall httpd \| grep -c "Complete !") -ne 1 ]
	37	th en
	38	exit "Error in stalling A pache http d service. ";
	39	fi
	40	fi
	41
	42	# copy cus tom config uration to server.
	43	if [ $(sud o grep -c "mhv-porta l-admin" / etc/httpd/ conf/httpd .conf) -ne 1 ]
	44	then
	45	su do su -c " echo \"$AP ACHE_CONF\ " >> /etc/ httpd/conf /httpd.con f"
	46	su do su -c " sed -i.bak 's/REPLAC E_ME/\$1/g ' /etc/htt pd/conf/ht tpd.conf"
	47	fi
	48
	49	# copy cus tom portal -ext.prope rties to t he correct location
	50	if [ $(sud o grep -c "HTTP Prox y Settings " ${LIFERA Y_HOME}/po rtal-ext.p roperties) -ne 1 ]
	51	then
	52	su do su -c " echo \"$PO RTAL_EXT_C ONF\" >> $ {LIFERAY_H OME}/porta l-ext.prop erties"
	53	fi
	54
	55	# make sur e httpd is running
	56	if [ $(sud o service --status-a ll \| grep -c "httpd .* is runn ing...") - ne 1 ]
	57	then
	58	su do service httpd sta rt
	59	else
	60	su do service httpd res tart
	61	fi
	62
	63	exit;