fix geoip in Piwik
WIP:
diff --git a/dockerfiles/services/piwik/Dockerfile b/dockerfiles/services/piwik/Dockerfile
index 02b8830..5455e8a 100644
--- a/dockerfiles/services/piwik/Dockerfile
+++ b/dockerfiles/services/piwik/Dockerfile
@@ -3,10 +3,22 @@ FROM indiepaas/nginx-php
RUN apt-get update && apt-get install -y
php5-gd
php5-geoip \
-
php5-dev \
-
libgeoip-dev \
-
php-pear \
-
build-essential \
-
pecl install geoip && \
curl "http://builds.piwik.org/piwik-latest.tar.gz" | tar xz &&
mv /piwik/config /piwik-config && \ - echo 'geoip.custom_directory=/piwik/misc' >> /etc/php5/fpm/php.ini && \
- cd /piwik/misc && \
- curl http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz -o GeoIP.dat.gz && \
- curl http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -o GeoLiteCity.dat.gz && \
- gunzip GeoIP.dat.gz && \
- gunzip GeoLiteCity.dat.gz && \
- mv GeoLiteCity.dat GeoIPCity.dat &&
sed -i 's/# exec CMD/# exec CMD\n/opt/startup-piwik.sh/g' /opt/entrypoint.sh
install nginx piwik config
diff --git a/dockerfiles/services/piwik/nginx-piwik.conf b/dockerfiles/services/piwik/nginx-piwik.conf
index 37aece9..6a73f3b 100644
--- a/dockerfiles/services/piwik/nginx-piwik.conf
+++ b/dockerfiles/services/piwik/nginx-piwik.conf
@@ -20,32 +20,19 @@ server {
fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME document_root
fastcgi_script_name;
- geoip_country /piwik/misc/GeoIP.dat;
- geoip_city /piwik/misc/GeoIPCity.dat;
- fastcgi_param GEOIP_ADDR $remote_addr;
- fastcgi_param GEOIP_COUNTRY_CODE $geoip_country_code;
- fastcgi_param GEOIP_COUNTRY_NAME $geoip_country_name;
- fastcgi_param GEOIP_REGION $geoip_region;
- fastcgi_param GEOIP_REGION_NAME $geoip_region_name;
- fastcgi_param GEOIP_CITY $geoip_city;
- fastcgi_param GEOIP_AREA_CODE $geoip_area_code;
- fastcgi_param GEOIP_LATITUDE $geoip_latitude;
- fastcgi_param GEOIP_LONGITUDE $geoip_longitude;
- fastcgi_param GEOIP_POSTAL_CODE $geoip_postal_code; include fastcgi_params; } }