gitphp 0.2.9.1 :: busui.git/commitdiff

Merge branch 'master' of github.com:maxious/ACTBus-ui

Conflicts:
include/common-db.inc.php

2 files changed: (show all)
aws/awsStartup.sh
include/common-db.inc.php

file:a/aws/awsStartup.sh -> file:b/aws/awsStartup.sh

file:a/include/common-db.inc.php -> file:b/include/common-db.inc.php

<?php	<?php
if ($isDebugServer) $conn = pg_connect("dbname=transitdata user=postgres password=snmc");	if (php_uname('n') == "actbus-www") {
else $conn = pg_connect("dbname=transitdata user=transitdata password=transitdata ");	$conn = pg_connect("dbname=transitdata user=transitdata password=transitdata host=db.actbus.dotcloud.com port=2242");
if (php_uname('n') == "actbus-www") $conn = pg_connect("dbname=transitdata user=transitdata password=transitdata host=db.actbus.dotcloud.com port=2242");	} else if (isDebugServer()) {
	$conn = pg_connect("dbname=transitdata user=postgres password=snmc");
	} else {
	$conn = pg_connect("dbname=transitdata user=transitdata password=transitdata ");
	}
if (!$conn) {	if (!$conn) {
echo "An error occured.\n";	die("A database error occurred.\n");
exit;
}	}

function databaseError($errMsg) {	function databaseError($errMsg) {
die($errMsg);	die($errMsg);
}	}

include('db/route-dao.inc.php');	include('db/route-dao.inc.php');
include('db/trip-dao.inc.php');	include('db/trip-dao.inc.php');
include('db/stop-dao.inc.php');	include('db/stop-dao.inc.php');
?>	?>

#!/bin/bash	#!/bin/bash
#this script should be run from a fresh git checkout from github	#this script should be run from a fresh git checkout from github
#ami base must have yum install lighttpd-fastcgi, git, tomcat6	#ami base must have yum install lighttpd-fastcgi, git, tomcat6
#screen php-cli php-gd tomcat6-webapps tomcat6-admin-webapps svn maven2	#screen php-cli php-gd tomcat6-webapps tomcat6-admin-webapps svn maven2
#postgrtes postgres-server php-pg	#postgrtes postgres-server php-pg
#http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12	#http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12

cp /root/aws.php /tmp/	cp /root/aws.php /tmp/
mkdir /var/www/lib/staticmaplite/cache	mkdir /var/www/lib/staticmaplite/cache
chcon -h system_u:object_r:httpd_sys_content_t /var/www	chcon -h system_u:object_r:httpd_sys_content_t /var/www
chcon -R -h root:object_r:httpd_sys_content_t /var/www/*	chcon -R -h root:object_r:httpd_sys_content_t /var/www/*
chcon -R -t httpd_sys_content_rw_t /var/www/lib/staticmaplite/cache	chcon -R -t httpd_sys_content_rw_t /var/www/lib/staticmaplite/cache
chmod -R 777 /var/www/lib/staticmaplite/cache	chmod -R 777 /var/www/lib/staticmaplite/cache
wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \	wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \
-O /var/www/cbrfeed.zip	-O /var/www/cbrfeed.zip

createdb transitdata	createdb transitdata
createlang -d transitdata plpgsql	createlang -d transitdata plpgsql
psql -d transitdata -f /var/www/lib/postgis.sql	psql -d transitdata -f /var/www/lib/postgis.sql
# curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz	# curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz
#made with pg_dump transitdata \| gzip -c > transitdata.cbrfeed.sql.gz	#made with pg_dump transitdata \| gzip -c > transitdata.cbrfeed.sql.gz
gunzip /var/www/transitdata.cbrfeed.sql.gz	gunzip /var/www/transitdata.cbrfeed.sql.gz
psql -d transitdata -f /var/www/transitdata.cbrfeed.sql	psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
#createuser transitdata -SDRP	#createuser transitdata -SDRP
#password transitdata	#password transitdata
#psql -c \"GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;\"	#psql -d transitdata -c \"GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;\"
php /var/www/updatedb.php	php /var/www/updatedb.php

wget http://s3-ap-southeast-1.amazonaws.com/busresources/Graph.obj \	wget http://s3-ap-southeast-1.amazonaws.com/busresources/Graph.obj \
-O /tmp/Graph.obj	-O /tmp/Graph.obj
rm -rfv /usr/share/tomcat6/webapps/opentripplanner*	rm -rfv /usr/share/tomcat6/webapps/opentripplanner*
wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-webapp.war \	wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-webapp.war \
-O /usr/share/tomcat6/webapps/opentripplanner-webapp.war	-O /usr/share/tomcat6/webapps/opentripplanner-webapp.war
wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-api-webapp.war \	wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-api-webapp.war \
-O /usr/share/tomcat6/webapps/opentripplanner-api-webapp.war	-O /usr/share/tomcat6/webapps/opentripplanner-api-webapp.war
/etc/init.d/tomcat6 restart	/etc/init.d/tomcat6 restart