Skip to content

Commit

Permalink
Revert "merge pull request heroku#4 into redis branch"
Browse files Browse the repository at this point in the history
This reverts commit 60929fe, reversing
changes made to f902738.
  • Loading branch information
ryanbrainard committed May 4, 2012
1 parent 8897934 commit 9058d37
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
8 changes: 0 additions & 8 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ APACHE_VERSION="2.2.22"
APACHE_PATH="apache"
PHP_VERSION="5.3.10"
PHP_PATH="php"
EXT_PATH="extensions"
REDIS_EXT="$EXT_PATH/redis.so"

BIN_DIR=$(dirname $0)
BUILD_DIR=$1
Expand Down Expand Up @@ -40,12 +38,6 @@ PHP_URL="https://s3.amazonaws.com/php-lp/php-$PHP_VERSION.tar.gz"
echo "-----> Bundling PHP version $PHP_VERSION"
curl --silent --max-time 60 --location "$PHP_URL" | tar xz


mkdir -p $(dirname $REDIS_EXT)
REDIS_EXT_URL="https://s3.amazonaws.com/rbrainard-public/redis.so"
echo "-----> Bundling Redis extension"
curl --silent --max-time 60 --location $REDIS_EXT_URL > $REDIS_EXT

# update config files
cp $LP_DIR/conf/httpd.conf $APACHE_PATH/conf
cp $LP_DIR/conf/php.ini php
Expand Down
1 change: 0 additions & 1 deletion conf/php.ini
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,6 @@ default_socket_timeout = 60
; Be sure to appropriately set the extension_dir directive.
;
extension=soap.so
extension=/app/extensions/redis.so
extension=apc.so
;extension=php_bz2.dll
;extension=php_curl.dll
Expand Down

0 comments on commit 9058d37

Please sign in to comment.