updated to v1.1.22

updated maxmind databases
updated with update from @stultusphobia

Author: xavier-hernandez

Dockerfile

@@ -23,7 +23,7 @@ RUN make install
 WORKDIR /goaccess
 RUN cp /goaccess-temp/goaccess.tar.gz .
 RUN tar --strip-components=1  -xzvf goaccess.tar.gz
-RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( <a href='https:\/\/tiny.one\/xgoan'>GOAN<\/a> <span>v1.1.21<\/span> )/" /goaccess/resources/tpls.html
+RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( <a href='https:\/\/tiny.one\/xgoan'>GOAN<\/a> <span>v1.1.22<\/span> )/" /goaccess/resources/tpls.html
 RUN sed -i "s/bottom: 190px/bottom: 260px/" /goaccess/resources/css/app.css
 RUN ./configure --enable-utf8 --enable-geoip=mmdb --with-getline
 RUN make

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Xavier
+Copyright (c) 2023 Xavier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -15,9 +15,9 @@ Still in development... You might need to wait a bit if you have a large amount
 
 **Dependencies:**
 - GoAccess version: 1.7.2
-- GeoLite2-City.mmdb  (2023-09-09)
-- GeoLite2-Country.mmdb  (2023-09-09)
-- GeoLite2-ASN.mmdb  (2023-09-09)
+- GeoLite2-City.mmdb  (2023-10-08)
+- GeoLite2-Country.mmdb  (2023-10-08)
+- GeoLite2-ASN.mmdb  (2023-10-08)
 
 ---
 

assests/maxmind/GeoLite2-ASN.mmdb

@@ -32,9 +32,15 @@ function traefik_goaccess_config(){
     echo "# ${goan_version}" >> ${goan_config}
     echo "# GOAN_PROXY_CONFIG" >> ${goan_config}
     echo "######################################" >> ${goan_config}
-    echo "time-format %T" >> ${goan_config}
-    echo "date-format %d/%b/%Y" >> ${goan_config}
-    echo "log-format %h %^[%d:%t %^] \"%r\" %s %b \"%R\" \"%u\" %Lm" >> ${goan_config}
+    if [ "$1" -eq 2 ]; then
+        echo "time-format ${TIME_FORMAT:-'%T'}" >> ${goan_config}
+        echo "date-format ${DATE_FORMAT:-'%d/%b/%Y'}" >> ${goan_config}
+        echo "log-format ${LOG_FORMAT:-'%h %^[%d:%t %^] \"%r\" %s %b \"%R\" \"%u\" %Lm'}" >> ${goan_config}
+    else
+        echo "time-format %T" >> ${goan_config}
+        echo "date-format %d/%b/%Y" >> ${goan_config}
+        echo "log-format %h %^[%d:%t %^] \"%r\" %s %b \"%R\" \"%u\" %Lm" >> ${goan_config}
+    fi
     echo "port 7890" >> ${goan_config}
     echo "real-time-html true" >> ${goan_config}
     echo "output ${nginx_html}" >> ${goan_config}

assests/maxmind/GeoLite2-City.mmdb

@@ -8,7 +8,7 @@ source $(dirname "$0")/logs/traefik.sh
 source $(dirname "$0")/logs/custom.sh
 source $(dirname "$0")/logs/ncsa_combined.sh
 
-goan_version="GOAN v1.1.21"
+goan_version="GOAN v1.1.22"
 goan_log_path="/opt/log"
 
 goaccess_ping_interval=15
@@ -75,7 +75,9 @@ if [[ -z "${LOG_TYPE}" || "${LOG_TYPE}" == "NPM" || "${LOG_TYPE}" == "NPM+R"  ||
         npm_redirect
     fi
 elif [[ "${LOG_TYPE}" == "TRAEFIK" ]]; then
-    traefik
+    traefik 1
+elif [[ "${LOG_TYPE}" == "TRAEFIKv2" ]]; then
+    traefik 2
 elif [[ "${LOG_TYPE}" == "NCSA_COMBINED" ]]; then
     ncsa_combined
 elif [[ "${LOG_TYPE}" == "CUSTOM" ]]; then