diff --git a/src/modules/stack/install/ee_mod_install_php.sh b/src/modules/stack/install/ee_mod_install_php.sh index 57b36c96..db30fadd 100644 --- a/src/modules/stack/install/ee_mod_install_php.sh +++ b/src/modules/stack/install/ee_mod_install_php.sh @@ -5,5 +5,5 @@ function ee_mod_install_php() ee_lib_echo "Installing PHP, please wait..." $EE_APT_GET install php5-common php5-mysqlnd php5-xmlrpc \ php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt php5-xdebug \ - php5-memcache memcached || ee_lib_error "Unable to install PHP5, exit status = " $? + php5-memcache memcached php5-geoip || ee_lib_error "Unable to install PHP5, exit status = " $? } diff --git a/src/modules/stack/install/ee_mod_setup_php.sh b/src/modules/stack/install/ee_mod_setup_php.sh index d86399e1..944ae0d4 100644 --- a/src/modules/stack/install/ee_mod_setup_php.sh +++ b/src/modules/stack/install/ee_mod_setup_php.sh @@ -61,5 +61,10 @@ function ee_mod_setup_php() echo -e "php_admin_value[xdebug.profiler_output_dir] = /tmp/ \nphp_admin_value[xdebug.profiler_output_name] = cachegrind.out.%p-%H-%R \nphp_admin_flag[xdebug.profiler_enable_trigger] = on \nphp_admin_flag[xdebug.profiler_enable] = off" | tee -ai /etc/php5/fpm/pool.d/debug.conf &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to add xdebug settings for debug pool, exit status = " $? - fi + ee_lib_echo "Downloading GeoIP Database, please wait..." + mkdir -p /usr/share/GeoIP + wget -qO /usr/share/GeoIP/GeoLiteCity.dat.gz /usr/share/GeoIP/GeoIPCity.dat http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz + gunzip /usr/share/GeoIP/GeoLiteCity.dat.gz + mv /usr/share/GeoIP/GeoLiteCity.dat /usr/share/GeoIP/GeoIPCity.dat + fi } diff --git a/src/modules/stack/remove/ee_mod_remove_php.sh b/src/modules/stack/remove/ee_mod_remove_php.sh index 528ea80b..2ade5bba 100644 --- a/src/modules/stack/remove/ee_mod_remove_php.sh +++ b/src/modules/stack/remove/ee_mod_remove_php.sh @@ -5,5 +5,5 @@ function ee_mod_remove_php() ee_lib_echo "$EE_SECOND PHP5 package, please wait..." $EE_APT_GET $EE_SECOND php5-common php5-mysqlnd php5-xmlrpc \ php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt php5-xdebug \ - php5-memcache memcached || ee_lib_error "Unable to $EE_SECOND PHP5, exit status = " $? + php5-memcache memcached php5-geoip || ee_lib_error "Unable to $EE_SECOND PHP5, exit status = " $? }