Release 3.9.9 - See CHANGELOG.md

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.9.9 2023-07-28 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Roll back to PHP 8.1 due to broken archiving of reports
+      - Fix issue with .bashrc getting overwritten for 'console' command
+      - Redo scheduled task for archiving of reports
+
+
 ## 3.9.8 2023-07-17 <dave at tiredofit dot ca>
 
    ### Changed

Dockerfile

@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.2
+ARG PHP_VERSION=8.1
 ARG DISTRO="alpine"
 
 FROM docker.io/tiredofit/nginx-php-fpm:${PHP_VERSION}-${DISTRO}

install/etc/cont-init.d/30-matomo

@@ -5,27 +5,19 @@ PROCESS_NAME="matomo"
 
 check_service_initialized init 20-php-fpm
 
-### Adjust Runtime Variables
-sed -i -e "s#<CRON_PERIOD>#${CRON_PERIOD}#g" /assets/cron/matomo-archiver
-sed -i -e "s#<WEBROOT>#${NGINX_WEBROOT}#g" /assets/cron/matomo-archiver
-sed -i -e "s#<TIMEZONE>#${TIMEZONE}#g" /assets/cron/matomo-archiver
-sed -i -e "s#<NGINX_USER>#${NGINX_USER}#g" /assets/cron/matomo-archiver
-
 sanity_db
 db_ready mariadb
 
-### Check to see if Matomo Installed, if not, download and setup..
-if [ ! -f ${NGINX_WEBROOT}/index.php ]; then
+if [ ! -f "${NGINX_WEBROOT}"/index.php ]; then
         print_warn "No Matomo Installation Found, Installing..."
-        mkdir -p ${NGINX_WEBROOT}
-        curl https://builds.matomo.org/piwik-latest.tar.gz | tar xfz - --strip 1 -C ${NGINX_WEBROOT}
-        curl https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz | gunzip -c >${NGINX_WEBROOT}/misc/GeoIPCity.dat
-        chown -R ${NGINX_USER}:${NGINX_GROUP} ${NGINX_WEBROOT}
+        mkdir -p "${NGINX_WEBROOT}"
+        curl https://builds.matomo.org/piwik-latest.tar.gz | tar xfz - --strip 1 -C "${NGINX_WEBROOT}"
+        curl https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz | gunzip -c > "${NGINX_WEBROOT}"/misc/GeoIPCity.dat
         print_info "Install Complete"
 fi
 
-echo "alias console='cd /www/html; sudo -u nginx php ./console'" > /root/.bashrc
+echo "*/${CRON_PERIOD} * * * * sudo -u ${NGINX_USER} TZ=${TIMEZONE} php ${NGINX_WEBROOT}/console core:archive >/dev/null 2>&1" > /assets/cron/matomo_archive_reports
+echo "alias console='cd ${NGINX_WEBROOT}; sudo -u ${NGINX_USER} php ./console'" >> /root/.bashrc
+chown -R "${NGINX_USER}":"${NGINX_GROUP}" "${NGINX_WEBROOT}"
 
-### Set Permissions
-chown -R ${NGINX_USER}:${NGINX_GROUP} ${NGINX_WEBROOT}
 liftoff