Merge pull request #119 from luizeof/v2.15.2

v2.15.2
mautic · Aug 2, 2019 · c4544d6 · c4544d6
2 parents f4e8258 + 999b7b6
commit c4544d6
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 6 deletions.
diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -33,8 +33,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
 VOLUME /var/www/html
 
 # Define Mautic version and expected SHA1 signature
-ENV MAUTIC_VERSION 2.15.1
-ENV MAUTIC_SHA1 1fbf6f99a64d6da71a8c09a43576093b077913e2
+ENV MAUTIC_VERSION 2.15.2
+ENV MAUTIC_SHA1 4452818b3a806b7eaac9fe507717564229da5fef
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

diff --git a/apache/mautic.crontab b/apache/mautic.crontab
@@ -14,6 +14,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
          * 1 * * *     www-data   php /var/www/html/app/console mautic:maintenance:cleanup --days-old=365 > /var/log/cron.pipe 2>&1
         0 4 15 * *     www-data   php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
        */5 * * * *     www-data   php /var/www/html/app/console mautic:reports:scheduler > /var/log/cron.pipe 2>&1
+        0 5 10 * *     www-data   php /var/www/html/app/console mautic:unusedip:delete > /var/log/cron.pipe 2>&1
 
 # download geoip db on start if it does not exist
 @reboot                www-data   [[ "$(ls -A /var/www/html/app/cache/ip_data 2>/dev/null)" ]] || php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
diff --git a/beta-apache/Dockerfile b/beta-apache/Dockerfile
@@ -33,7 +33,7 @@ VOLUME /var/www/html
 
 # Define Mautic version and expected SHA1 signature
 ENV MAUTIC_VERSION 2.15.2
-ENV MAUTIC_SHA1 21900abc6b4fdc9d0c6c7ebc3d5d0d90086e43e5
+ENV MAUTIC_SHA1 4452818b3a806b7eaac9fe507717564229da5fef
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

diff --git a/beta-apache/mautic.crontab b/beta-apache/mautic.crontab
@@ -14,6 +14,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
          * 1 * * *     www-data   php /var/www/html/app/console mautic:maintenance:cleanup --days-old=365 > /var/log/cron.pipe 2>&1
         0 4 15 * *     www-data   php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
        */5 * * * *     www-data   php /var/www/html/app/console mautic:reports:scheduler > /var/log/cron.pipe 2>&1
+        0 5 10 * *     www-data   php /var/www/html/app/console mautic:unusedip:delete > /var/log/cron.pipe 2>&1
 
 # download geoip db on start if it does not exist
 @reboot                www-data   [[ "$(ls -A /var/www/html/app/cache/ip_data 2>/dev/null)" ]] || php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
diff --git a/beta-fpm/Dockerfile b/beta-fpm/Dockerfile
@@ -33,7 +33,7 @@ VOLUME /var/www/html
 
 # Define Mautic version and expected SHA1 signature
 ENV MAUTIC_VERSION 2.15.2
-ENV MAUTIC_SHA1 21900abc6b4fdc9d0c6c7ebc3d5d0d90086e43e5
+ENV MAUTIC_SHA1 4452818b3a806b7eaac9fe507717564229da5fef
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

diff --git a/beta-fpm/mautic.crontab b/beta-fpm/mautic.crontab
@@ -14,6 +14,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
          * 1 * * *     www-data   php /var/www/html/app/console mautic:maintenance:cleanup --days-old=365 > /var/log/cron.pipe 2>&1
         0 4 15 * *     www-data   php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
        */5 * * * *     www-data   php /var/www/html/app/console mautic:reports:scheduler > /var/log/cron.pipe 2>&1
+        0 5 10 * *     www-data   php /var/www/html/app/console mautic:unusedip:delete > /var/log/cron.pipe 2>&1
 
 # download geoip db on start if it does not exist
 @reboot                www-data   [[ "$(ls -A /var/www/html/app/cache/ip_data 2>/dev/null)" ]] || php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
diff --git a/common/mautic.crontab b/common/mautic.crontab
@@ -14,6 +14,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
          * 1 * * *     www-data   php /var/www/html/app/console mautic:maintenance:cleanup --days-old=365 > /var/log/cron.pipe 2>&1
         0 4 15 * *     www-data   php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
        */5 * * * *     www-data   php /var/www/html/app/console mautic:reports:scheduler > /var/log/cron.pipe 2>&1
+        0 5 10 * *     www-data   php /var/www/html/app/console mautic:unusedip:delete > /var/log/cron.pipe 2>&1
 
 # download geoip db on start if it does not exist
 @reboot                www-data   [[ "$(ls -A /var/www/html/app/cache/ip_data 2>/dev/null)" ]] || php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -33,8 +33,8 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin -
 VOLUME /var/www/html
 
 # Define Mautic version and expected SHA1 signature
-ENV MAUTIC_VERSION 2.15.1
-ENV MAUTIC_SHA1 1fbf6f99a64d6da71a8c09a43576093b077913e2
+ENV MAUTIC_VERSION 2.15.2
+ENV MAUTIC_SHA1 4452818b3a806b7eaac9fe507717564229da5fef
 
 # By default enable cron jobs
 ENV MAUTIC_RUN_CRON_JOBS true

diff --git a/fpm/mautic.crontab b/fpm/mautic.crontab
@@ -14,6 +14,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
          * 1 * * *     www-data   php /var/www/html/app/console mautic:maintenance:cleanup --days-old=365 > /var/log/cron.pipe 2>&1
         0 4 15 * *     www-data   php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1
        */5 * * * *     www-data   php /var/www/html/app/console mautic:reports:scheduler > /var/log/cron.pipe 2>&1
+        0 5 10 * *     www-data   php /var/www/html/app/console mautic:unusedip:delete > /var/log/cron.pipe 2>&1
 
 # download geoip db on start if it does not exist
 @reboot                www-data   [[ "$(ls -A /var/www/html/app/cache/ip_data 2>/dev/null)" ]] || php /var/www/html/app/console mautic:iplookup:download > /var/log/cron.pipe 2>&1