OTP changes
--- a/.box
+++ /dev/null
@@ -1,5 +1,1 @@
-shared_writable_dirs:
- - /labs/tiles
- - /lib/staticmaplite/cache
-php_extensions: [pgsql, pdo, pdo_pgsql, curl]
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/labs/tiles/16
/labs/tiles/17
/labs/tiles/19
+/nbproject/private/
--- /dev/null
+++ b/.gitmodules
@@ -1,1 +1,16 @@
+[submodule "js/flotr2"]
+ path = js/flotr2
+ url = https://github.com/HumbleSoftware/Flotr2.git
+[submodule "js/FlashCanvas"]
+ path = js/FlashCanvas
+ url = https://github.com/timcameronryan/FlashCanvas
+[submodule "lib/amon-php"]
+ path = lib/amon-php
+ url = https://github.com/martinrusev/amon-php.git
+[submodule "js/tesseract"]
+ path = js/tesseract
+ url = https://github.com/square/tesseract.git
+[submodule "js/d3"]
+ path = js/d3
+ url = https://github.com/mbostock/d3.git
--- /dev/null
+++ b/Boxfile
@@ -1,1 +1,7 @@
+web1:
+ php_extensions:
+ - pgsql
+ - pdo
+ - pdo_pgsql
+ - curl
--- a/about.php
+++ b/about.php
@@ -1,35 +1,57 @@
<?php
+/*
+ * Copyright 2010,2011 Alexander Sadleir
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
include ('include/common.inc.php');
include_header("About", "about")
?>
<p>
-Busness Time - An ACT bus timetable webapp<br />
-Based on the maxious-canberra-transit-feed (<a
-href="http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip">download</a>,
-last updated <?php
-echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br />
-Source code for the <a
-href="https://github.com/maxious/ACTBus-data">transit
-feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this
-site</a> available from github.<br />
-Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />
-<br />
-Feedback encouraged; contact maxious@lambdacomplex.org<br />
+ Busness Time - An ACT bus timetable webapp<br />
+ Based on the maxious-canberra-transit-feed (<a
+ href="http://busresources.lambdacomplex.org/cbrfeed.zip">download</a>,
+ last updated <?php echo date("F d Y.", @filemtime('../busresources/cbrfeed.zip')); ?>)<br />
+ Source code for the <a
+ href="https://github.com/maxious/ACTBus-data">transit
+ feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this
+ site</a> available from github.<br />
+ Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />
+ Suburb geocoding based on <A href="http://www.abs.gov.au/AUSSTATS/abs@.nsf/Lookup/1270.0.55.003Main+Features1July%202011?OpenDocument">Australian Bureau of Statistics data.</a><br />
+ Street geocoding based on work by OpenStreetMap contributors<br>
<br />
-Some icons by Joseph Wain / glyphish.com<br />
-Native clients also available for iPhone(<a href="http://itunes.apple.com/au/app/cbrtimetable/id444287349?mt=8">cbrTimetable by Sandor Kolotenko</a>
-, <a href="http://itunes.apple.com/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>)
-and Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>)
-<br />
-<br />
-<small>Disclaimer: The content of this website is of a general and informative nature. Please check with printed timetables or those available on http://action.act.gov.au before your trip.
-Whilst every effort has been made to ensure the high quality and accuracy of the Site, the Author makes no warranty,
-express or implied concerning the topicality, correctness, completeness or quality of the information, which is provided
-"as is". The Author expressly disclaims all warranties, including but not limited to warranties of fitness for a particular purpose and warranties of merchantability.
-All offers are not binding and without obligation. The Author expressly reserves the right, in his discretion, to suspend,
-change, modify, add or remove portions of the Site and to restrict or terminate the use and accessibility of the Site
-without prior notice. </small>
-<?php
-include_footer();
-?>
+ Feedback encouraged; contact maxious@lambdacomplex.org<br />
+ <br />
+ Some icons by Joseph Wain / glyphish.com<br />
+ Native clients also available for iPhone (<a href="http://itunes.apple.com/au/app/cbrtimetable/id444287349?mt=8">cbrTimetable by Sandor Kolotenko</a>
+ , <a href="http://itunes.apple.com/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>, <a href="http://itunes.apple.com/app/bus-trips-act/id489146525?mt=8">Bus Trips ACT by Molson Chengalath</a>)
+ , Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>, <A href="https://market.android.com/details?id=GetMe2CanberraFree.source">GetMe2 Canberra by
+Colin Thompson </a>, <a href="https://market.android.com/details?id=au.com.transittimes.android">TransitTimes+ by Zervaas Enterprises</a>)
+ and Windows Phone 7 (<a href="http://www.windowsphone.com/en-AU/apps/d840375e-429c-4aa4-a358-80eec6ea9e66">TransHub Canberra by Soul Solutions</a>).
+ <br />
+ <!--GTFS-realtime API:<br />
+ Alerts and Trip Updates (but only Cancelled or Stop Skipped)<br />
+ Default format binary Protocol Buffer but can get JSON by adding ?ascii=yes<br />-->
+ <br />
+ <br />
+ <small>Disclaimer: The content of this website is of a general and informative nature. Please check with printed timetables or those available on http://www.action.act.gov.au before your trip.
+ Whilst every effort has been made to ensure the high quality and accuracy of the Site, the Author makes no warranty,
+ express or implied concerning the topicality, correctness, completeness or quality of the information, which is provided
+ "as is". The Author expressly disclaims all warranties, including but not limited to warranties of fitness for a particular purpose and warranties of merchantability.
+ All offers are not binding and without obligation. The Author expressly reserves the right, in his discretion, to suspend,
+ change, modify, add or remove portions of the Site and to restrict or terminate the use and accessibility of the Site
+ without prior notice. </small>
+ <?php
+ include_footer();
+ ?>
--- a/aws/awsStartup.sh
+++ /dev/null
@@ -1,13 +1,1 @@
-#!/bin/bash
-#this script should be run from a fresh git checkout from github
-#ami base must have yum install lighttpd-fastcgi, git, tomcat6
-#php-cli php-gd tomcat6-webapps tomcat6-admin-webapps svn maven2
-#postgres postgres-server php-pg
-#http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12
-sh busuiphp.sh
-sh busuidb.sh
-sh busuiotp.sh
-
-
-
--- a/aws/busuidb.sh
+++ /dev/null
@@ -1,14 +1,1 @@
-createdb transitdata
-createlang -d transitdata plpgsql
-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
-#made with pg_dump transitdata | gzip -c > transitdata.cbrfeed.sql.gz
-gunzip /var/www/transitdata.cbrfeed.sql.gz
-psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
-#createuser transitdata -SDRP
-#password transitdata
-#psql -d transitdata -c "GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;"
-#psql -d transitdata -c "GRANT SELECT,INSERT ON TABLE myway_observations,myway_routes,myway_stops,myway_timingdeltas TO transitdata;"
-#psql -d transitdata -c "GRANT SELECT,INSERT,UPDATE ON TABLE myway_routes,myway_stops TO transitdata;"
-##psql -d transitdata -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO transitdata;"
-php /var/www/updatedb.php
+
--- a/aws/busuiotp.sh
+++ /dev/null
@@ -1,10 +1,1 @@
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/Graph.obj \
--O /tmp/Graph.obj
-/etc/init.d/tomcat6 stop
-rm -rfv /usr/share/tomcat6/webapps/opentripplanner*
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-webapp.war \
--O /usr/share/tomcat6/webapps/opentripplanner-webapp.war
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/opentripplanner-api-webapp.war \
--O /usr/share/tomcat6/webapps/opentripplanner-api-webapp.war
-/etc/init.d/tomcat6 restart
--- a/aws/busuiotp.testing.sh
+++ /dev/null
@@ -1,10 +1,1 @@
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/testing/Graph.obj \
--O /tmp/Graph.obj
-/etc/init.d/tomcat6 stop
-rm -rfv /usr/share/tomcat6/webapps/opentripplanner*
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/testing/opentripplanner-webapp.war \
--O /usr/share/tomcat6/webapps/opentripplanner-webapp.war
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/testing/opentripplanner-api-webapp.war \
--O /usr/share/tomcat6/webapps/opentripplanner-api-webapp.war
-/etc/init.d/tomcat6 restart
--- a/aws/busuiphp.sh
+++ /dev/null
@@ -1,16 +1,1 @@
-cp /root/aws.php /tmp/
-mkdir /var/www/lib/staticmaplite/cache
-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 -t httpd_sys_content_rw_t /var/www/lib/staticmaplite/cache
-chmod -R 777 /var/www/lib/staticmaplite/cache
-
-chcon -R -t httpd_sys_content_rw_t /var/www/labs/tiles
-chmod -R 777 /var/www/labs/tiles
-
-chcon -R -t httpd_sys_content_rw_t /var/www/lib/openid-php/oid_store
-chmod -R 777 /var/www/lib/openid-php/oid_store
-
-wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \
--O /var/www/cbrfeed.zip
--- a/aws/compress.conf
+++ /dev/null
@@ -1,33 +1,1 @@
-#######################################################################
-##
-## Output Compression
-## --------------------
-##
-## see http://www.lighttpd.net/documentation/compress.html
-##
-server.modules += ( "mod_compress" )
-##
-## where should the compressed files be cached?
-## see the base config for the declaration of the variable.
-##
-## This directory should be changed per vhost otherwise you can
-## run into trouble with overlapping filenames
-##
-compress.cache-dir = cache_dir + "/compress"
-
-##
-## FileTypes to compress.
-##
-#compress.filetype = ("text/plain", "text/html")
-compress.filetype = ("text/plain", "text/html", "text/javascript", "text/css", "text/xml")
-
-##
-## Maximum filesize that will be compressed.
-## Default is 0, which means unlimited file size.
-##
-#compress.max-filesize = 0
-
-##
-#######################################################################
-
--- a/aws/data-sources.xml
+++ /dev/null
@@ -1,13 +1,1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
- <!-- Single graph -->
- <import resource="classpath:org/opentripplanner/api/application-context.xml" />
-
- <bean id="graphBundle" class="org.opentripplanner.model.GraphBundle">
- <property name="path" value="/tmp/" />
- </bean>
-
-</beans>
-
--- a/aws/expire.conf
+++ /dev/null
@@ -1,29 +1,1 @@
-#######################################################################
-##
-## Expire Module
-## ---------------
-##
-## See http://www.lighttpd.net/documentation/expire.html
-##
-server.modules += ( "mod_expire" )
-##
-## assignes a expiration to all files below the specified path. The
-## specification of the time is made up of:
-##
-## <access|modification> <number> <years|months|days|hours|minutes|seconds>
-##
-#expire.url = (
-# "/buggy/" => "access 2 hours",
-# "/images/" => "access plus 1 seconds 2 minutes"
-#)
-etag.use-mtime = "enable"
-etag.use-inode = "disable"
-static-file.etags = "enable"
-$HTTP["url"] =~ "\.(css|js|png|jpg|ico|gif)$" {
- expire.url = ( "" => "access 7 days" )
-}
-
-##
-#######################################################################
-
--- a/aws/fastcgi.conf
+++ /dev/null
@@ -1,144 +1,1 @@
-#######################################################################
-##
-## FastCGI Module
-## ---------------
-##
-## http://www.lighttpd.net/documentation/fastcgi.html
-##
-server.modules += ( "mod_fastcgi" )
-fastcgi.server = ( ".php" =>
- ( "localhost" =>
- (
- "socket" =>
-"/var/run/lighttpd/php-fastcgi.socket",
- "bin-path" => "/usr/bin/php-cgi"
- )
- )
- )
-##
-## PHP Example
-## For PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini.
-##
-## The number of php processes you will get can be easily calculated:
-##
-## num-procs = max-procs * ( 1 + PHP_FCGI_CHILDREN )
-##
-## for the php-num-procs example it means you will get 17*5 = 85 php
-## processes. you always should need this high number for your very
-## busy sites. And if you have a lot of RAM. :)
-##
-#fastcgi.server = ( ".php" =>
-# ( "php-local" =>
-# (
-# "socket" => socket_dir + "/php-fastcgi-1.socket",
-# "bin-path" => server_root + "/php-cgi",
-# "max-procs" => 1,
-# "broken-scriptfilename" => "enable",
-# )
-# ),
-# ( "php-tcp" =>
-# (
-# "host" => "127.0.0.1",
-# "port" => 9999,
-# "check-local" => "disable",
-# "broken-scriptfilename" => "enable",
-# )
-# ),
-#
-# ( "php-num-procs" =>
-# (
-# "socket" => socket_dir + "/php-fastcgi-2.socket",
-# "bin-path" => server_root + "/php-cgi",
-# "bin-environment" => (
-# "PHP_FCGI_CHILDREN" => "16",
-# "PHP_FCGI_MAX_REQUESTS" => "10000",
-# ),
-# "max-procs" => 5,
-# "broken-scriptfilename" => "enable",
-# )
-# ),
-# )
-##
-## Ruby on Rails Example
-##
-## Normally you only run one Rails application on one vhost.
-##
-#$HTTP["host"] == "rails1.example.com" {
-# server.document-root = server_root + "/rails/someapp/public"
-# server.error-handler-404 = "/dispatch.fcgi"
-# fastcgi.server = ( ".fcgi" =>
-# ("someapp" =>
-# ( "socket" => socket_dir + "/someapp-fcgi.socket",
-# "bin-path" => server_root + "/rails/someapp/public/dispatch.fcgi",
-# "bin-environment" => (
-# "RAILS_ENV" => "production",
-# "TMP" => home_dir + "/rails/someapp",
-# ),
-# )
-# )
-# )
-#}
-
-##
-## Another example with multiple rails applications on one vhost.
-##
-## http://blog.lighttpd.net/articles/2005/11/23/lighttpd-1-4-8-and-multiple-rails-apps
-##
-#$HTTP["host"] == "rails2.example.com" {
-# $HTTP["url"] =~ "^/someapp1" {
-# server.document-root = server_root + "/rails/someapp1/public"
-# server.error-handler-404 = "/dispatch.fcgi"
-# fastcgi.server = ( ".fcgi" =>
-# ("someapp1" =>
-# ( "socket" => socket_dir + "/someapp1-fcgi.socket",
-# "bin-path" => server_root + "/rails/someapp1/public/dispatch.fcgi",
-# "bin-environment" => (
-# "RAILS_ENV" => "production",
-# "TMP" => home_dir + "/rails/someapp1",
-# ),
-# "strip-request-uri" => "/someapp1/"
-# )
-# )
-# )
-# }
-#
-# $HTTP["url"] =~ "^/someapp2" {
-# server.document-root = server_root + "/rails/someapp2/public"
-# server.error-handler-404 = "/dispatch.fcgi"
-# fastcgi.server = ( ".fcgi" =>
-# ("someapp2" =>
-# ( "socket" => socket_dir + "/someapp2-fcgi.socket",
-# "bin-path" => server_root + "/rails/someapp2/public/dispatch.fcgi",
-# "bin-environment" => (
-# "RAILS_ENV" => "production",
-# "TMP" => home_dir + "/rails/someapp2",
-# ),
-# "strip-request-uri" => "/someapp2/"
-# )
-# )
-# )
-# }
-#}
-
-## chrooted webserver + external PHP
-##
-## $ spawn-fcgi -f /usr/bin/php-cgi -p 2000 -a 127.0.0.1 -C 8
-##
-## webserver chrooted to /srv/www/
-## php running outside the chroot
-#
-#fastcgi.server = (
-# ".php" => ((
-# "host" => "127.0.0.1",
-# "port" => "2000",
-# "docroot" => "/srv/www/servers/www.example.org/htdocs/"
-# )))
-#
-#server.chroot = "/srv/www"
-#server.document-root = "/servers/wwww.example.org/htdocs/"
-#
-
-##
-#######################################################################
-
--- a/aws/modules.conf
+++ /dev/null
@@ -1,173 +1,1 @@
-#######################################################################
-##
-## Modules to load
-## -----------------
-##
-## at least mod_access and mod_accesslog should be loaded
-## all other module should only be loaded if really neccesary
-##
-## - saves some time
-## - saves memory
-##
-## the default module set contains:
-##
-## "mod_indexfile", "mod_dirlisting", "mod_staticfile"
-##
-## you dont have to include those modules in your list
-##
-## Modules, which are pulled in via conf.d/*.conf
-##
-## NOTE: the order of modules is important.
-##
-## - mod_accesslog -> conf.d/access_log.conf
-## - mod_compress -> conf.d/compress.conf
-## - mod_status -> conf.d/status.conf
-## - mod_webdav -> conf.d/webdav.conf
-## - mod_cml -> conf.d/cml.conf
-## - mod_evhost -> conf.d/evhost.conf
-## - mod_simple_vhost -> conf.d/simple_vhost.conf
-## - mod_mysql_vhost -> conf.d/mysql_vhost.conf
-## - mod_trigger_b4_dl -> conf.d/trigger_b4_dl.conf
-## - mod_userdir -> conf.d/userdir.conf
-## - mod_rrdtool -> conf.d/rrdtool.conf
-## - mod_ssi -> conf.d/ssi.conf
-## - mod_cgi -> conf.d/cgi.conf
-## - mod_scgi -> conf.d/scgi.conf
-## - mod_fastcgi -> conf.d/fastcgi.conf
-## - mod_proxy -> conf.d/proxy.conf
-## - mod_secdownload -> conf.d/secdownload.conf
-## - mod_expire -> conf.d/expire.conf
-##
-server.modules = (
- "mod_access",
-# "mod_alias",
-# "mod_auth",
-# "mod_evasive",
-# "mod_redirect",
-# "mod_rewrite",
-# "mod_setenv",
-# "mod_usertrack",
-)
-
-##
-#######################################################################
-
-#######################################################################
-##
-## Config for various Modules
-##
-
-##
-## mod_ssi
-##
-#include "conf.d/ssi.conf"
-
-##
-## mod_status
-##
-#include "conf.d/status.conf"
-
-##
-## mod_webdav
-##
-#include "conf.d/webdav.conf"
-
-##
-## mod_compress
-##
-include "conf.d/compress.conf"
-
-##
-## mod_userdir
-##
-#include "conf.d/userdir.conf"
-
-##
-## mod_magnet
-##
-#include "conf.d/magnet.conf"
-
-##
-## mod_cml
-##
-#include "conf.d/cml.conf"
-
-##
-## mod_rrdtool
-##
-#include "conf.d/rrdtool.conf"
-
-##
-## mod_proxy
-##
-#include "conf.d/proxy.conf"
-
-##
-## mod_expire
-##
-include "conf.d/expire.conf"
-
-##
-## mod_secdownload
-##
-#include "conf.d/secdownload.conf"
-
-##
-#######################################################################
-
-#######################################################################
-##
-## CGI modules
-##
-
-##
-## SCGI (mod_scgi)
-##
-#include "conf.d/scgi.conf"
-
-##
-## FastCGI (mod_fastcgi)
-##
-include "conf.d/fastcgi.conf"
-
-##
-## plain old CGI (mod_cgi)
-##
-#include "conf.d/cgi.conf"
-
-##
-#######################################################################
-
-#######################################################################
-##
-## VHost Modules
-##
-## Only load ONE of them!
-## ========================
-##
-
-##
-## You can use conditionals for vhosts aswell.
-##
-## see http://www.lighttpd.net/documentation/configuration.html
-##
-
-##
-## mod_evhost
-##
-#include "conf.d/evhost.conf"
-
-##
-## mod_simple_vhost
-##
-#include "conf.d/simple_vhost.conf"
-
-##
-## mod_mysql_vhost
-##
-#include "conf.d/mysql_vhost.conf"
-
-##
-#######################################################################
-
--- a/aws/pg_hba.conf
+++ /dev/null
@@ -1,77 +1,1 @@
-# PostgreSQL Client Authentication Configuration File
-# ===================================================
-#
-# Refer to the "Client Authentication" section in the
-# PostgreSQL documentation for a complete description
-# of this file. A short synopsis follows.
-#
-# This file controls: which hosts are allowed to connect, how clients
-# are authenticated, which PostgreSQL user names they can use, which
-# databases they can access. Records take one of these forms:
-#
-# local DATABASE USER METHOD [OPTIONS]
-# host DATABASE USER CIDR-ADDRESS METHOD [OPTIONS]
-# hostssl DATABASE USER CIDR-ADDRESS METHOD [OPTIONS]
-# hostnossl DATABASE USER CIDR-ADDRESS METHOD [OPTIONS]
-#
-# (The uppercase items must be replaced by actual values.)
-#
-# The first field is the connection type: "local" is a Unix-domain socket,
-# "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an
-# SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket.
-#
-# DATABASE can be "all", "sameuser", "samerole", a database name, or
-# a comma-separated list thereof.
-#
-# USER can be "all", a user name, a group name prefixed with "+", or
-# a comma-separated list thereof. In both the DATABASE and USER fields
-# you can also write a file name prefixed with "@" to include names from
-# a separate file.
-#
-# CIDR-ADDRESS specifies the set of hosts the record matches.
-# It is made up of an IP address and a CIDR mask that is an integer
-# (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that specifies
-# the number of significant bits in the mask. Alternatively, you can write
-# an IP address and netmask in separate columns to specify the set of hosts.
-#
-# METHOD can be "trust", "reject", "md5", "password", "gss", "sspi", "krb5",
-# "ident", "pam", "ldap" or "cert". Note that "password" sends passwords
-# in clear text; "md5" is preferred since it sends encrypted passwords.
-#
-# OPTIONS are a set of options for the authentication in the format
-# NAME=VALUE. The available options depend on the different authentication
-# methods - refer to the "Client Authentication" section in the documentation
-# for a list of which options are available for which authentication methods.
-#
-# Database and user names containing spaces, commas, quotes and other special
-# characters must be quoted. Quoting one of the keywords "all", "sameuser" or
-# "samerole" makes the name lose its special character, and just match a
-# database or username with that name.
-#
-# This file is read on server startup and when the postmaster receives
-# a SIGHUP signal. If you edit the file on a running system, you have
-# to SIGHUP the postmaster for the changes to take effect. You can use
-# "pg_ctl reload" to do that.
-# Put your actual configuration here
-# ----------------------------------
-#
-# If you want to allow non-local connections, you need to add more
-# "host" records. In that case you will also need to make PostgreSQL listen
-# on a non-local interface via the listen_addresses configuration parameter,
-# or via the -i or -h command line switches.
-#
-
-
-
-# TYPE DATABASE USER CIDR-ADDRESS METHOD
-
-# "local" is for Unix domain socket connections only
-local all all trust
-# IPv4 local connections:
-host all all 127.0.0.1/32 trust
-# IPv6 local connections:
-host all all ::1/128 trust
-#Allow any IP to connect, with a password:
-host all all 0.0.0.0 0.0.0.0 md5
-
--- a/aws/php.ini
+++ /dev/null
@@ -1,1662 +1,1 @@
-[PHP]
-date.timezone = "Australia/Sydney"
-
-;;;;;;;;;;;;;;;;;;;
-; About php.ini ;
-;;;;;;;;;;;;;;;;;;;
-; PHP's initialization file, generally called php.ini, is responsible for
-; configuring many of the aspects of PHP's behavior.
-
-; PHP attempts to find and load this configuration from a number of locations.
-; The following is a summary of its search order:
-; 1. SAPI module specific location.
-; 2. The PHPRC environment variable. (As of PHP 5.2.0)
-; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0)
-; 4. Current working directory (except CLI)
-; 5. The web server's directory (for SAPI modules), or directory of PHP
-; (otherwise in Windows)
-; 6. The directory from the --with-config-file-path compile time option, or the
-; Windows directory (C:\windows or C:\winnt)
-; See the PHP docs for more specific information.
-; http://www.php.net/manual/en/configuration.file.php
-
-; The syntax of the file is extremely simple. Whitespace and Lines
-; beginning with a semicolon are silently ignored (as you probably guessed).
-; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
-
-; Directives following the section heading [PATH=/www/mysite] only
-; apply to PHP files in the /www/mysite directory. Directives
-; following the section heading [HOST=www.example.com] only apply to
-; PHP files served from www.example.com. Directives set in these
-; special sections cannot be overridden by user-defined INI files or
-; at runtime. Currently, [PATH=] and [HOST=] sections only work under
-; CGI/FastCGI.
-; http://www.php.net/manual/en/ini.sections.php
-
-; Directives are specified using the following syntax:
-; directive = value
-; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-; Directives are variables used to configure PHP or PHP extensions.
-; There is no name validation. If PHP can't find an expected