Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
tmaher committed Mar 26, 2012
1 parent c660648 commit 87f55b5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion bin/compile
Expand Up @@ -31,7 +31,11 @@ if [ -f www/Procfile ]; then
fi

# unpack cache
for DIR in $APACHE_PATH $PHP_PATH ; do
for COMP in APACHE PHP; do
DIR=`eval echo '$'${COMP}_PATH`
VERSION=`eval echo '$'${COMP}_VERSION`
[ `cat $CACHE_DIR/$DIR/VERSION 2>/dev/null` == "$VERSION" ] || continue

rm -rf $DIR
if [ -d $CACHE_DIR/$DIR ]; then
cp -r $CACHE_DIR/$DIR $DIR
Expand All @@ -40,13 +44,15 @@ done

# install apache if needed
if [ ! -d $APACHE_PATH ] || [ `cat ${APACHE_PATH}/VERSION` != $APACHE_VERSION ]; then
[ -d $APACHE_PATH ] && rm -rf $APACHE_PATH
APACHE_URL="https://s3.amazonaws.com/php-lp-tmaher/apache-$APACHE_VERSION.tar.gz"
echo "-----> Bundling Apacheeee version $APACHE_VERSION"
curl --silent --max-time 60 --location $APACHE_URL | tar xz
fi

# install php if needed
if [ ! -d $PHP_PATH ] || [ `cat ${PHP_PATH}/VERSION` != $PHP_VERSION ]; then
[ -d $PHP_PATH ] && rm -rf $PHP_PATH
PHP_URL="https://s3.amazonaws.com/php-lp-tmaher/php-$PHP_VERSION.tar.gz"
echo "-----> Bundling PHP version $PHP_VERSION"
curl --silent --max-time 60 --location $PHP_URL | tar xz
Expand Down
4 changes: 2 additions & 2 deletions conf/php.ini
Expand Up @@ -528,7 +528,7 @@ error_reporting = E_ALL & ~E_NOTICE
; Development Value: On
; Production Value: Off
; http://php.net/display-errors
display_errors = On
display_errors = Off

; The display of errors which occur during PHP's startup sequence are handled
; separately from display_errors. PHP's default behavior is to suppress those
Expand Down Expand Up @@ -994,7 +994,7 @@ extension=soap.so
[Date]
; Defines the default timezone used by the date functions
; http://php.net/date.timezone
;date.timezone =
date.timezone = UTC

; http://php.net/date.default-latitude
;date.default_latitude = 31.7667
Expand Down

0 comments on commit 87f55b5

Please sign in to comment.